diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-11-08 17:28:31 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-11-08 17:28:31 +0000 |
| commit | d215159d03213118b56129948c801b3d9712a53a (patch) | |
| tree | 07eeb37a5c66b60fe0e3abf7df752bc415997c1b | |
| parent | 0108387053ac78bb2354511950fb5847a033e5d5 (diff) | |
| parent | 8fec16ac4eda4bc0e908e39d4299c369e15127fd (diff) | |
| download | gitlab-ce-d215159d03213118b56129948c801b3d9712a53a.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 8d976952781..3176af9c19b 100644 --- a/app/views/shared/issuable/_form.html.haml +++ b/app/views/shared/issuable/_form.html.haml @@ -129,7 +129,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: |