diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-10-11 19:19:47 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-10-17 14:08:20 +0200 |
| commit | 70b24e49938fcf5fde3dde3b38ec0b9f941eebef (patch) | |
| tree | 98a886f8de0fb32ee76cd1f9e718427a994349bc | |
| parent | 2b63a7ef5a2376e607ebc98c4bf5a9fa7c588674 (diff) | |
| download | gitlab-ce-70b24e49938fcf5fde3dde3b38ec0b9f941eebef.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.
Fixes #23193
See merge request !6812
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/projects/edit.html.haml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index c19d499ff53..ccf71700e1a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,7 @@ v 8.12.7 - Fix Long commit messages overflow viewport in file tree. !6573 - 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 + - Fix JS bug with select2 because of missing `data-field` attribute in select box. !6812 v 8.12.6 - Update mailroom to 0.8.1 in Gemfile.lock !6814 diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index a04d53e02bf..d7705d94465 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 |