Merge branch 'remove-dropzonejs-rails' into 'master'

Remove dropzonejs-rails (replaced by dropzone node module)

See merge request gitlab-org/gitlab-ce!17831

Gemfile

@@ -112,9 +112,6 @@ gem 'hamlit', '~> 2.8.8'
 gem 'carrierwave', '= 1.2.3'
 gem 'mini_magick'
 
-# Drag and Drop UI
-gem 'dropzonejs-rails', '~> 0.7.1'
-
 # for backups
 gem 'fog-aws', '~> 2.0.1'
 gem 'fog-core', '~> 1.44'

Gemfile.lock

@@ -175,8 +175,6 @@ GEM
     doorkeeper-openid_connect (1.5.0)
       doorkeeper (~> 4.3)
       json-jwt (~> 1.6)
-    dropzonejs-rails (0.7.2)
-      rails (> 3.1)
     ed25519 (1.2.4)
     email_reply_trimmer (0.1.6)
     email_spec (2.2.0)
@@ -1006,7 +1004,6 @@ DEPENDENCIES
   diffy (~> 3.1.0)
   doorkeeper (~> 4.3)
   doorkeeper-openid_connect (~> 1.5)
-  dropzonejs-rails (~> 0.7.1)
   ed25519 (~> 1.2)
   email_reply_trimmer (~> 0.1)
   email_spec (~> 2.2.0)

Gemfile.rails5.lock

@@ -178,8 +178,6 @@ GEM
     doorkeeper-openid_connect (1.5.0)
       doorkeeper (~> 4.3)
       json-jwt (~> 1.6)
-    dropzonejs-rails (0.7.2)
-      rails (> 3.1)
     ed25519 (1.2.4)
     email_reply_trimmer (0.1.6)
     email_spec (2.2.0)
@@ -1015,7 +1013,6 @@ DEPENDENCIES
   diffy (~> 3.1.0)
   doorkeeper (~> 4.3)
   doorkeeper-openid_connect (~> 1.5)
-  dropzonejs-rails (~> 0.7.1)
   ed25519 (~> 1.2)
   email_reply_trimmer (~> 0.1)
   email_spec (~> 2.2.0)

app/assets/stylesheets/application.scss

@@ -5,7 +5,6 @@
  *= require jquery.atwho
  *= require select2
  *= require_self
- *= require dropzone/basic
  *= require cropper.css
 */
 
@@ -18,6 +17,7 @@
  */
 
 @import "../../../node_modules/pikaday/scss/pikaday";
+@import "../../../node_modules/dropzone/dist/basic.css";
 
 /*
  * GitLab UI framework

vendor/licenses.csv

@@ -336,7 +336,6 @@ doorkeeper,4.3.2,MIT
 doorkeeper-openid_connect,1.5.0,MIT
 dot-prop,4.2.0,MIT
 dropzone,4.2.0,MIT
-dropzonejs-rails,0.7.2,MIT
 duplexer,0.1.1,MIT
 duplexer3,0.1.4,New BSD
 duplexify,3.5.3,MIT