diff options
| author | Phil Hughes <me@iamphill.com> | 2019-03-08 15:45:49 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-03-08 15:45:49 +0300 |
| commit | 26477f388952f9b8d02fcca6ac4395915e48218c (patch) | |
| tree | ff5b48db707362277e9a7b1603cda4837ead8013 /app | |
| parent | 40016ab741cd4c9fb873b2dcdc009393aa496b71 (diff) | |
| parent | ec1724daddfe1f3ea9a504aec6c791267f49ba8a (diff) | |
Merge branch 'revert-d1960efd' into 'master'
Revert "Merge branch 'remove-select2-rails' into 'master'"
See merge request gitlab-org/gitlab-ce!25920
Diffstat (limited to 'app')
| -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 d1cf2b8f9a0..83ad8766cb5 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -3,6 +3,7 @@ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at * the top of the compiled file, but it's generally better to create a new file per style scope. *= require jquery.atwho + *= require select2 *= require_self *= require cropper.css */ @@ -17,7 +18,6 @@ @import "../../../node_modules/pikaday/scss/pikaday"; @import "../../../node_modules/dropzone/dist/basic"; -@import "../../../node_modules/select2/select2"; /* * GitLab UI framework |