Commit 70b24e49 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'select2-fix-for-project-lfs-enabled' into 'master'

Fix JS bug with select2 because of missing `data-field` attribute in select box.

Fixes #23193

See merge request !6812
Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 2b63a7ef
...@@ -5,6 +5,7 @@ v 8.12.7 ...@@ -5,6 +5,7 @@ v 8.12.7
- Fix Long commit messages overflow viewport in file tree. !6573 - Fix Long commit messages overflow viewport in file tree. !6573
- Use gitlab-markup gem instead of github-markup to fix `.rst` file rendering. !6659 - Use gitlab-markup gem instead of github-markup to fix `.rst` file rendering. !6659
- Prevent flash alert text from being obscured when container is fluid. !6694 - Prevent flash alert text from being obscured when container is fluid. !6694
- Fix JS bug with select2 because of missing `data-field` attribute in select box. !6812
v 8.12.6 v 8.12.6
- Update mailroom to 0.8.1 in Gemfile.lock !6814 - Update mailroom to 0.8.1 in Gemfile.lock !6814
......
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
Git Large File Storage Git Large File Storage
= link_to icon('question-circle'), help_page_path('workflow/lfs/manage_large_binaries_with_git_lfs') = link_to icon('question-circle'), help_page_path('workflow/lfs/manage_large_binaries_with_git_lfs')
.col-md-3 .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 - if Gitlab.config.registry.enabled
.form-group .form-group
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment