htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into statistics

Browse Source
This commit is contained in:
Ralf Teusner
2015-12-15 15:36:24 +01:00
parent 95ec5b0231 e335759644
commit 759d3ac3b2
10 changed files with 113 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
Gemfile.lock
View File

@ -2,32 +2,32 @@ GEM
remote: https://rubygems.org/
specs:
ZenTest (4.11.0)
actionmailer (4.1.10)
actionpack (= 4.1.10)
actionview (= 4.1.10)
actionmailer (4.1.14)
actionpack (= 4.1.14)
actionview (= 4.1.14)
mail (~> 2.5, >= 2.5.4)
actionpack (4.1.10)
actionview (= 4.1.10)
activesupport (= 4.1.10)
actionpack (4.1.14)
actionview (= 4.1.14)
activesupport (= 4.1.14)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
actionview (4.1.10)
activesupport (= 4.1.10)
actionview (4.1.14)
activesupport (= 4.1.14)
builder (~> 3.1)
erubis (~> 2.7.0)
activemodel (4.1.10)
activesupport (= 4.1.10)
activemodel (4.1.14)
activesupport (= 4.1.14)
builder (~> 3.1)
activerecord (4.1.10)
activemodel (= 4.1.10)
activesupport (= 4.1.10)
activerecord (4.1.14)
activemodel (= 4.1.14)
activesupport (= 4.1.14)
arel (~> 5.0.0)
activerecord-jdbc-adapter (1.3.15)
activerecord (>= 2.2)
activerecord-jdbcpostgresql-adapter (1.3.15)
activerecord-jdbc-adapter (~> 1.3.15)
jdbc-postgres (>= 9.1)
activesupport (4.1.10)
activesupport (4.1.14)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
@ -95,11 +95,10 @@ GEM
execjs
coffee-script-source (1.9.1)
colorize (0.7.7)
concurrent-ruby (0.8.0)
ref (~> 1.0, >= 1.0.5)
concurrent-ruby (0.8.0-java)
concurrent-ruby-ext (0.8.0)
concurrent-ruby (~> 0.8.0)
concurrent-ruby (1.0.0)
concurrent-ruby (1.0.0-java)
concurrent-ruby-ext (1.0.0)
concurrent-ruby (~> 1.0.0)
database_cleaner (1.4.1)
debug_inspector (0.0.2)
diff-lcs (1.2.5)
@ -141,17 +140,17 @@ GEM
jquery-turbolinks (2.1.0)
railties (>= 3.1.0)
turbolinks
json (1.8.2)
json (1.8.2-java)
json (1.8.3)
json (1.8.3-java)
jwt (1.4.1)
kramdown (1.6.0)
mail (2.6.3)
mime-types (>= 1.16, < 3)
method_source (0.8.2)
mime-types (2.4.3)
mime-types (2.99)
mini_portile (0.6.2)
minitest (5.5.1)
multi_json (1.11.0)
minitest (5.8.3)
multi_json (1.11.2)
multi_xml (0.5.5)
multipart-post (2.0.0)
net-scp (1.2.1)
@ -185,31 +184,29 @@ GEM
method_source (~> 0.8.1)
slop (~> 3.4)
spoon (~> 0.0)
puma (2.11.1)
rack (>= 1.1, < 2.0)
puma (2.11.1-java)
rack (>= 1.1, < 2.0)
puma (2.15.3)
puma (2.15.3-java)
pundit (0.3.0)
activesupport (>= 3.0.0)
rack (1.5.2)
rack (1.5.5)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.1.10)
actionmailer (= 4.1.10)
actionpack (= 4.1.10)
actionview (= 4.1.10)
activemodel (= 4.1.10)
activerecord (= 4.1.10)
activesupport (= 4.1.10)
rails (4.1.14)
actionmailer (= 4.1.14)
actionpack (= 4.1.14)
actionview (= 4.1.14)
activemodel (= 4.1.14)
activerecord (= 4.1.14)
activesupport (= 4.1.14)
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.10)
railties (= 4.1.14)
sprockets-rails (~> 2.0)
rails-i18n (4.0.4)
i18n (~> 0.6)
railties (~> 4.0)
railties (4.1.10)
actionpack (= 4.1.10)
activesupport (= 4.1.10)
railties (4.1.14)
actionpack (= 4.1.14)
activesupport (= 4.1.14)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.0.0)
@ -221,7 +218,6 @@ GEM
i18n
polyamorous (~> 1.2)
rdoc (4.2.0)
ref (1.0.5)
rspec (3.1.0)
rspec-core (~> 3.1.0)
rspec-expectations (~> 3.1.0)
@ -286,12 +282,12 @@ GEM
spoon (0.0.4)
ffi
spring (1.3.4)
sprockets (2.12.3)
sprockets (2.12.4)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.2.4)
sprockets-rails (2.3.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
@ -351,8 +347,8 @@ DEPENDENCIES
carrierwave
codeclimate-test-reporter
coffee-rails (~> 4.0.0)
concurrent-ruby
concurrent-ruby-ext
concurrent-ruby (~> 1.0.0)
concurrent-ruby-ext (~> 1.0.0)
database_cleaner
docker-api (~> 1.21.1)
factory_girl_rails (~> 4.0)
@ -368,9 +364,9 @@ DEPENDENCIES
nyan-cat-formatter
pg
pry
puma
puma (~> 2.15.3)
pundit
rails (~> 4.1.2)
rails (~> 4.1.13)
rails-i18n (~> 4.0.0)
rake
ransack