diff --git a/Gemfile b/Gemfile index 1cf4fc23..8133baa4 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ gem 'carrierwave' gem 'coffee-rails' gem 'concurrent-ruby' gem 'concurrent-ruby-ext', platform: :ruby -gem 'docker-api','~> 1.25.0', require: 'docker' +gem 'docker-api', require: 'docker' gem 'factory_bot_rails' gem 'forgery' gem 'highline' diff --git a/Gemfile.lock b/Gemfile.lock index f189a12a..130c8d7f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -115,9 +115,9 @@ GEM debug_inspector (0.0.3) diff-lcs (1.3) docile (1.1.5) - docker-api (1.25.0) - excon (>= 0.38.0) - json + docker-api (1.34.0) + excon (>= 0.47.0) + multi_json domain_name (0.5.20170404) unf (>= 0.0.5, < 1.0.0) erubi (1.7.0) @@ -407,7 +407,7 @@ DEPENDENCIES concurrent-ruby-ext d3-rails database_cleaner - docker-api (~> 1.25.0) + docker-api factory_bot_rails faye-websocket forgery