diff options
| author | Praveen Arimbrathodiyil <praveen@debian.org> | 2019-03-08 07:38:20 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2019-03-08 07:38:20 +0000 |
| commit | c21543fe75c5bf63a8d61a98a3e417b6e4ea09fd (patch) | |
| tree | 1a091f85e43989efb7b53d6de8fac4bb037d9cdc | |
| parent | 5596eed162da4044299af57ff08cbd72393b2890 (diff) | |
| download | gitlab-ce-c21543fe75c5bf63a8d61a98a3e417b6e4ea09fd.tar.gz | |
remove select2-rails (select2 is now installed via yarn)
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/application.scss | 2 |
3 files changed, 1 insertions, 4 deletions
@@ -267,7 +267,6 @@ gem 'gemojione', '~> 3.3' gem 'gon', '~> 6.2' gem 'jquery-atwho-rails', '~> 1.3.2' gem 'request_store', '~> 1.3' -gem 'select2-rails', '~> 3.5.9' gem 'virtus', '~> 1.0.1' gem 'base32', '~> 0.3.0' diff --git a/Gemfile.lock b/Gemfile.lock index 4d37075cdfa..278a1a64472 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -811,8 +811,6 @@ GEM seed-fu (2.3.7) activerecord (>= 3.1) activesupport (>= 3.1) - select2-rails (3.5.9.3) - thor (~> 0.14) selenium-webdriver (3.12.0) childprocess (~> 0.5) rubyzip (~> 1.2) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 83ad8766cb5..d1cf2b8f9a0 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -3,7 +3,6 @@ * 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 */ @@ -18,6 +17,7 @@ @import "../../../node_modules/pikaday/scss/pikaday"; @import "../../../node_modules/dropzone/dist/basic"; +@import "../../../node_modules/select2/select2"; /* * GitLab UI framework |