Merge branch 'remove-select2-rails' into 'master'
remove select2-rails (select2 is now installed via yarn) Closes #36711 See merge request gitlab-org/gitlab-ce!17871
This commit is contained in:
commit
d1960efd29
1
Gemfile
1
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'
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue