Add option to create merge request when editing/creating a file
Replaces !1611 (closed)
Fixes #3059 (closed)
Merge request reports
Activity
mentioned in merge request !1611 (closed)
Added 58 commits:
-
b6251af4...21a59b23 - 57 commits from branch
master
- e86d53b2 - Merge branch 'master' into dirceu/gitlab-ce-new-merge-request-from-file-edit
-
b6251af4...21a59b23 - 57 commits from branch
Added 4 commits:
-
e86d53b2...a5a57452 - 3 commits from branch
master
- da7d4f84 - Merge branch 'master' into dirceu/gitlab-ce-new-merge-request-from-file-edit
-
e86d53b2...a5a57452 - 3 commits from branch
Reassigned to @rspeicher
Added 1 commit:
- f3cfd209 - DRY up code
It looks like that everywhere where you can commit from the web UI, and the checkbox is only shown when the branch is changed to something other than the branch you are currently on (usually
master
).Note that this does NOT yet do #3215 (closed) and #3441 (closed), those will go in 8.3
@DouweM awesome. Would be nice to have
mentioned in issue #3416 (closed)
14 - unless @project.empty_repo? 15 .form-group 16 = label_tag :branch_name, 'Branch', class: 'control-label' 17 .col-sm-10 18 = text_field_tag 'new_branch', @ref, class: "form-control" 13 14 = render 'shared/new_commit_form', placeholder: "Add new directory" 15 19 16 .form-group 20 17 .col-sm-offset-2.col-sm-10 21 18 = submit_tag "Create directory", class: 'btn btn-primary btn-create' 22 19 = link_to "Cancel", '#', class: "btn btn-cancel", "data-dismiss" => "modal" 23 20 24 21 :javascript 25 disableButtonIfAnyEmptyField($("#dir-create-form"), ".form-control", ".btn-create"); 22 disableButtonIfAnyEmptyField($(".js-create-dir-form"), ".form-control", ".btn-create"); Can we use the requires input behavior instead?
20 = label_tag 'branch', class: 'control-label' do 21 Branch 22 .col-sm-10 23 = text_field_tag 'new_branch', @ref, class: "form-control" 16 17 = render 'shared/new_commit_form', placeholder: placeholder 18 24 19 .form-group 25 20 .col-sm-offset-2.col-sm-10 26 21 = button_tag button_title, class: 'btn btn-small btn-primary btn-upload-file', id: 'submit-all' 27 22 = link_to "Cancel", '#', class: "btn btn-cancel", "data-dismiss" => "modal" 28 23 29 24 :javascript 30 disableButtonIfEmptyField($('.blob-file-upload-form-js').find('#commit_message'), '.btn-upload-file'); 31 new BlobFileDropzone($('.blob-file-upload-form-js'), '#{method}'); 25 disableButtonIfEmptyField($('.js-upload-blob-form').find('.js-commit-message'), '.btn-upload-file'); Can we use the requires input behavior instead?
mentioned in commit 3a85c93a
mentioned in commit 463a3cfe