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

Bump bootstrap-sass from 3.1.1.1 to 3.4.1 #404

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

Bump bootstrap-sass from 3.1.1.1 to 3.4.1 #404

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 @@ -17,7 +17,7 @@ group :assets do
end

# bootstrap in sass in rails
gem 'bootstrap-sass', '~> 3.1.1.1'
gem 'bootstrap-sass', '~> 3.4.1'

# replaces glyphicons
gem 'font-awesome-rails'
Expand Down
21 changes: 17 additions & 4 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,16 @@ GEM
arel (3.0.3)
auto_strip_attributes (2.1.0)
activerecord (>= 3.0)
autoprefixer-rails (9.7.4)
execjs
better_errors (1.1.0)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bootstrap-sass (3.1.1.1)
sass (~> 3.2)
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
sassc (>= 2.0.0)
bootstrap-wysihtml5-rails (0.3.3.8)
railties (>= 3.0)
builder (3.0.4)
Expand Down Expand Up @@ -98,6 +101,7 @@ GEM
multi_json (~> 1.0)
faraday (0.15.2)
multipart-post (>= 1.2, < 3)
ffi (1.12.2)
font-awesome-rails (4.0.3.2)
railties (>= 3.2, < 5.0)
grit (2.5.0)
Expand Down Expand Up @@ -217,6 +221,9 @@ GEM
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (12.3.1)
rb-fsevent (0.10.3)
rb-inotify (0.10.1)
ffi (~> 1.0)
rdoc (3.12.2)
json (~> 1.4)
rest-client (2.0.1)
Expand All @@ -226,11 +233,17 @@ GEM
rinku (1.7.2)
rmagick (2.13.2)
ruby-openid (2.7.0)
sass (3.2.1)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
sassc (2.2.1)
ffi (~> 1.9)
slop (3.6.0)
sprockets (2.2.3)
hike (~> 1.2)
Expand Down Expand Up @@ -269,7 +282,7 @@ DEPENDENCIES
auto_strip_attributes (~> 2.0)
better_errors
binding_of_caller
bootstrap-sass (~> 3.1.1.1)
bootstrap-sass (~> 3.4.1)
bootstrap-wysihtml5-rails
capatross!
capistrano
Expand Down