diff --git a/Gemfile b/Gemfile index 6289f7cc2533fa986aaa4c04eb0632bb98bae499..535f5f79ca130f2baa0bbdaacded9501ed17cd1c 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ gemspec gem "administrate-field-image", git: "https://github.com/thoughtbot/administrate-field-image.git", - branch: "rails-5" + branch: "jq-rails-5" gem "bourbon", "~> 4.2" gem "delayed_job_active_record" gem "faker" diff --git a/Gemfile.lock b/Gemfile.lock index 11b4069fcd6589835137976abb60b55372838986..791274d60432f43f3304954dfa993429b52784af 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/thoughtbot/administrate-field-image.git - revision: f07523253a5629048c7b395571207b619b32c862 - branch: rails-5 + revision: faf7a9b3ce1dcab0695af7f51e225ad208d7777b + branch: jq-rails-5 specs: administrate-field-image (0.0.2) administrate (>= 0.2.0.rc1, < 0.3.0) @@ -324,3 +324,6 @@ DEPENDENCIES unicorn web-console (>= 2.1.3) webmock + +BUNDLED WITH + 1.13.5 diff --git a/circle.yml b/circle.yml index df0e087d37d50b4e93ca5c012ec32242e391342f..3747c078eabb17074db84d21210680b56650d798 100644 --- a/circle.yml +++ b/circle.yml @@ -1,4 +1,6 @@ dependencies: + pre: + - gem install bundler --version "1.13.5" post: - bundle exec appraisal install diff --git a/gemfiles/rails42.gemfile b/gemfiles/rails42.gemfile index 7169061b2f42fee9b41303f68a223cea7af34b25..1d854d28d22fac3728f68b1addc50242b2d63522 100644 --- a/gemfiles/rails42.gemfile +++ b/gemfiles/rails42.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "administrate-field-image", :git => "https://github.com/thoughtbot/administrate-field-image.git", :branch => "rails-5" +gem "administrate-field-image", :git => "https://github.com/thoughtbot/administrate-field-image.git", :branch => "jq-rails-5" gem "bourbon", "~> 4.2" gem "delayed_job_active_record" gem "faker" diff --git a/gemfiles/rails50.gemfile b/gemfiles/rails50.gemfile index 6f81a00d0188254a5dc6a83a4c5f9ddcfba81c6e..85271c9c65e9bdf89d960a8d90fb6c4163f2c73d 100644 --- a/gemfiles/rails50.gemfile +++ b/gemfiles/rails50.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "administrate-field-image", :git => "https://github.com/thoughtbot/administrate-field-image.git", :branch => "rails-5" +gem "administrate-field-image", :git => "https://github.com/thoughtbot/administrate-field-image.git", :branch => "jq-rails-5" gem "bourbon", "~> 4.2" gem "delayed_job_active_record" gem "faker" diff --git a/gemfiles/sass_3_4.gemfile b/gemfiles/sass_3_4.gemfile index 42d91935e3e70530cf65bd114d3002e8cf90db95..ac7c84266b4fcec0d4fb246096deac9e7e7b0d1c 100644 --- a/gemfiles/sass_3_4.gemfile +++ b/gemfiles/sass_3_4.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "administrate-field-image", :git => "https://github.com/thoughtbot/administrate-field-image.git", :branch => "rails-5" +gem "administrate-field-image", :git => "https://github.com/thoughtbot/administrate-field-image.git", :branch => "jq-rails-5" gem "bourbon", "~> 4.2" gem "delayed_job_active_record" gem "faker"