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
Boxiang Sun
gitlab-ce
Commits
ae5e806f
Commit
ae5e806f
authored
Aug 16, 2017
by
Saverio Miroddi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix build failures related to cherry-pick message changes
parent
85aeb884
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
spec/requests/api/commits_spec.rb
spec/requests/api/commits_spec.rb
+1
-1
spec/requests/api/v3/commits_spec.rb
spec/requests/api/v3/commits_spec.rb
+1
-1
No files found.
spec/requests/api/commits_spec.rb
View file @
ae5e806f
...
@@ -791,7 +791,7 @@ describe API::Commits do
...
@@ -791,7 +791,7 @@ describe API::Commits do
expect
(
response
).
to
have_gitlab_http_status
(
201
)
expect
(
response
).
to
have_gitlab_http_status
(
201
)
expect
(
response
).
to
match_response_schema
(
'public_api/v4/commit/basic'
)
expect
(
response
).
to
match_response_schema
(
'public_api/v4/commit/basic'
)
expect
(
json_response
[
'title'
]).
to
eq
(
commit
.
title
)
expect
(
json_response
[
'title'
]).
to
eq
(
commit
.
title
)
expect
(
json_response
[
'message'
]).
to
eq
(
commit
.
message
)
expect
(
json_response
[
'message'
]).
to
eq
(
commit
.
cherry_pick_message
(
project
,
branch
)
)
expect
(
json_response
[
'author_name'
]).
to
eq
(
commit
.
author_name
)
expect
(
json_response
[
'author_name'
]).
to
eq
(
commit
.
author_name
)
expect
(
json_response
[
'committer_name'
]).
to
eq
(
user
.
name
)
expect
(
json_response
[
'committer_name'
]).
to
eq
(
user
.
name
)
end
end
...
...
spec/requests/api/v3/commits_spec.rb
View file @
ae5e806f
...
@@ -474,7 +474,7 @@ describe API::V3::Commits do
...
@@ -474,7 +474,7 @@ describe API::V3::Commits do
expect
(
response
).
to
have_http_status
(
201
)
expect
(
response
).
to
have_http_status
(
201
)
expect
(
json_response
[
'title'
]).
to
eq
(
master_pickable_commit
.
title
)
expect
(
json_response
[
'title'
]).
to
eq
(
master_pickable_commit
.
title
)
expect
(
json_response
[
'message'
]).
to
eq
(
master_pickable_commit
.
message
)
expect
(
json_response
[
'message'
]).
to
eq
(
master_pickable_commit
.
cherry_pick_message
(
project
,
'master'
)
)
expect
(
json_response
[
'author_name'
]).
to
eq
(
master_pickable_commit
.
author_name
)
expect
(
json_response
[
'author_name'
]).
to
eq
(
master_pickable_commit
.
author_name
)
expect
(
json_response
[
'committer_name'
]).
to
eq
(
user
.
name
)
expect
(
json_response
[
'committer_name'
]).
to
eq
(
user
.
name
)
end
end
...
...
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