Skip to content
Snippets Groups Projects

Add option to create merge request when editing/creating a file

Merged Douwe Maan requested to merge dirceu/gitlab-ce-new-merge-request-from-file-edit into master

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
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");
  • 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');
  • Robert Speicher mentioned in commit 3a85c93a

    mentioned in commit 3a85c93a

  • Robert Speicher Status changed to merged

    Status changed to merged

  • Picked into 8-2-stable.

  • Robert Speicher mentioned in commit 463a3cfe

    mentioned in commit 463a3cfe

  • Please register or sign in to reply
    Loading