diff options
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -151,7 +151,7 @@ gem "jquery-rails", "2.1.3" gem "jquery-ui-rails", "2.0.2" gem "modernizr", "2.6.2" gem "raphael-rails", "~> 2.1.2" -gem 'bootstrap-sass', '~> 2.3' +gem 'bootstrap-sass', '~> 3.0' gem "font-awesome-rails", '~> 3.2' gem "gemoji", "~> 1.3.0" gem "gon", git: "https://github.com/gitlabhq/gon.git", ref: '58ca8e17273051cb370182cabd3602d1da6783ab' diff --git a/Gemfile.lock b/Gemfile.lock index 7948f3fb5bc..1c30c17ed7b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -64,7 +64,7 @@ GEM erubis (>= 2.6.6) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bootstrap-sass (2.3.2.2) + bootstrap-sass (3.0.3.0) sass (~> 3.2) builder (3.1.4) capybara (2.1.0) @@ -575,7 +575,7 @@ DEPENDENCIES awesome_print better_errors binding_of_caller - bootstrap-sass (~> 2.3) + bootstrap-sass (~> 3.0) capybara carrierwave chosen-rails (= 1.0.1) |