77a40c9fc5
Merge remote-tracking branch 'origin/master' into exercise-anomaly-detection
...
# Conflicts:
# Gemfile.lock
2018-03-08 12:12:06 +01:00
c74fa1e9e4
add deprecated_finders
2018-03-01 19:08:25 +01:00
c1b5df044b
Merge remote-tracking branch 'origin/master' into exercise-anomaly-detection
...
# Conflicts:
# Capfile
# Gemfile.lock
# db/schema.rb
2018-02-28 16:48:14 +01:00
f7165c06c4
pinned eventmachine to 1.0.9.1 , as the newest version crashes with a segmentation fault
2018-02-22 16:55:24 +01:00
3db533ea9b
pin lti to 1.1.10
2018-02-22 16:39:49 +01:00
b8ff08b3e7
Update Capistrano
2018-02-19 00:27:06 +01:00
c063494b29
Update Docker-API
2018-02-19 00:23:33 +01:00
4f287c75a6
Further downgrade turbolinks
2018-02-18 20:26:29 +01:00
f5293c4477
Downgrade turbolinks and another bundle update
2018-02-18 19:46:59 +01:00
16337ba9af
Fix gemfile for production
2018-01-31 15:55:07 +01:00
bc172ead8d
update again, prevent pg from being updated
2018-01-30 18:06:26 +01:00
0c5f88d748
Configure whenever schedule and logging for rake task
2018-01-30 16:57:03 +01:00
72905d731a
set lti to version 1
2017-12-20 10:51:45 +01:00
a292322138
updated gemfile
2017-11-24 16:21:48 +01:00
960025cbf8
pushed Gemfile.lock
2017-11-15 15:24:36 +01:00
3562aa9103
create remote evaluation
2017-02-02 18:14:33 +01:00
3a07e7d5f6
Updated nokogiri
2017-01-13 13:46:36 +01:00
43f1735fa0
Merge commit '17f0f6fa9fa57f3fd4b124bb8371dd715ad34c15' into lti_param_model
2017-01-12 15:12:54 +01:00
ab5438d5ed
bumped excon to fix error in docker-api gem
2017-01-05 14:49:55 +01:00
ca28e0aa87
updated rails from 4.1.13 to 4.2.5. This is required for rails to make use of new features in postgres 9.5
...
@Ralf
TODO: migration /Users/groucho/Documents/HPI/workspace/Xikolo-CodeOcean/codeocean/db/migrate/20160204111716_add_user_to_code_harbor_link.rb
is broken. A reference is made to table users which does not exist.
Workaround: run rake db:schema:load before running db:migrate. Still this should be fixed.
2016-12-31 00:05:23 +01:00
f2db88f952
Merge branch 'master' into travis-green-docker
...
took all the newer versions. Only thing I deleted is the part #to pass the test "it executes the run command" ...
We need to shortly discuss this yqbk.
Conflicts:
lib/docker_client.rb
2016-11-09 18:25:02 +01:00
1511941d3d
Merge branch 'master' into editor-frontend-refactor
...
Conflicts:
codeocean-dockerconfig.md
2016-11-09 18:00:40 +01:00
44aca293e9
make travis green again
2016-10-08 20:37:20 +02:00
c88a57c410
some comments and update of gem conccurrent-ruby
2016-10-07 16:38:22 +02:00
63f62a8efc
Reconfigured docker-yml and added missing (something) to application.rb
2016-08-11 19:01:44 +02:00
0f79c1b1d3
Merge pull request #76 from openHPI/markup-description
...
Markup description
2016-08-03 15:08:21 +02:00
4183a16178
merge with master
2016-08-03 12:09:58 +02:00
615aa841d9
cleanup3
2016-07-25 16:42:51 +02:00
b11c319e7c
cleanup
2016-07-25 16:04:04 +02:00
9c1b221fba
working icons
2016-07-25 15:59:48 +02:00
09533a5556
download complete submission as one zip file
2016-07-15 18:25:58 +02:00
f4abc1fec3
change gem and add preview
2016-07-13 15:14:38 +02:00
00cdbf00f8
editor
2016-07-13 14:48:25 +02:00
f54fce65bc
added mini-profiler for development.
2016-06-27 16:49:11 +02:00
4e5c3ba071
In files_controller.rb: deleted .file_extension call due to the error: undefined method `file_extension' for nil:NilClass
2016-06-14 12:25:23 +02:00
c8abe46815
Problem with Error_controller_spec seemst to be connected with pundit. When we use version 0.3 instead of 1.1 all tests are passing. I have discovered that somehow error record is not correctly assigned in newer verion. Probably we need to look for an issue in spec/factories/error or app/models/error files. Tests are failing at the first step, when creating error -> @error = Error.new(params). Still hasn't solved but im quite close
2016-06-08 18:56:54 +02:00
060f9687f1
use pry-byebug gem instead for pry (recommended for ruby 2.x)
2016-05-30 15:47:06 +02:00
6bb5b53bad
Merge branch 'master' into john-graph
...
# Conflicts:
# Gemfile
2016-05-12 16:02:38 +02:00
c1c03e3b25
add rest-client gem
2016-05-04 15:32:06 +02:00
b530ea47d9
Graph in exercise statistics
2016-03-22 09:23:21 +01:00
ebdc5dcd6e
Merge pull request #41 from leoselig/master
...
Import exercise meta data from CodeHarbour
2016-03-01 13:03:12 +01:00
ed63a9dfd8
accidentially added websocket_gem on master branch. This commit removes it again.
2016-03-01 11:39:41 +01:00
94c31e35a4
Some comments and cleanup of exercise.rb percentage calculation
2016-03-01 11:14:53 +01:00
943355d9c7
Add #from_proforma_xml to exercise (only meta data import)
...
- method only considers title and description for now
- sets up relation to execution environment with id 1, just to pass
validation for now
(leoselig/codeocean#1 )
2016-02-12 11:05:14 +01:00
c77d52c0e4
instead of relying on shared folders, use docker api archive function. un tar is still a bit cumbersome, but works.
2016-01-19 15:41:03 +01:00
759d3ac3b2
Merge branch 'master' into statistics
2015-12-15 15:36:24 +01:00
3f043fa832
Gem updates
2015-11-24 09:15:33 +01:00
d262e194c1
Update puma
2015-11-23 19:47:13 +01:00
78422647fe
Add execution environment statistics
2015-10-29 14:19:31 +01:00
bc7c717215
reverted Gemfile and Gemfile.lock
2015-10-28 15:54:08 +01:00
