Commit ca1d31f8cdd111c79f547b2e511f478d8f15696e
Exists in
spb-stable
and in
3 other branches
Merge branch 'modernizr_gem' into 'master'
Remove Modernizr gem
Showing
3 changed files
with
0 additions
and
5 deletions
Show diff stats
Gemfile
| @@ -159,7 +159,6 @@ gem 'select2-rails' | @@ -159,7 +159,6 @@ gem 'select2-rails' | ||
| 159 | gem 'jquery-atwho-rails', "~> 0.3.3" | 159 | gem 'jquery-atwho-rails', "~> 0.3.3" |
| 160 | gem "jquery-rails", "2.1.3" | 160 | gem "jquery-rails", "2.1.3" |
| 161 | gem "jquery-ui-rails", "2.0.2" | 161 | gem "jquery-ui-rails", "2.0.2" |
| 162 | -gem "modernizr", "2.6.2" | ||
| 163 | gem "raphael-rails", "~> 2.1.2" | 162 | gem "raphael-rails", "~> 2.1.2" |
| 164 | gem 'bootstrap-sass', '~> 3.0' | 163 | gem 'bootstrap-sass', '~> 3.0' |
| 165 | gem "font-awesome-rails", '~> 3.2' | 164 | gem "font-awesome-rails", '~> 3.2' |
Gemfile.lock
| @@ -285,8 +285,6 @@ GEM | @@ -285,8 +285,6 @@ GEM | ||
| 285 | method_source (0.8.2) | 285 | method_source (0.8.2) |
| 286 | mime-types (1.25.1) | 286 | mime-types (1.25.1) |
| 287 | minitest (4.7.5) | 287 | minitest (4.7.5) |
| 288 | - modernizr (2.6.2) | ||
| 289 | - sprockets (~> 2.0) | ||
| 290 | multi_json (1.8.4) | 288 | multi_json (1.8.4) |
| 291 | multi_xml (0.5.5) | 289 | multi_xml (0.5.5) |
| 292 | multipart-post (1.2.0) | 290 | multipart-post (1.2.0) |
| @@ -616,7 +614,6 @@ DEPENDENCIES | @@ -616,7 +614,6 @@ DEPENDENCIES | ||
| 616 | launchy | 614 | launchy |
| 617 | letter_opener | 615 | letter_opener |
| 618 | minitest (~> 4.7.0) | 616 | minitest (~> 4.7.0) |
| 619 | - modernizr (= 2.6.2) | ||
| 620 | mysql2 | 617 | mysql2 |
| 621 | nprogress-rails | 618 | nprogress-rails |
| 622 | omniauth (~> 1.1.3) | 619 | omniauth (~> 1.1.3) |
app/assets/javascripts/application.js.coffee
| @@ -18,7 +18,6 @@ | @@ -18,7 +18,6 @@ | ||
| 18 | #= require turbolinks | 18 | #= require turbolinks |
| 19 | #= require jquery.turbolinks | 19 | #= require jquery.turbolinks |
| 20 | #= require bootstrap | 20 | #= require bootstrap |
| 21 | -#= require modernizr | ||
| 22 | #= require select2 | 21 | #= require select2 |
| 23 | #= require raphael | 22 | #= require raphael |
| 24 | #= require g.raphael-min | 23 | #= require g.raphael-min |