diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-03 19:07:47 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-03 19:07:47 +0000 |
| commit | d636efbe26ee51030bb108d889c2ef867570358a (patch) | |
| tree | 09065fb7b3f12b203f651c5aaa77ca2bdf179fb1 /app/views/shared | |
| parent | 3ac3106e585273b1d9c673c71f794ae018698f83 (diff) | |
| parent | 46689162a3902ab294341b5860f16947ed030170 (diff) | |
| download | gitlab-ce-d636efbe26ee51030bb108d889c2ef867570358a.tar.gz | |
Merge branch '24102-cannot-unselect-remove-source-branch-when-editing-merge-request' into 'master'
Fixes #24102
See merge request !7267
Diffstat (limited to 'app/views/shared')
| -rw-r--r-- | app/views/shared/issuable/_form.html.haml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml index d410755cad1..0ace6be8f4e 100644 --- a/app/views/shared/issuable/_form.html.haml +++ b/app/views/shared/issuable/_form.html.haml @@ -142,6 +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' = check_box_tag 'merge_request[force_remove_source_branch]', '1', @merge_request.force_remove_source_branch? Remove source branch when merge request is accepted. |