Commit 166c215a authored by Ciro Santilli's avatar Ciro Santilli

Make new and edit file submit more uniform

parent 51ed8b7e
.form-actions
.commit-button-annotation
= button_tag 'Commit Changes',
class: 'btn commit-btn js-commit-button btn-create'
.message
to branch
%strong= ref
= link_to 'Cancel', cancel_path,
class: 'btn btn-cancel', data: {confirm: leave_edit_message}
...@@ -23,16 +23,11 @@ ...@@ -23,16 +23,11 @@
%i.fa.fa-spinner.fa-spin %i.fa.fa-spinner.fa-spin
= render 'shared/commit_message_container', params: params, = render 'shared/commit_message_container', params: params,
placeholder: "Update #{@blob.name}" placeholder: "Update #{@blob.name}"
.form-actions = hidden_field_tag 'last_commit', @last_commit
= hidden_field_tag 'last_commit', @last_commit = hidden_field_tag 'content', '', id: "file-content"
= hidden_field_tag 'content', '', id: "file-content" = hidden_field_tag 'from_merge_request_id', params[:from_merge_request_id]
= hidden_field_tag 'from_merge_request_id', params[:from_merge_request_id] = render 'projects/commit_button', ref: @ref,
.commit-button-annotation cancel_path: @after_edit_path
= button_tag "Commit changes", class: 'btn commit-btn js-commit-button btn-primary'
.message
to branch
%strong= @ref
= link_to "Cancel", @after_edit_path, class: "btn btn-cancel", data: { confirm: leave_edit_message}
:javascript :javascript
ace.config.set("modePath", gon.relative_url_root + "#{Gitlab::Application.config.assets.prefix}/ace") ace.config.set("modePath", gon.relative_url_root + "#{Gitlab::Application.config.assets.prefix}/ace")
......
...@@ -27,14 +27,9 @@ ...@@ -27,14 +27,9 @@
.file-content.code .file-content.code
%pre#editor= params[:content] %pre#editor= params[:content]
.form-actions = hidden_field_tag 'content', '', id: 'file-content'
= hidden_field_tag 'content', '', id: "file-content" = render 'projects/commit_button', ref: @ref,
.commit-button-annotation cancel_path: project_tree_path(@project, @id)
= button_tag "Commit changes", class: 'btn commit-btn js-commit-button btn-create'
.message
to branch
%strong= @ref
= link_to "Cancel", project_tree_path(@project, @id), class: "btn btn-cancel", data: { confirm: leave_edit_message}
:javascript :javascript
ace.config.set("modePath", gon.relative_url_root + "#{Gitlab::Application.config.assets.prefix}/ace-src-noconflict") ace.config.set("modePath", gon.relative_url_root + "#{Gitlab::Application.config.assets.prefix}/ace-src-noconflict")
......
...@@ -30,7 +30,7 @@ Feature: Project Source Browse files ...@@ -30,7 +30,7 @@ Feature: Project Source Browse files
And I edit code And I edit code
And I fill the new file name And I fill the new file name
And I fill the commit message And I fill the commit message
And I click on "Commit changes" And I click on "Commit Changes"
Then I am redirected to the new file Then I am redirected to the new file
And I should see its new content And I should see its new content
...@@ -46,7 +46,7 @@ Feature: Project Source Browse files ...@@ -46,7 +46,7 @@ Feature: Project Source Browse files
And I click button "Edit" And I click button "Edit"
And I edit code And I edit code
And I fill the commit message And I fill the commit message
And I click on "Commit changes" And I click on "Commit Changes"
Then I am redirected to the ".gitignore" Then I am redirected to the ".gitignore"
And I should see its new content And I should see its new content
......
...@@ -69,8 +69,8 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps ...@@ -69,8 +69,8 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
click_link 'Diff' click_link 'Diff'
end end
step 'I click on "Commit changes"' do step 'I click on "Commit Changes"' do
click_button 'Commit changes' click_button 'Commit Changes'
end end
step 'I click on "Remove"' do step 'I click on "Remove"' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment