Download as
Browse Code »

Commit 86bf684f5dc95e8bd2445f088f862d0a0539922a

Authored by Dmitriy Zaporozhets
1 parent 2da289cf
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Minor UI improvements and fixed test 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 3 changed files with 6 additions and 5 deletions   Show diff stats
app/views/projects/merge_requests/_new_compare.html.haml
  Diff comments   View file @86bf684
1 -%h3.page-title Compare changes for new merge request 1 +%h3.page-title Compare branches for new Merge Request
2 %hr 2 %hr
3 3
4 = form_for [@project, @merge_request], url: new_project_merge_request_path(@project), method: :get, html: { class: "merge-request-form form-inline" } do |f| 4 = form_for [@project, @merge_request], url: new_project_merge_request_path(@project), method: :get, html: { class: "merge-request-form form-inline" } do |f|
@@ -45,8 +45,8 @@ @@ -45,8 +45,8 @@
45 %span.label-branch #{@merge_request.target_branch} 45 %span.label-branch #{@merge_request.target_branch}
46 are the same. 46 are the same.
47 47
48 - .form-actions  
49 - = f.submit 'Compare branches', class: "btn btn-primary" 48 + %hr
  49 + = f.submit 'Compare branches', class: "btn btn-primary"
50 50
51 :javascript 51 :javascript
52 var source_branch = $("#merge_request_source_branch") 52 var source_branch = $("#merge_request_source_branch")
app/views/projects/merge_requests/_new_submit.html.haml
  Diff comments   View file @86bf684
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
51 = f.hidden_field :target_project_id 51 = f.hidden_field :target_project_id
52 = f.hidden_field :target_branch 52 = f.hidden_field :target_branch
53 = f.hidden_field :source_branch 53 = f.hidden_field :source_branch
54 - = f.submit 'Submit a merge request', class: "btn btn-create" 54 + = f.submit 'Submit merge request', class: "btn btn-create"
55 55
56 .mr-compare 56 .mr-compare
57 %div.ui-box 57 %div.ui-box
features/steps/project/merge_requests.rb
  Diff comments   View file @86bf684
@@ -61,9 +61,10 @@ class ProjectMergeRequests &lt; Spinach::FeatureSteps @@ -61,9 +61,10 @@ class ProjectMergeRequests &lt; Spinach::FeatureSteps
61 end 61 end
62 62
63 step 'I submit new merge request "Wiki Feature"' do 63 step 'I submit new merge request "Wiki Feature"' do
64 - fill_in "merge_request_title", with: "Wiki Feature"  
65 select "master", from: "merge_request_source_branch" 64 select "master", from: "merge_request_source_branch"
66 select "notes_refactoring", from: "merge_request_target_branch" 65 select "notes_refactoring", from: "merge_request_target_branch"
  66 + click_button "Compare branches"
  67 + fill_in "merge_request_title", with: "Wiki Feature"
67 click_button "Submit merge request" 68 click_button "Submit merge request"
68 end 69 end
69 70