Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
e34fc31d43a0
Commit
907317c4
authored
Jul 11, 2016
by
Fatih Acet
Browse files
Added routes for conflicts in merge requests page.
parent
14fd9c47f4b4
Changes
3
Hide whitespace changes
Inline
Side-by-side
app/controllers/projects/merge_requests_controller.rb
View file @
e34fc31d
...
...
@@ -9,11 +9,11 @@ class Projects::MergeRequestsController < Projects::ApplicationController
before_action
:module_enabled
before_action
:merge_request
,
only:
[
:edit
,
:update
,
:show
,
:diffs
,
:commits
,
:builds
,
:merge
,
:merge_check
,
:edit
,
:update
,
:show
,
:diffs
,
:commits
,
:conflicts
,
:builds
,
:merge
,
:merge_check
,
:ci_status
,
:toggle_subscription
,
:cancel_merge_when_build_succeeds
,
:remove_wip
]
before_action
:validates_merge_request
,
only:
[
:show
,
:diffs
,
:commits
,
:builds
]
before_action
:define_show_vars
,
only:
[
:show
,
:diffs
,
:commits
,
:builds
]
before_action
:define_show_vars
,
only:
[
:show
,
:diffs
,
:commits
,
:conflicts
,
:builds
]
before_action
:define_widget_vars
,
only:
[
:merge
,
:cancel_merge_when_build_succeeds
,
:merge_check
]
before_action
:define_commit_vars
,
only:
[
:diffs
]
before_action
:define_diff_comment_vars
,
only:
[
:diffs
]
...
...
@@ -130,6 +130,13 @@ def commits
end
end
def
conflicts
respond_to
do
|
format
|
format
.
html
{
render
'show'
}
end
end
def
builds
respond_to
do
|
format
|
format
.
html
do
...
...
app/helpers/nav_helper.rb
View file @
e34fc31d
...
...
@@ -24,6 +24,7 @@ def page_gutter_class
current_path?
(
'merge_requests#diffs'
)
||
current_path?
(
'merge_requests#commits'
)
||
current_path?
(
'merge_requests#builds'
)
||
current_path?
(
'merge_requests#conflicts'
)
||
current_path?
(
'issues#show'
)
if
cookies
[
:collapsed_gutter
]
==
'true'
"page-gutter right-sidebar-collapsed"
...
...
config/routes.rb
View file @
e34fc31d
...
...
@@ -718,6 +718,7 @@
member
do
get
:commits
get
:diffs
get
:conflicts
get
:builds
get
:merge_check
post
:merge
...
...
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