diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-10-01 08:34:35 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-10-01 08:34:35 +0000 |
| commit | 01c7a6752c94f87bd371e3ccba1a4852a1ed0523 (patch) | |
| tree | efdd0fad9b0606ff40f8b62c0eb409ff50b68d9d | |
| parent | 272e1482d6f96a9c139ddc6e3ab3e2d634184d4c (diff) | |
| parent | bfa26f4ffce92f21490137e4c9a567862a923727 (diff) | |
| download | gitlab-ce-01c7a6752c94f87bd371e3ccba1a4852a1ed0523.tar.gz | |
Merge branch 'remove-dropzonejs-rails' into 'master'
Remove dropzonejs-rails (replaced by dropzone node module)
See merge request gitlab-org/gitlab-ce!17831
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 3 | ||||
| -rw-r--r-- | Gemfile.rails5.lock | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/application.scss | 2 | ||||
| -rw-r--r-- | vendor/licenses.csv | 1 |
5 files changed, 1 insertions, 11 deletions
@@ -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' diff --git a/Gemfile.lock b/Gemfile.lock index d8eaaac99b1..2f898de09eb 100644 --- a/Gemfile.lock +++ b/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) diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock index ab35a4a399f..60db7abb76d 100644 --- a/Gemfile.rails5.lock +++ b/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) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index f2950308019..ffe65ce780e 100644 --- a/app/assets/stylesheets/application.scss +++ b/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 diff --git a/vendor/licenses.csv b/vendor/licenses.csv index 85b7d16db54..b36aabb9b3d 100644 --- a/vendor/licenses.csv +++ b/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 |