diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-10-10 17:41:57 +0000 |
|---|---|---|
| committer | Cindy Pallares <cindy@gitlab.com> | 2018-10-11 16:35:49 -0500 |
| commit | 6ffcd1f4be63897dcea08c8ef03eafb2fb328451 (patch) | |
| tree | 0293f741fbcec29c33484738ba5a210b056c9ab4 | |
| parent | 77256e2601095bedfbb6834d1ec30666cae2fc1f (diff) | |
| download | gitlab-ce-6ffcd1f4be63897dcea08c8ef03eafb2fb328451.tar.gz | |
Merge branch '52103-dropzone-css-is-failing-to-load-on-rspec-dev-and-staging-11-4-0-rc' into 'master'
Resolve "Dropzone css is failing to load on rspec, dev and staging 11.4.0 RC"
Closes #52103
See merge request gitlab-org/gitlab-ce!22272
| -rw-r--r-- | app/assets/stylesheets/application.scss | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index ffe65ce780e..bd1cca69c03 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -17,7 +17,7 @@ */ @import "../../../node_modules/pikaday/scss/pikaday"; -@import "../../../node_modules/dropzone/dist/basic.css"; +@import "../../../node_modules/dropzone/dist/basic"; /* * GitLab UI framework |