diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-11-08 15:06:19 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-11-08 15:07:58 +0100 |
| commit | 8fec16ac4eda4bc0e908e39d4299c369e15127fd (patch) | |
| tree | 49ae77cad7357c2517cda1e7f5adc4a5409d7a9e | |
| parent | 5db9c791e54b21e4cf440e4615f3b08e2ba4dd13 (diff) | |
| download | gitlab-ce-fix-uncheckable-label-for-force_remove_source_branch.tar.gz | |
Clicking "force remove source branch" label now toggles the checkbox againfix-uncheckable-label-for-force_remove_source_branch
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -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: |