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
46f8e642
Commit
46f8e642
authored
8 years ago
by
Sean McGivern
Committed by
Fatih Acet
8 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove undo endpoint
This reverts commit 2536fea8db0967a817615eb3e951eb6ba22f8ede.
parent
ba327e69
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
26 deletions
+1
-26
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+1
-12
config/routes.rb
config/routes.rb
+0
-1
spec/controllers/projects/merge_requests_controller_spec.rb
spec/controllers/projects/merge_requests_controller_spec.rb
+0
-13
No files found.
app/controllers/projects/merge_requests_controller.rb
View file @
46f8e642
...
...
@@ -10,8 +10,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
before_action
:module_enabled
before_action
:merge_request
,
only:
[
:edit
,
:update
,
:show
,
:diffs
,
:commits
,
:conflicts
,
:builds
,
:merge
,
:merge_check
,
:ci_status
,
:toggle_subscription
,
:cancel_merge_when_build_succeeds
,
:remove_wip
,
:resolve_conflicts
,
:undo_last_resolution
:ci_status
,
:toggle_subscription
,
:cancel_merge_when_build_succeeds
,
:remove_wip
,
:resolve_conflicts
]
before_action
:validates_merge_request
,
only:
[
:show
,
:diffs
,
:commits
,
:builds
]
before_action
:define_show_vars
,
only:
[
:show
,
:diffs
,
:commits
,
:conflicts
,
:builds
]
...
...
@@ -158,16 +157,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
end
def
undo_last_resolution
rugged
=
@merge_request
.
project
.
repository
.
rugged
ref
=
Gitlab
::
Git
::
BRANCH_REF_PREFIX
+
@merge_request
.
source_branch
prev
=
rugged
.
ref
(
ref
).
target
rugged
.
references
.
update
(
ref
,
prev
.
parents
.
first
.
oid
)
if
prev
.
parents
.
length
==
2
head
:ok
end
def
builds
respond_to
do
|
format
|
format
.
html
do
...
...
This diff is collapsed.
Click to expand it.
config/routes.rb
View file @
46f8e642
...
...
@@ -729,7 +729,6 @@ Rails.application.routes.draw do
post
:remove_wip
get
:diff_for_path
post
:resolve_conflicts
post
:undo_last_resolution
end
collection
do
...
...
This diff is collapsed.
Click to expand it.
spec/controllers/projects/merge_requests_controller_spec.rb
View file @
46f8e642
...
...
@@ -639,19 +639,6 @@ describe Projects::MergeRequestsController do
it
'returns an OK resposne'
do
expect
(
response
).
to
have_http_status
(
:ok
)
end
context
'undoing the resolution'
do
before
do
post
:undo_last_resolution
,
namespace_id:
merge_request_with_conflicts
.
project
.
namespace
.
to_param
,
project_id:
merge_request_with_conflicts
.
project
.
to_param
,
id:
merge_request_with_conflicts
.
iid
end
it
'undoes the commit'
do
expect
(
original_head_sha
).
to
eq
(
merge_request_with_conflicts
.
source_branch_head
.
sha
)
end
end
end
context
'when sections are missing'
do
...
...
This diff is collapsed.
Click to expand it.
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