Commit f58dc8e6c95ef9d566402395d12c46bb97759cf2
1 parent
a2456832
Exists in
master
and in
4 other branches
Update bootstrap-sass
Showing
2 changed files
with
4 additions
and
4 deletions
Show diff stats
Gemfile
| ... | ... | @@ -119,7 +119,7 @@ group :assets do |
| 119 | 119 | gem "jquery-ui-rails", "2.0.2" |
| 120 | 120 | gem "modernizr", "2.6.2" |
| 121 | 121 | gem "raphael-rails", git: "https://github.com/gitlabhq/raphael-rails.git" |
| 122 | - gem 'bootstrap-sass', "2.2.1.1" | |
| 122 | + gem 'bootstrap-sass' | |
| 123 | 123 | gem "font-awesome-sass-rails", "~> 3.0.0" |
| 124 | 124 | gem "gemoji", "~> 1.2.1", require: 'emoji/railtie' |
| 125 | 125 | gem "gon" | ... | ... |
Gemfile.lock
| ... | ... | @@ -64,7 +64,7 @@ GEM |
| 64 | 64 | erubis (>= 2.6.6) |
| 65 | 65 | binding_of_caller (0.7.1) |
| 66 | 66 | debug_inspector (>= 0.0.1) |
| 67 | - bootstrap-sass (2.2.1.1) | |
| 67 | + bootstrap-sass (2.3.1.0) | |
| 68 | 68 | sass (~> 3.2) |
| 69 | 69 | builder (3.0.4) |
| 70 | 70 | capybara (2.1.0) |
| ... | ... | @@ -398,7 +398,7 @@ GEM |
| 398 | 398 | rubyntlm (0.1.1) |
| 399 | 399 | sanitize (2.0.3) |
| 400 | 400 | nokogiri (>= 1.4.4, < 1.6) |
| 401 | - sass (3.2.8) | |
| 401 | + sass (3.2.9) | |
| 402 | 402 | sass-rails (3.2.6) |
| 403 | 403 | railties (~> 3.2.0) |
| 404 | 404 | sass (>= 3.1.10) |
| ... | ... | @@ -507,7 +507,7 @@ DEPENDENCIES |
| 507 | 507 | awesome_print |
| 508 | 508 | better_errors |
| 509 | 509 | binding_of_caller |
| 510 | - bootstrap-sass (= 2.2.1.1) | |
| 510 | + bootstrap-sass | |
| 511 | 511 | capybara |
| 512 | 512 | carrierwave |
| 513 | 513 | chosen-rails (= 0.9.8) | ... | ... |