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

Bump bootstrap-sass from 3.3.7 to 3.4.1 #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump bootstrap-sass from 3.3.7 to 3.4.1 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ gem 'whenever'
gem 'listen'

# pin SASS - CUL linux hosts can't yet compile sassc
gem 'bootstrap-sass', '~> 3.3.0'
gem 'bootstrap-sass', '~> 3.4.1'

# Javascript runtime, as a gem, doesn't depend on OS environment
gem 'therubyracer'
Expand Down
8 changes: 5 additions & 3 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ GEM
blacklight (>= 6.0.2)
jquery-rails
rails (>= 3.0)
bootstrap-sass (3.3.7)
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
sassc (>= 2.0.0)
builder (3.2.4)
cancancan (2.3.0)
capistrano (3.17.0)
Expand Down Expand Up @@ -350,6 +350,8 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sassc (2.4.0)
ffi (~> 1.9)
spring (4.0.0)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
Expand Down Expand Up @@ -395,7 +397,7 @@ DEPENDENCIES
binding_of_caller
blacklight
blacklight_range_limit
bootstrap-sass (~> 3.3.0)
bootstrap-sass (~> 3.4.1)
capistrano
capistrano-bundler
capistrano-passenger
Expand Down