From ff64581a7059e87812e5f2fd1f14764cb4e0a417 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 2 Mar 2017 20:51:29 +0100 Subject: [PATCH] Bump fineuploader --- Gemfile | 2 +- Gemfile.lock | 4 ++-- app/assets/javascripts/jasmine-load-all.js | 2 +- app/assets/javascripts/main.js | 2 +- app/assets/javascripts/mobile/mobile.js | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 98e56c6e7..04aa8c053 100644 --- a/Gemfile +++ b/Gemfile @@ -106,7 +106,7 @@ source "https://rails-assets.org" do gem "rails-assets-backbone", "1.3.3" gem "rails-assets-bootstrap-markdown", "2.10.0" gem "rails-assets-corejs-typeahead", "1.1.1" - gem "rails-assets-fineuploader-dist", "5.11.0" + gem "rails-assets-fine-uploader", "5.13.0" # jQuery plugins diff --git a/Gemfile.lock b/Gemfile.lock index 34db0227c..ae6459503 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -534,7 +534,7 @@ GEM rails-assets-jquery.ui (~> 1.11.4) rails-assets-emojione (2.0.1) rails-assets-favico.js (0.3.10) - rails-assets-fineuploader-dist (5.11.0) + rails-assets-fine-uploader (5.13.0) rails-assets-highlightjs (9.7.0) rails-assets-jasmine (2.4.1) rails-assets-jasmine-ajax (3.2.0) @@ -875,7 +875,7 @@ DEPENDENCIES rails-assets-bootstrap-markdown (= 2.10.0)! rails-assets-corejs-typeahead (= 1.1.1)! rails-assets-diaspora_jsxc (= 0.1.5.develop.7)! - rails-assets-fineuploader-dist (= 5.11.0)! + rails-assets-fine-uploader (= 5.13.0)! rails-assets-highlightjs (= 9.7.0)! rails-assets-jasmine-ajax (= 3.2.0)! rails-assets-jquery (= 2.2.4)! diff --git a/app/assets/javascripts/jasmine-load-all.js b/app/assets/javascripts/jasmine-load-all.js index 756f84ce7..be83acdec 100644 --- a/app/assets/javascripts/jasmine-load-all.js +++ b/app/assets/javascripts/jasmine-load-all.js @@ -2,7 +2,7 @@ //= require handlebars.runtime //= require templates //= require main -//= require fineuploader-dist/dist/fine-uploader.core +//= require fine-uploader/fine-uploader.core //= require mobile/mobile //= require jquery.autoSuggest.custom //= require contact-list diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 96acc6b46..87f9d1cba 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -18,7 +18,7 @@ //= require jquery-ui/sortable //= require keycodes //= require jquery.autoSuggest.custom -//= require fineuploader-dist/dist/fine-uploader.core +//= require fine-uploader/fine-uploader.core //= require handlebars.runtime //= require posix-bracket-expressions //= require markdown-it diff --git a/app/assets/javascripts/mobile/mobile.js b/app/assets/javascripts/mobile/mobile.js index 70f55e694..c7259edda 100644 --- a/app/assets/javascripts/mobile/mobile.js +++ b/app/assets/javascripts/mobile/mobile.js @@ -10,7 +10,7 @@ //= require autosize //= require keycodes //= require jquery.autoSuggest.custom -//= require fineuploader-dist/dist/fine-uploader.core +//= require fine-uploader/fine-uploader.core //= require rails-timeago //= require underscore //= require bootstrap