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
8b7e6e22
Commit
8b7e6e22
authored
May 22, 2018
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Unify app/presenters/merge_request_presenter.rb
parent
06b6fcc8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
6 deletions
+11
-6
app/presenters/merge_request_presenter.rb
app/presenters/merge_request_presenter.rb
+2
-6
ee/app/presenters/ee/merge_request_presenter.rb
ee/app/presenters/ee/merge_request_presenter.rb
+9
-0
No files found.
app/presenters/merge_request_presenter.rb
View file @
8b7e6e22
class
MergeRequestPresenter
<
Gitlab
::
View
::
Presenter
::
Delegated
prepend
EE
::
MergeRequestPresenter
include
ActionView
::
Helpers
::
UrlHelper
include
GitlabRoutingHelper
include
MarkupHelper
...
...
@@ -102,12 +104,6 @@ class MergeRequestPresenter < Gitlab::View::Presenter::Delegated
end
end
def
approvals_path
if
requires_approve?
approvals_project_merge_request_path
(
project
,
merge_request
)
end
end
def
source_branch_with_namespace_link
namespace
=
source_project_namespace
branch
=
source_branch
...
...
ee/app/presenters/ee/merge_request_presenter.rb
0 → 100644
View file @
8b7e6e22
module
EE
module
MergeRequestPresenter
def
approvals_path
if
requires_approve?
approvals_project_merge_request_path
(
project
,
merge_request
)
end
end
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