diff options
| author | Dirceu Pereira Tiegs <dirceutiegs@gmail.com> | 2015-10-19 20:25:35 -0200 |
|---|---|---|
| committer | Dirceu Pereira Tiegs <dirceutiegs@gmail.com> | 2015-10-19 20:25:35 -0200 |
| commit | 3d50b99d016af91c06a40f7a8bf4c298e241220a (patch) | |
| tree | 76a081eacbdc19ac85d014b923fa78bfc3581e18 /app/views | |
| parent | 6df06ded12878fb7b5fb01626ea40344f22a5c5b (diff) | |
| download | gitlab-ce-3d50b99d016af91c06a40f7a8bf4c298e241220a.tar.gz | |
Add option to create merge request when editing/creating a file
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/blob/edit.html.haml | 8 | ||||
| -rw-r--r-- | app/views/projects/blob/new.html.haml | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/app/views/projects/blob/edit.html.haml b/app/views/projects/blob/edit.html.haml index a811adc5094..26216462707 100644 --- a/app/views/projects/blob/edit.html.haml +++ b/app/views/projects/blob/edit.html.haml @@ -23,9 +23,17 @@ .col-sm-10 = text_field_tag 'new_branch', @ref, class: "form-control" + .form-group.destination + .col-sm-offset-2.col-sm-10 + .checkbox + = label_tag :create_merge_request do + = check_box_tag :create_merge_request, 1, false + Start a new merge request + = hidden_field_tag 'last_commit', @last_commit = hidden_field_tag 'content', '', id: "file-content" = hidden_field_tag 'from_merge_request_id', params[:from_merge_request_id] + = hidden_field_tag 'original_branch', @ref = render 'projects/commit_button', ref: @ref, cancel_path: @after_edit_path :javascript diff --git a/app/views/projects/blob/new.html.haml b/app/views/projects/blob/new.html.haml index 7975137c37f..0439e55131e 100644 --- a/app/views/projects/blob/new.html.haml +++ b/app/views/projects/blob/new.html.haml @@ -17,7 +17,15 @@ .col-sm-10 = text_field_tag 'new_branch', @ref, class: "form-control js-quick-submit" + .form-group.destination + .col-sm-offset-2.col-sm-10 + .checkbox + = label_tag :create_merge_request do + = check_box_tag :create_merge_request, 1, false + Start a new merge request + = hidden_field_tag 'content', '', id: 'file-content' + = hidden_field_tag 'original_branch', @ref = render 'projects/commit_button', ref: @ref, cancel_path: namespace_project_tree_path(@project.namespace, @project, @id) |