diff options
| author | Marin Jankovski <marin@gitlab.com> | 2019-03-08 14:45:10 +0300 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2019-03-08 14:45:10 +0300 |
| commit | ec1724daddfe1f3ea9a504aec6c791267f49ba8a (patch) | |
| tree | 45f25a7ef36e6945fa1fe400e2adb25edb6cfd67 /app/assets/stylesheets/application.scss | |
| parent | c8116ebda8cfb1176d56ff371062e7564e969022 (diff) | |
Revert "Merge branch 'remove-select2-rails' into 'master'"
This reverts merge request !17871
Diffstat (limited to 'app/assets/stylesheets/application.scss')
| -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 |