diff --git a/Gemfile b/Gemfile index 2d65b08be..79a6eb5a8 100644 --- a/Gemfile +++ b/Gemfile @@ -108,7 +108,6 @@ source "https://rails-assets.org" do # jQuery plugins - gem "rails-assets-jeresig--jquery.hotkeys", "0.2.0" gem "rails-assets-jquery-placeholder", "2.3.1" gem "rails-assets-jquery-textchange", "0.2.3" gem "rails-assets-perfect-scrollbar", "0.6.10" diff --git a/Gemfile.lock b/Gemfile.lock index d702ad0e2..6baa27335 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -640,8 +640,6 @@ GEM rails-assets-jasmine (2.4.1) rails-assets-jasmine-ajax (3.2.0) rails-assets-jasmine (~> 2) - rails-assets-jeresig--jquery.hotkeys (0.2.0) - rails-assets-jquery (>= 1.4.2) rails-assets-jquery (1.12.0) rails-assets-jquery-colorbox (1.6.3) rails-assets-jquery (>= 1.3.2) @@ -988,7 +986,6 @@ DEPENDENCIES rails-assets-diaspora_jsxc (~> 0.1.5.develop)! rails-assets-highlightjs (= 9.1.0)! rails-assets-jasmine-ajax (= 3.2.0)! - rails-assets-jeresig--jquery.hotkeys (= 0.2.0)! rails-assets-jquery (= 1.12.0)! rails-assets-jquery-placeholder (= 2.3.1)! rails-assets-jquery-textchange (= 0.2.3)! diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 47618526d..ba2bb5e3d 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -6,7 +6,6 @@ //= require js-routes //= require underscore //= require backbone -//= require jquery.hotkeys //= require jquery.remotipart //= require autosize //= require jquery.charcount