Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update administrate-field-image to release #733

Merged
merged 2 commits into from Jan 20, 2017
Merged

Update administrate-field-image to release #733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e89b3fb
Update bundler to 1.13.7 in Circle.
nickcharlton Jan 20, 2017
a7a7ba3
Switch administate-field-image to release.
nickcharlton Jan 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 1 addition & 3 deletions Gemfile
View file
Open in desktop
Expand Up @@ -2,9 +2,7 @@ source 'https://rubygems.org'

gemspec

gem "administrate-field-image",
git: "https://github.com/thoughtbot/administrate-field-image.git",
branch: "jq-rails-5"
gem "administrate-field-image"
gem "bourbon", "~> 4.2"
gem "delayed_job_active_record"
gem "faker"
Expand Down
16 changes: 5 additions & 11 deletions Gemfile.lock
View file
Open in desktop
@@ -1,12 +1,3 @@
GIT
remote: https://github.com/thoughtbot/administrate-field-image.git
revision: faf7a9b3ce1dcab0695af7f51e225ad208d7777b
branch: jq-rails-5
specs:
administrate-field-image (0.0.2)
administrate (>= 0.2.0.rc1, < 0.3.0)
rails (>= 4.2, < 5.1)

PATH
remote: .
specs:
Expand Down Expand Up @@ -62,6 +53,9 @@ GEM
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.3.8)
administrate-field-image (1.0.0)
administrate (>= 0.2.0.rc1)
rails (>= 4.2)
ammeter (1.1.3)
activesupport (>= 3.0)
railties (>= 3.0)
Expand Down Expand Up @@ -294,7 +288,7 @@ PLATFORMS

DEPENDENCIES
administrate!
administrate-field-image!
administrate-field-image
ammeter
appraisal
awesome_print
Expand Down Expand Up @@ -326,4 +320,4 @@ DEPENDENCIES
webmock

BUNDLED WITH
1.13.5
1.13.6
2 changes: 1 addition & 1 deletion circle.yml
View file
Open in desktop
@@ -1,6 +1,6 @@
dependencies:
pre:
- gem install bundler --version "1.13.6"
- gem install bundler --version "1.13.7"
post:
- bundle exec appraisal install

Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails42.gemfile
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@

source "https://rubygems.org"

gem "administrate-field-image", :git => "https://github.com/thoughtbot/administrate-field-image.git", :branch => "jq-rails-5"
gem "administrate-field-image"
gem "bourbon", "~> 4.2"
gem "delayed_job_active_record"
gem "faker"
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails50.gemfile
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@

source "https://rubygems.org"

gem "administrate-field-image", :git => "https://github.com/thoughtbot/administrate-field-image.git", :branch => "jq-rails-5"
gem "administrate-field-image"
gem "bourbon", "~> 4.2"
gem "delayed_job_active_record"
gem "faker"
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/sass_3_4.gemfile
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@

source "https://rubygems.org"

gem "administrate-field-image", :git => "https://github.com/thoughtbot/administrate-field-image.git", :branch => "jq-rails-5"
gem "administrate-field-image"
gem "bourbon", "~> 4.2"
gem "delayed_job_active_record"
gem "faker"
Expand Down