Skip to content

Commit

Permalink
Update instances of bourbon to 5.0.0.beta.7; sass to ~>3.4 (#759)
Browse files Browse the repository at this point in the history
  • Loading branch information
vcavallo authored and nickcharlton committed Mar 3, 2017
1 parent eaacdce commit 900d266
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Appraisals
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
appraise "sass-3-4" do
gem "sass", "3.4.0"
gem "sass", "~> 3.4"
gem "rails-controller-testing"
end

Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ source 'https://rubygems.org'
gemspec

gem "administrate-field-image"
gem "bourbon", "~> 4.2"
gem "bourbon", "~> 5.0.0.beta.7"
gem "delayed_job_active_record"
gem "faker"
gem "high_voltage"
Expand Down
16 changes: 8 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ PATH
specs:
administrate (0.4.0)
autoprefixer-rails (~> 6.0)
bourbon (~> 4.2)
bourbon (~> 5.0.0.beta.7)
datetime_picker_rails (~> 0.0.7)
jquery-rails (~> 4.0)
kaminari (~> 0.16)
Expand Down Expand Up @@ -65,14 +65,14 @@ GEM
rake
thor (>= 0.14.0)
arel (6.0.3)
autoprefixer-rails (6.6.1)
autoprefixer-rails (6.7.6)
execjs
awesome_print (1.6.1)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bourbon (4.2.7)
sass (~> 3.4)
thor (~> 0.19)
bourbon (5.0.0.beta.7)
sass (~> 3.4.22)
thor (~> 0.19.1)
builder (3.2.2)
bundler-audit (0.4.0)
bundler (~> 1.2)
Expand Down Expand Up @@ -229,7 +229,7 @@ GEM
rspec-support (~> 3.5.0)
rspec-support (3.5.0)
safe_yaml (1.0.4)
sass (3.4.22)
sass (3.4.23)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
Expand All @@ -253,7 +253,7 @@ GEM
thor (0.19.1)
thread (0.2.2)
thread_safe (0.3.5)
tilt (2.0.5)
tilt (2.0.6)
timecop (0.8.0)
tins (1.6.0)
tzinfo (1.2.2)
Expand Down Expand Up @@ -289,7 +289,7 @@ DEPENDENCIES
ammeter
appraisal
awesome_print
bourbon (~> 4.2)
bourbon (~> 5.0.0.beta.7)
bundler-audit
byebug
database_cleaner
Expand Down
2 changes: 1 addition & 1 deletion administrate.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Gem::Specification.new do |s|
s.test_files = Dir["test/**/*"]

s.add_dependency "autoprefixer-rails", "~> 6.0"
s.add_dependency "bourbon", "~> 4.2"
s.add_dependency "bourbon", "~> 5.0.0.beta.7"
s.add_dependency "datetime_picker_rails", "~> 0.0.7"
s.add_dependency "jquery-rails", "~> 4.0"
s.add_dependency "kaminari", "~> 0.16"
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails42.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source "https://rubygems.org"

gem "administrate-field-image"
gem "bourbon", "~> 4.2"
gem "bourbon", "~> 5.0.0.beta.7"
gem "delayed_job_active_record"
gem "faker"
gem "high_voltage"
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails50.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source "https://rubygems.org"

gem "administrate-field-image"
gem "bourbon", "~> 4.2"
gem "bourbon", "~> 5.0.0.beta.7"
gem "delayed_job_active_record"
gem "faker"
gem "high_voltage"
Expand Down
4 changes: 2 additions & 2 deletions gemfiles/sass_3_4.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
source "https://rubygems.org"

gem "administrate-field-image"
gem "bourbon", "~> 4.2"
gem "bourbon", "~> 5.0.0.beta.7"
gem "delayed_job_active_record"
gem "faker"
gem "high_voltage"
gem "markdown-rails"
gem "pg"
gem "redcarpet"
gem "unicorn"
gem "sass", "3.4.0"
gem "sass", "~> 3.4"
gem "rails-controller-testing"

group :development do
Expand Down

0 comments on commit 900d266

Please sign in to comment.