diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2015-02-14 18:18:05 +0200 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2015-02-24 11:43:20 +0200 |
| commit | 71a844cdaee129d4e300c20cbb27db009cf81b73 (patch) | |
| tree | dfd520e826c08f2ff8e2938bf995922d0de511f6 /app/views/projects/blob | |
| parent | 7561b1c2a486ae57e9fbebadadbe1269bfdba6a0 (diff) | |
| download | gitlab-ce-71a844cdaee129d4e300c20cbb27db009cf81b73.tar.gz | |
Web Editor: save to new branch
Diffstat (limited to 'app/views/projects/blob')
| -rw-r--r-- | app/views/projects/blob/edit.html.haml | 7 | ||||
| -rw-r--r-- | app/views/projects/blob/new.html.haml | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/app/views/projects/blob/edit.html.haml b/app/views/projects/blob/edit.html.haml index 6884ad1f2f3..1f61a0b940c 100644 --- a/app/views/projects/blob/edit.html.haml +++ b/app/views/projects/blob/edit.html.haml @@ -14,6 +14,13 @@ = render 'projects/blob/editor', ref: @ref, path: @path, blob_data: @blob.data = render 'shared/commit_message_container', params: params, placeholder: "Update #{@blob.name}" + + .form-group.branch + = label_tag 'branch', class: 'control-label' do + Branch + .col-sm-10 + = text_field_tag 'new_branch', @ref, class: "form-control" + = 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] diff --git a/app/views/projects/blob/new.html.haml b/app/views/projects/blob/new.html.haml index 45865d552ae..d78a01f6422 100644 --- a/app/views/projects/blob/new.html.haml +++ b/app/views/projects/blob/new.html.haml @@ -4,6 +4,13 @@ = render 'projects/blob/editor', ref: @ref = render 'shared/commit_message_container', params: params, placeholder: 'Add new file' + + .form-group.branch + = label_tag 'branch', class: 'control-label' do + Branch + .col-sm-10 + = text_field_tag 'new_branch', @ref, class: "form-control" + = hidden_field_tag 'content', '', id: 'file-content' = render 'projects/commit_button', ref: @ref, cancel_path: namespace_project_tree_path(@project.namespace, @project, @id) |