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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
3ef0f2a0
Commit
3ef0f2a0
authored
Oct 31, 2017
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CE->EE conflicts[ci skip]
parent
08d457f1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
6 deletions
+3
-6
config/routes/user.rb
config/routes/user.rb
+0
-3
spec/requests/api/merge_requests_spec.rb
spec/requests/api/merge_requests_spec.rb
+3
-3
No files found.
config/routes/user.rb
View file @
3ef0f2a0
...
...
@@ -31,10 +31,7 @@ scope(constraints: { username: Gitlab::PathRegex.root_namespace_route_regex }) d
get
:contributed
,
as: :contributed_projects
get
:snippets
get
:exists
<<<<<<<
HEAD
get
:pipelines_quota
=======
>>>>>>>
bfb5107ae720232a15060ee55feba213ee7dd097
get
'/'
,
to:
redirect
(
'%{username}'
),
as:
nil
end
...
...
spec/requests/api/merge_requests_spec.rb
View file @
3ef0f2a0
...
...
@@ -1171,7 +1171,6 @@ describe API::MergeRequests do
end
end
<<<<<<<
HEAD
describe
'GET :id/merge_requests/:merge_request_iid/approvals'
do
it
'retrieves the approval status'
do
approver
=
create
:user
...
...
@@ -1288,7 +1287,9 @@ describe API::MergeRequests do
expect
(
json_response
[
'user_has_approved'
]).
to
be
false
expect
(
json_response
[
'user_can_approve'
]).
to
be
true
end
=======
end
end
describe
'POST :id/merge_requests/:merge_request_iid/cancel_merge_when_pipeline_succeeds'
do
before
do
::
MergeRequests
::
MergeWhenPipelineSucceedsService
.
new
(
merge_request
.
target_project
,
user
).
execute
(
merge_request
)
...
...
@@ -1310,7 +1311,6 @@ describe API::MergeRequests do
post
api
(
"/projects/
#{
project
.
id
}
/merge_requests/
#{
merge_request
.
id
}
/merge_when_pipeline_succeeds"
,
user
)
expect
(
response
).
to
have_gitlab_http_status
(
404
)
>>>>>>>
bfb5107ae720232a15060ee55feba213ee7dd097
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