diff --git a/Gemfile b/Gemfile index e8cc31e32..aac8ae44a 100644 --- a/Gemfile +++ b/Gemfile @@ -14,6 +14,7 @@ gem 'omniauth-meetup' gem 'gravatar_image_tag' gem 'simple_form' gem 'sentry-raven' +gem 'json', '~> 1.7.0' # locked until Zeus gets its act together group :production do gem 'pg' @@ -24,7 +25,6 @@ group :assets do gem 'jquery-datatables-rails' gem 'sass-rails' gem 'coffee-rails' - gem 'modernizr_rails', :require => 'modernizr-rails' gem 'uglifier' gem 'bootstrap-sass-rails' gem 'jquery-ui-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 908455b40..28983964c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -103,12 +103,12 @@ GEM guard-rspec (2.5.0) guard (>= 1.1) rspec (~> 2.11) - handlebars_assets (0.12.0) + handlebars_assets (0.14.1) execjs (>= 1.2.9) sprockets (>= 2.0.3) tilt hashie (1.2.0) - hike (1.2.1) + hike (1.2.3) http_parser.rb (0.5.3) httpauth (0.2.0) i18n (0.6.1) @@ -121,7 +121,7 @@ GEM journey (1.0.4) jquery-datatables-rails (1.11.2) jquery-rails - jquery-rails (2.2.1) + jquery-rails (3.0.1) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) jquery-ui-rails (4.0.1) @@ -140,10 +140,7 @@ GEM treetop (~> 1.4.8) method_source (0.8.1) mime-types (1.23) - modernizr_rails (2.5.3) - railties (~> 3.0) - thor (~> 0.14) - multi_json (1.7.2) + multi_json (1.7.7) multipart-post (1.2.0) nested_form (0.3.1) nokogiri (1.5.9) @@ -197,7 +194,7 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (10.0.4) + rake (10.1.0) rb-fsevent (0.9.3) rdoc (3.12.2) json (~> 1.4) @@ -259,7 +256,7 @@ GEM eventmachine (>= 0.12.6) rack (>= 1.0.0) thor (0.18.1) - tilt (1.3.6) + tilt (1.4.1) treetop (1.4.12) polyglot polyglot (>= 0.3.1) @@ -300,8 +297,8 @@ DEPENDENCIES jquery-datatables-rails jquery-rails jquery-ui-rails + json (~> 1.7.0) launchy - modernizr_rails nested_form omniauth-meetup pg diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index ae47c47b2..b6645b25b 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -12,7 +12,6 @@ //= require twitter/bootstrap/tooltip //= require twitter/bootstrap/popover //= require select2 -//= require modernizr //= require handlebars.runtime //= require underscore //= require backbone