diff --git a/Gemfile b/Gemfile index f42883f5d..eb3c765e8 100644 --- a/Gemfile +++ b/Gemfile @@ -49,6 +49,7 @@ gem 'rakismet' gem 'recaptcha', require: "recaptcha/rails" gem 'activemodel-serializers-xml' gem 'ptools' +gem 'jquery-rails' # needed for looser jpeg header compat gem 'ruby-imagespec', :require => "image_spec", :git => "https://github.com/r888888888/ruby-imagespec.git", :branch => "exif-fixes" diff --git a/Gemfile.lock b/Gemfile.lock index 8e25e9d1b..1db086539 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -182,6 +182,10 @@ GEM i18n (1.0.1) concurrent-ruby (~> 1.0) jmespath (1.4.0) + jquery-rails (4.3.3) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) json (2.1.0) jwt (1.5.6) kgio (2.11.2) @@ -450,6 +454,7 @@ DEPENDENCIES google-api-client highline httparty + jquery-rails listen mechanize memcache-client diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index b36117eeb..fcc0f16d1 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -8,6 +8,6 @@ //= require jquery.qtip.js //= require ugoira_player.js //= require stupidtable.js -//= require rails-ujs +//= require jquery_ujs //= require common.js //= require_tree .