summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-10-13 10:47:53 +0000
committerFatih Acet <acetfatih@gmail.com>2016-10-13 10:47:53 +0000
commit8ca0387fe5caeb09f02273d96ed3e6295b02d468 (patch)
treec50f3b4bc2f10825936365daa91ebec40a8f91bb
parent3f95461f8aeec5ce7da1ae7cd7c0c7d867384a58 (diff)
parent66af08df281214f59bb21e911949625024b41829 (diff)
downloadgitlab-ce-8ca0387fe5caeb09f02273d96ed3e6295b02d468.tar.gz
Merge branch 'project-edit-branch-dropdown-fix' into 'master'
Fixed default branch dropdown not converting to select2 ## What does this MR do? The LFS dropdown doesn't have the `data` attribute & it isn't needed because it doesn't hide/show any elements. This filters out the `<select>` without that attribute. ## What are the relevant issue numbers? Closes #23200 See merge request !6810
-rw-r--r--app/assets/javascripts/project_new.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/project_new.js b/app/assets/javascripts/project_new.js
index a787b11f2a9..3cf41505814 100644
--- a/app/assets/javascripts/project_new.js
+++ b/app/assets/javascripts/project_new.js
@@ -4,7 +4,9 @@
this.ProjectNew = (function() {
function ProjectNew() {
this.toggleSettings = bind(this.toggleSettings, this);
- this.$selects = $('.features select');
+ this.$selects = $('.features select').filter(function () {
+ return $(this).data('field');
+ });
$('.project-edit-container').on('ajax:before', (function(_this) {
return function() {