diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-11-08 17:28:31 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-11-15 18:38:48 +0100 |
| commit | 33f9012fd39a7fcbb43d1ff022668cdfad6ecb21 (patch) | |
| tree | 816ae7ab09bfb1a7c716b6810990f96913e7be2d | |
| parent | baac28cbeacc5abaa144e0e0dd546f6e62735373 (diff) | |
| download | gitlab-ce-33f9012fd39a7fcbb43d1ff022668cdfad6ecb21.tar.gz | |
Merge branch 'fix-uncheckable-label-for-force_remove_source_branch' into 'master'
Clicking "force remove source branch" label now toggles the checkbox again
We remove the ID from the hidden tag for `merge_request[force_remove_source_branch]`
in order to fix the checkbox toggling when the associated label is clicked.
The issue was introduced by !7267 and discovered in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7267#note_18028311.
See merge request !7356
| -rw-r--r-- | app/views/shared/issuable/_form.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-uncheckable-label-for-force_remove_source_branch.yml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml index 0ace6be8f4e..ce91b5966a0 100644 --- a/app/views/shared/issuable/_form.html.haml +++ b/app/views/shared/issuable/_form.html.haml @@ -142,7 +142,7 @@ .col-sm-10.col-sm-offset-2 .checkbox = label_tag 'merge_request[force_remove_source_branch]' do - = hidden_field_tag 'merge_request[force_remove_source_branch]', '0' + = hidden_field_tag 'merge_request[force_remove_source_branch]', '0', id: nil = check_box_tag 'merge_request[force_remove_source_branch]', '1', @merge_request.force_remove_source_branch? Remove source branch when merge request is accepted. diff --git a/changelogs/unreleased/fix-uncheckable-label-for-force_remove_source_branch.yml b/changelogs/unreleased/fix-uncheckable-label-for-force_remove_source_branch.yml new file mode 100644 index 00000000000..8b41063151b --- /dev/null +++ b/changelogs/unreleased/fix-uncheckable-label-for-force_remove_source_branch.yml @@ -0,0 +1,4 @@ +--- +title: Clicking "force remove source branch" label now toggles the checkbox again +merge_request: +author: |