Download as
Browse Code »

Commit e320ee3fb775f4ebbf2c315d56108f9c41f707c9

Authored by Dmitriy Zaporozhets
2 parents 0aed79b5 7847e108
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Merge branch 'humanize-over-titleize' into 'master' 

Use humanize instead of titleize for MR title suggestion
Showing 3 changed files with 3 additions and 3 deletions   Show diff stats
app/helpers/merge_requests_helper.rb
  Diff comments   View file @e320ee3
@@ -20,7 +20,7 @@ module MergeRequestsHelper @@ -20,7 +20,7 @@ module MergeRequestsHelper
20 target_project_id: target_project.id, 20 target_project_id: target_project.id,
21 source_branch: event.branch_name, 21 source_branch: event.branch_name,
22 target_branch: target_project.repository.root_ref, 22 target_branch: target_project.repository.root_ref,
23 - title: event.branch_name.titleize 23 + title: event.branch_name.humanize
24 } 24 }
25 end 25 end
26 26
app/views/projects/merge_requests/branch_from.js.haml
  Diff comments   View file @e320ee3
@@ -3,5 +3,5 @@ @@ -3,5 +3,5 @@
3 var mrTitle = $('#merge_request_title'); 3 var mrTitle = $('#merge_request_title');
4 4
5 if(mrTitle.val().length == 0) { 5 if(mrTitle.val().length == 0) {
6 - mrTitle.val("#{params[:ref].titleize}"); 6 + mrTitle.val("#{params[:ref].humanize}");
7 } 7 }
features/steps/dashboard/dashboard.rb
  Diff comments   View file @e320ee3
@@ -25,7 +25,7 @@ class Dashboard < Spinach::FeatureSteps @@ -25,7 +25,7 @@ class Dashboard < Spinach::FeatureSteps
25 find("#merge_request_target_project_id").value.should == @project.id.to_s 25 find("#merge_request_target_project_id").value.should == @project.id.to_s
26 find("#merge_request_source_branch").value.should == "new_design" 26 find("#merge_request_source_branch").value.should == "new_design"
27 find("#merge_request_target_branch").value.should == "master" 27 find("#merge_request_target_branch").value.should == "master"
28 - find("#merge_request_title").value.should == "New Design" 28 + find("#merge_request_title").value.should == "New design"
29 end 29 end
30 30
31 Given 'user with name "John Doe" joined project "Shop"' do 31 Given 'user with name "John Doe" joined project "Shop"' do