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
Jérome Perrin
gitlab-ce
Commits
f2251d19
Commit
f2251d19
authored
Aug 13, 2017
by
haseeb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes failing tests for full reference change
parent
df948f8a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
spec/features/merge_requests/merge_commit_message_toggle_spec.rb
...atures/merge_requests/merge_commit_message_toggle_spec.rb
+2
-2
spec/models/merge_request_spec.rb
spec/models/merge_request_spec.rb
+1
-1
No files found.
spec/features/merge_requests/merge_commit_message_toggle_spec.rb
View file @
f2251d19
...
@@ -19,7 +19,7 @@ feature 'Clicking toggle commit message link', js: true do
...
@@ -19,7 +19,7 @@ feature 'Clicking toggle commit message link', js: true do
"Merge branch 'feature' into 'master'"
,
"Merge branch 'feature' into 'master'"
,
merge_request
.
title
,
merge_request
.
title
,
"Closes
#{
issue_1
.
to_reference
}
and
#{
issue_2
.
to_reference
}
"
,
"Closes
#{
issue_1
.
to_reference
}
and
#{
issue_2
.
to_reference
}
"
,
"See merge request
#{
merge_request
.
to_reference
}
"
"See merge request
#{
merge_request
.
to_reference
(
full:
true
)
}
"
].
join
(
"
\n\n
"
)
].
join
(
"
\n\n
"
)
end
end
let
(
:message_with_description
)
do
let
(
:message_with_description
)
do
...
@@ -27,7 +27,7 @@ feature 'Clicking toggle commit message link', js: true do
...
@@ -27,7 +27,7 @@ feature 'Clicking toggle commit message link', js: true do
"Merge branch 'feature' into 'master'"
,
"Merge branch 'feature' into 'master'"
,
merge_request
.
title
,
merge_request
.
title
,
merge_request
.
description
,
merge_request
.
description
,
"See merge request
#{
merge_request
.
to_reference
}
"
"See merge request
#{
merge_request
.
to_reference
(
full:
true
)
}
"
].
join
(
"
\n\n
"
)
].
join
(
"
\n\n
"
)
end
end
...
...
spec/models/merge_request_spec.rb
View file @
f2251d19
...
@@ -604,7 +604,7 @@ describe MergeRequest do
...
@@ -604,7 +604,7 @@ describe MergeRequest do
request
=
build_stubbed
(
:merge_request
)
request
=
build_stubbed
(
:merge_request
)
expect
(
request
.
merge_commit_message
)
expect
(
request
.
merge_commit_message
)
.
to
match
(
"See merge request
#{
request
.
to_reference
}
"
)
.
to
match
(
"See merge request
#{
request
.
to_reference
(
full:
true
)
}
"
)
end
end
it
'excludes multiple linebreak runs when description is blank'
do
it
'excludes multiple linebreak runs when description is blank'
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