Commit Graph

981 Commits

Author SHA1 Message Date
c937a1a9ef clean pull request 2016-10-24 23:02:44 +02:00
595a2a009b Working build 2016-10-24 14:52:45 +02:00
0069841a96 DOCKER_HOST + DOCKER_OPTS 2016-10-23 16:18:26 +02:00
13011e8a31 set DOCKER_OPTS 2016-10-23 15:29:30 +02:00
88079008f3 export DOCKER_HOST 2016-10-23 15:12:02 +02:00
3d3d4ec1ae pull docker images on travis 2016-10-23 14:30:34 +02:00
46cdbc3b4b change workspace path to /tmp 2016-10-16 17:28:57 +02:00
f055e6813d changes in travis 2016-10-16 17:21:54 +02:00
043ece68f4 enable container tests 2016-10-16 16:55:24 +02:00
1f24e48c5c enable docker initialize 2016-10-11 16:45:56 +02:00
f24f7e0c05 remove docker tag to travis 2016-10-11 16:42:48 +02:00
52be496e16 add docker tag to travis 2016-10-11 13:33:30 +02:00
7a76c4c6f1 try out new code 2016-10-11 13:12:00 +02:00
1945a47109 apply changes after review 2016-10-11 12:44:16 +02:00
734a0324d4 Merge branch 'travis-green' of github.com:openHPI/codeocean into travis-green 2016-10-08 20:38:02 +02:00
44aca293e9 make travis green again 2016-10-08 20:37:20 +02:00
a694d0ca33 solve errors 2016-10-08 20:05:25 +02:00
304358af5a merge with master 2016-10-08 19:21:26 +02:00
15b7986515 make travis green 4 2016-10-08 19:09:15 +02:00
1e6cdd5f39 make travis green 3 2016-10-08 19:02:12 +02:00
d7d9212de5 make travis green 2 2016-10-08 18:51:52 +02:00
f2f51414b0 make travis green 2016-10-08 18:34:42 +02:00
674a594fd6 change concurrent ruby version 2016-10-08 18:22:38 +02:00
948e6f7e3e only newest ruby 2016-10-08 18:18:17 +02:00
3bae736dce no firefox path 2016-10-08 18:16:06 +02:00
d47a440838 changes in travis 2016-10-08 18:04:00 +02:00
ea745cbb5b require codeclimate 2016-10-08 17:48:28 +02:00
c9d209775b change ruby version in travis settings 2016-10-08 17:43:26 +02:00
c88a57c410 some comments and update of gem conccurrent-ruby 2016-10-07 16:38:22 +02:00
8fe9303288 Merge pull request #80 from openHPI/recommend_request_for_comment
Some tidy up in request for comments (bugfix: removed leftover parts …
2016-09-09 14:12:47 +02:00
e67f1f78c4 cleanup logging statements. 2016-09-09 14:11:38 +02:00
e45426635d rename application from Code Ocean to CodeOcean 2016-09-02 15:06:11 +02:00
99f1fe45a3 Allow to specify a branch to deploy for staging 2016-09-02 15:05:48 +02:00
012e11857f ignore staging files 2016-09-01 13:53:57 +02:00
7cfa6a21ee add staging settings for docker.yml.erb 2016-08-31 16:03:19 +02:00
a9b273a902 Changes to support deploy staging 2016-08-31 15:54:19 +02:00
18d54f4293 Merge pull request #77 from openHPI/ace-editor-exercise-edit
Ace editor exercise edit
2016-08-29 13:02:57 +02:00
21699952ff some renaming 2016-08-29 13:00:12 +02:00
8abc0bb15a cleanup 2016-08-26 13:22:16 +02:00
112a8bde42 done 2016-08-26 13:19:39 +02:00
e17782b18d done 2016-08-26 13:16:38 +02:00
0b6dc5e409 Merge branch 'master' into ace-editor-exercise-edit 2016-08-26 11:41:07 +02:00
cba44680ef save properly 2016-08-26 11:38:17 +02:00
f757737606 fields for instead form for (solved problem with sibmission button) 2016-08-26 11:37:57 +02:00
12cec1ac22 fields for instead form for (solved problem with sibmission button) 2016-08-24 14:08:07 +02:00
1964c4a31f removed nginx.conf which is not necessary here 2016-08-19 16:33:28 +02:00
ea21b0cc8d removed tag from travis configuration 2016-08-19 16:18:51 +02:00
7bead2c473 implementation ready for testing 2016-08-17 15:53:16 +02:00
476188990f separate file for editor in edit view 2016-08-17 15:37:36 +02:00
9a47f126e4 routing error 2016-08-17 13:50:01 +02:00