summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-10-11 19:19:47 +0000
committerRémy Coutable <remy@rymai.me>2016-10-11 19:19:47 +0000
commita4a9fdf1e7a61a5779d3f5cb8902f77cc2b4f472 (patch)
tree07cef0c553a4a5c706607734a054ca565f4c4390
parent670b2eb5c05a721f810a5b248612cadde0eaf2ce (diff)
parentea3bbbdef86ae30fcf76baaba11a3fceb6d2aa03 (diff)
downloadgitlab-ce-a4a9fdf1e7a61a5779d3f5cb8902f77cc2b4f472.tar.gz
Merge branch 'select2-fix-for-project-lfs-enabled' into 'master'
Fix JS bug with select2 because of missing `data-field` attribute in select box. Fix JS bug with select2 because of missing `data-field` attribute in select box. Fixes #23193 See merge request !6812
-rw-r--r--app/views/projects/edit.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index d19422c8657..c8f84b96cb7 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -91,7 +91,7 @@
Git Large File Storage
= link_to icon('question-circle'), help_page_path('workflow/lfs/manage_large_binaries_with_git_lfs')
.col-md-3
- = f.select :lfs_enabled, [%w(Enabled true), %w(Disabled false)], {}, selected: @project.lfs_enabled?, class: 'pull-right form-control'
+ = f.select :lfs_enabled, [%w(Enabled true), %w(Disabled false)], {}, selected: @project.lfs_enabled?, class: 'pull-right form-control', data: { field: 'lfs_enabled' }
- if Gitlab.config.registry.enabled
.form-group