diff options
| author | Marin Jankovski <marin@gitlab.com> | 2019-03-08 11:45:10 +0000 |
|---|---|---|
| committer | John Jarvis <jarv@gitlab.com> | 2019-03-08 12:58:52 +0100 |
| commit | 32e76c59da35eecc5e5cacdc3d57d55979f6d648 (patch) | |
| tree | c4c4df1e46dfdcff89ad8a985a486329ab9a5593 /app/assets | |
| parent | cc5027685711f8375eb04f713439d0b7ccfe402d (diff) | |
| download | gitlab-ce-32e76c59da35eecc5e5cacdc3d57d55979f6d648.tar.gz | |
Revert "Merge branch 'remove-select2-rails' into 'master'"
This reverts merge request !17871
Diffstat (limited to 'app/assets')
| -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 |