Download as
Browse Code »

Commit da4244484b2a39b518b039fce46200f93817e79d

Authored by Dmitriy Zaporozhets
1 parent a2355c52
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Bootstrap-sass 3 gem 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
Gemfile
  Diff comments   View file @da42444
... ... @@ -151,7 +151,7 @@ gem &quot;jquery-rails&quot;, &quot;2.1.3&quot;
151 151 gem "jquery-ui-rails", "2.0.2"
152 152 gem "modernizr", "2.6.2"
153 153 gem "raphael-rails", "~> 2.1.2"
154   -gem 'bootstrap-sass', '~> 2.3'
  154 +gem 'bootstrap-sass', '~> 3.0'
155 155 gem "font-awesome-rails", '~> 3.2'
156 156 gem "gemoji", "~> 1.3.0"
157 157 gem "gon", git: "https://github.com/gitlabhq/gon.git", ref: '58ca8e17273051cb370182cabd3602d1da6783ab'
... ...
Gemfile.lock
  Diff comments   View file @da42444
... ... @@ -64,7 +64,7 @@ GEM
64 64 erubis (>= 2.6.6)
65 65 binding_of_caller (0.7.2)
66 66 debug_inspector (>= 0.0.1)
67   - bootstrap-sass (2.3.2.2)
  67 + bootstrap-sass (3.0.3.0)
68 68 sass (~> 3.2)
69 69 builder (3.1.4)
70 70 capybara (2.1.0)
... ... @@ -575,7 +575,7 @@ DEPENDENCIES
575 575 awesome_print
576 576 better_errors
577 577 binding_of_caller
578   - bootstrap-sass (~> 2.3)
  578 + bootstrap-sass (~> 3.0)
579 579 capybara
580 580 carrierwave
581 581 chosen-rails (= 1.0.1)
... ...