Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
iv
gitlab-ce
Commits
e320ee3f
Commit
e320ee3f
authored
Mar 25, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'humanize-over-titleize' into 'master'
Use humanize instead of titleize for MR title suggestion
parents
0aed79b5
7847e108
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/helpers/merge_requests_helper.rb
app/helpers/merge_requests_helper.rb
+1
-1
app/views/projects/merge_requests/branch_from.js.haml
app/views/projects/merge_requests/branch_from.js.haml
+1
-1
features/steps/dashboard/dashboard.rb
features/steps/dashboard/dashboard.rb
+1
-1
No files found.
app/helpers/merge_requests_helper.rb
View file @
e320ee3f
...
@@ -20,7 +20,7 @@ module MergeRequestsHelper
...
@@ -20,7 +20,7 @@ module MergeRequestsHelper
target_project_id:
target_project
.
id
,
target_project_id:
target_project
.
id
,
source_branch:
event
.
branch_name
,
source_branch:
event
.
branch_name
,
target_branch:
target_project
.
repository
.
root_ref
,
target_branch:
target_project
.
repository
.
root_ref
,
title:
event
.
branch_name
.
title
ize
title:
event
.
branch_name
.
human
ize
}
}
end
end
...
...
app/views/projects/merge_requests/branch_from.js.haml
View file @
e320ee3f
...
@@ -3,5 +3,5 @@
...
@@ -3,5 +3,5 @@
var mrTitle = $('#merge_request_title');
var mrTitle = $('#merge_request_title');
if(mrTitle.val().length == 0) {
if(mrTitle.val().length == 0) {
mrTitle.val("
#{
params
[
:ref
].
title
ize
}
");
mrTitle.val("
#{
params
[
:ref
].
human
ize
}
");
}
}
features/steps/dashboard/dashboard.rb
View file @
e320ee3f
...
@@ -25,7 +25,7 @@ class Dashboard < Spinach::FeatureSteps
...
@@ -25,7 +25,7 @@ class Dashboard < Spinach::FeatureSteps
find
(
"#merge_request_target_project_id"
).
value
.
should
==
@project
.
id
.
to_s
find
(
"#merge_request_target_project_id"
).
value
.
should
==
@project
.
id
.
to_s
find
(
"#merge_request_source_branch"
).
value
.
should
==
"new_design"
find
(
"#merge_request_source_branch"
).
value
.
should
==
"new_design"
find
(
"#merge_request_target_branch"
).
value
.
should
==
"master"
find
(
"#merge_request_target_branch"
).
value
.
should
==
"master"
find
(
"#merge_request_title"
).
value
.
should
==
"New
D
esign"
find
(
"#merge_request_title"
).
value
.
should
==
"New
d
esign"
end
end
Given
'user with name "John Doe" joined project "Shop"'
do
Given
'user with name "John Doe" joined project "Shop"'
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment