From 561a040c72436f24f3982122a48aa1b878743b91 Mon Sep 17 00:00:00 2001
From: Stella Rouzi <differentreality@gmail.com>
Date: Mon, 18 Aug 2014 11:49:33 +0300
Subject: [PATCH] remove jquery-fileupload-rails

---
 Gemfile                                | 1 -
 Gemfile.lock                           | 4 ----
 app/assets/javascripts/application.js  | 1 -
 app/assets/stylesheets/application.css | 1 -
 4 files changed, 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index 83f5395c..2509b74f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -51,7 +51,6 @@ gem 'bootstrap3-datetimepicker-rails', '~> 3.0.2'
 
 # Use jquery as the JavaScript library
 gem 'jquery-rails'
-gem 'jquery-fileupload-rails'
 gem 'cocoon'
 
 # Use gravtastic for user avatars
diff --git a/Gemfile.lock b/Gemfile.lock
index f4a3d54f..4f4f441c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -164,9 +164,6 @@ GEM
     i18n (0.6.11)
     inversion (0.12.3)
       loggability (~> 0.4)
-    jquery-fileupload-rails (0.4.1)
-      actionpack (>= 3.1)
-      railties (>= 3.1)
     jquery-rails (3.1.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
@@ -431,7 +428,6 @@ DEPENDENCIES
   guard-rspec (~> 4.2.8)
   haml-rails
   hoptoad_notifier (~> 2.3)
-  jquery-fileupload-rails
   jquery-rails
   letter_opener
   mina
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 24cbfee5..a1d9df0b 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -12,7 +12,6 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require jquery-fileupload
 //= require jquery.dataTables
 //= require cocoon
 //= require bootstrap
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index dfc33e56..585394ab 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -1,7 +1,6 @@
 /*
  *= require strap-on
  *= require formtastic-bootstrap
- *= require jquery.fileupload-ui
  *= require jquery.dataTables_themeroller
  *= require osem
  *= require osem-rating