Commit ca1d31f8 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'modernizr_gem' into 'master'

Remove Modernizr gem
parents 3faa14e7 7ab46b96
...@@ -159,7 +159,6 @@ gem 'select2-rails' ...@@ -159,7 +159,6 @@ gem 'select2-rails'
gem 'jquery-atwho-rails', "~> 0.3.3" gem 'jquery-atwho-rails', "~> 0.3.3"
gem "jquery-rails", "2.1.3" gem "jquery-rails", "2.1.3"
gem "jquery-ui-rails", "2.0.2" gem "jquery-ui-rails", "2.0.2"
gem "modernizr", "2.6.2"
gem "raphael-rails", "~> 2.1.2" gem "raphael-rails", "~> 2.1.2"
gem 'bootstrap-sass', '~> 3.0' gem 'bootstrap-sass', '~> 3.0'
gem "font-awesome-rails", '~> 3.2' gem "font-awesome-rails", '~> 3.2'
......
...@@ -285,8 +285,6 @@ GEM ...@@ -285,8 +285,6 @@ GEM
method_source (0.8.2) method_source (0.8.2)
mime-types (1.25.1) mime-types (1.25.1)
minitest (4.7.5) minitest (4.7.5)
modernizr (2.6.2)
sprockets (~> 2.0)
multi_json (1.8.4) multi_json (1.8.4)
multi_xml (0.5.5) multi_xml (0.5.5)
multipart-post (1.2.0) multipart-post (1.2.0)
...@@ -616,7 +614,6 @@ DEPENDENCIES ...@@ -616,7 +614,6 @@ DEPENDENCIES
launchy launchy
letter_opener letter_opener
minitest (~> 4.7.0) minitest (~> 4.7.0)
modernizr (= 2.6.2)
mysql2 mysql2
nprogress-rails nprogress-rails
omniauth (~> 1.1.3) omniauth (~> 1.1.3)
......
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#= require turbolinks #= require turbolinks
#= require jquery.turbolinks #= require jquery.turbolinks
#= require bootstrap #= require bootstrap
#= require modernizr
#= require select2 #= require select2
#= require raphael #= require raphael
#= require g.raphael-min #= require g.raphael-min
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment