diff --git a/Gemfile b/Gemfile index bd634d1ab..2d65b08be 100644 --- a/Gemfile +++ b/Gemfile @@ -112,7 +112,6 @@ source "https://rails-assets.org" do gem "rails-assets-jquery-placeholder", "2.3.1" gem "rails-assets-jquery-textchange", "0.2.3" gem "rails-assets-perfect-scrollbar", "0.6.10" - gem "rails-assets-jakobmattsson--jquery-elastic", "1.6.11" gem "rails-assets-autosize", "3.0.15" gem "rails-assets-blueimp-gallery", "2.17.0" end diff --git a/Gemfile.lock b/Gemfile.lock index 46e679250..d702ad0e2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -637,8 +637,6 @@ GEM rails-assets-jquery.ui (~> 1.11.4) rails-assets-favico.js (0.3.10) rails-assets-highlightjs (9.1.0) - rails-assets-jakobmattsson--jquery-elastic (1.6.11) - rails-assets-jquery (>= 1.2.6) rails-assets-jasmine (2.4.1) rails-assets-jasmine-ajax (3.2.0) rails-assets-jasmine (~> 2) @@ -989,7 +987,6 @@ DEPENDENCIES rails-assets-blueimp-gallery (= 2.17.0)! rails-assets-diaspora_jsxc (~> 0.1.5.develop)! rails-assets-highlightjs (= 9.1.0)! - rails-assets-jakobmattsson--jquery-elastic (= 1.6.11)! rails-assets-jasmine-ajax (= 3.2.0)! rails-assets-jeresig--jquery.hotkeys (= 0.2.0)! rails-assets-jquery (= 1.12.0)! diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 2a2ef7c1d..47618526d 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -13,7 +13,6 @@ //= require jquery-placeholder //= require rails-timeago //= require jquery.events.input -//= require jakobmattsson-jquery-elastic //= require jquery.infinitescroll-custom //= require jquery-ui/core //= require jquery-ui/widget