diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-03 07:42:38 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-03 07:42:38 +0000 |
| commit | ca1d31f8cdd111c79f547b2e511f478d8f15696e (patch) | |
| tree | 72651b7942f91118da994b73646384e6e389afa4 | |
| parent | 3faa14e7a748097528ed36cf02ccacd62cd8f044 (diff) | |
| parent | 7ab46b969f5c817acc849e0ed6ce23d25bd5fa09 (diff) | |
| download | gitlab-ce-ca1d31f8cdd111c79f547b2e511f478d8f15696e.tar.gz | |
Merge branch 'modernizr_gem' into 'master'
Remove Modernizr gem
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 3 | ||||
| -rw-r--r-- | app/assets/javascripts/application.js.coffee | 1 |
3 files changed, 0 insertions, 5 deletions
@@ -159,7 +159,6 @@ gem 'select2-rails' gem 'jquery-atwho-rails', "~> 0.3.3" 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', '~> 3.0' gem "font-awesome-rails", '~> 3.2' diff --git a/Gemfile.lock b/Gemfile.lock index 4acdb539f09..009edd3ea3c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -285,8 +285,6 @@ GEM method_source (0.8.2) mime-types (1.25.1) minitest (4.7.5) - modernizr (2.6.2) - sprockets (~> 2.0) multi_json (1.8.4) multi_xml (0.5.5) multipart-post (1.2.0) @@ -616,7 +614,6 @@ DEPENDENCIES launchy letter_opener minitest (~> 4.7.0) - modernizr (= 2.6.2) mysql2 nprogress-rails omniauth (~> 1.1.3) diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index 5042221abe4..a22ff6dec31 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -18,7 +18,6 @@ #= require turbolinks #= require jquery.turbolinks #= require bootstrap -#= require modernizr #= require select2 #= require raphael #= require g.raphael-min |