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

change concurrent ruby version

Browse Source
This commit is contained in:
yqbk
2016-10-08 18:22:38 +02:00
parent 948e6f7e3e
commit 674a594fd6
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile
View File

@@ -5,8 +5,8 @@ gem 'bcrypt', '~> 3.1.7'
gem 'bootstrap-will_paginate' gem 'bootstrap-will_paginate'
gem 'carrierwave' gem 'carrierwave'
gem 'coffee-rails', '~> 4.0.0' gem 'coffee-rails', '~> 4.0.0'
gem 'concurrent-ruby', '~> 1.0.0' gem 'concurrent-ruby', '~> 1.0.1'
gem 'concurrent-ruby-ext', '~> 1.0.0', platform: :ruby gem 'concurrent-ruby-ext', '~> 1.0.1', platform: :ruby
gem 'docker-api','~> 1.25.0', require: 'docker' gem 'docker-api','~> 1.25.0', require: 'docker'
gem 'factory_girl_rails', '~> 4.0' gem 'factory_girl_rails', '~> 4.0'
gem 'forgery' gem 'forgery'

11
Gemfile.lock
View File

@@ -94,10 +94,9 @@ GEM
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.10.0) coffee-script-source (1.10.0)
concurrent-ruby (1.0.0) concurrent-ruby (1.0.2)
concurrent-ruby (1.0.0-java) concurrent-ruby-ext (1.0.2)
concurrent-ruby-ext (1.0.0) concurrent-ruby (~> 1.0.2)
concurrent-ruby (~> 1.0.0)
d3-rails (3.5.11) d3-rails (3.5.11)
railties (>= 3.1) railties (>= 3.1)
database_cleaner (1.5.1) database_cleaner (1.5.1)
@@ -368,8 +367,8 @@ DEPENDENCIES
carrierwave carrierwave
codeclimate-test-reporter codeclimate-test-reporter
coffee-rails (~> 4.0.0) coffee-rails (~> 4.0.0)
concurrent-ruby (~> 1.0.0) concurrent-ruby (~> 1.0.1)
concurrent-ruby-ext (~> 1.0.0) concurrent-ruby-ext (~> 1.0.1)
d3-rails d3-rails
database_cleaner database_cleaner
docker-api (~> 1.25.0) docker-api (~> 1.25.0)