Merge branch 'mg-remove-select2-rails' into 'master'

Remove select2-rails (select2 is now installed via yarn)

See merge request gitlab-org/gitlab-ce!25929

3 files changed, 1 insertions, 5 deletions

diff --git a/Gemfile b/Gemfile
index 2e465f8ced7..caa40e99307 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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..634029e03de 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)
@@ -1144,7 +1142,6 @@ DEPENDENCIES
   sass-rails (~> 5.0.6)
   scss_lint (~> 0.56.0)
   seed-fu (~> 2.3.7)
-  select2-rails (~> 3.5.9)
   selenium-webdriver (~> 3.12)
   sentry-raven (~> 2.7)
   settingslogic (~> 2.0.9)
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