Commit Graph

29 Commits

Author SHA1 Message Date
6e9dd9456c initial commit 2016-05-25 16:43:39 +02:00
04515a0547 Fixed typo in Gemfile 2016-05-12 16:27:22 +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
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
3f043fa832 Gem updates 2015-11-24 09:15:33 +01:00
d262e194c1 Update puma 2015-11-23 19:47:13 +01:00
bc7c717215 reverted Gemfile and Gemfile.lock 2015-10-28 15:54:08 +01:00
52649bd418 updated gemfile. 2015-10-28 15:40:40 +01:00
c8253a6ba0 Manually merge changes from webpython branch. 2015-09-15 16:55:16 +02:00
30985a249e Updated docker API Gem 2015-04-20 21:13:07 +02:00
0c8e93fb95 use latest api version 2015-04-14 14:55:43 +02:00
c0fde51f6c Backup commit 2015-04-13 22:36:27 +02:00
6b025aeda9 added New Relic 2015-04-11 16:54:48 +02:00
7477d4c6dd transitionally downgraded to Rails 4.1 since activerecord-jdbcpostgresql-adapter is not fully compatible with Active Record 4.2 2015-03-02 15:04:37 +01:00
5582e5b935 updated Capistrano 2015-02-20 09:17:06 +01:00
ab87a2d91f fixed Gemfile for JRuby 2015-02-19 09:20:36 +01:00
56acd4c3c3 updated to Rails 4.2 2015-02-18 10:41:26 +01:00
1068b18f41 use RuboCop 2015-02-16 11:22:26 +01:00
606f21a560 use better_errors 2015-02-10 10:29:24 +01:00
7661910e91 updated bundle 2015-02-09 12:42:58 +01:00
222b685fa2 gather coverage data locally 2015-02-09 10:03:14 +01:00
5f0815b140 implemented pooling for Docker containers 2015-02-06 15:59:51 +01:00
62adb1a8e2 don't use WebKit with Capybara 2015-01-29 15:03:19 +01:00
df70b46c16 added Code Climate integration 2015-01-28 18:43:44 +01:00
f36b2bb7d8 added configuration for Travis CI 2015-01-28 17:27:27 +01:00
4cbf9970b1 transferred Code Ocean from original repository to GitHub 2015-01-22 10:01:32 +01:00