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
Tatuya Kamada
gitlab-ce
Commits
1e106756
Commit
1e106756
authored
Feb 15, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
For form MR render only namespace name
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
db961b8b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
5 deletions
+13
-5
app/models/merge_request.rb
app/models/merge_request.rb
+8
-0
app/views/projects/merge_requests/_merge_request.html.haml
app/views/projects/merge_requests/_merge_request.html.haml
+5
-5
No files found.
app/models/merge_request.rb
View file @
1e106756
...
@@ -219,6 +219,14 @@ class MergeRequest < ActiveRecord::Base
...
@@ -219,6 +219,14 @@ class MergeRequest < ActiveRecord::Base
end
end
end
end
def
source_project_namespace
if
source_project
&&
source_project
.
namespace
source_project
.
namespace
.
path
else
"(removed)"
end
end
def
source_branch_exists?
def
source_branch_exists?
return
false
unless
self
.
source_project
return
false
unless
self
.
source_project
...
...
app/views/projects/merge_requests/_merge_request.html.haml
View file @
1e106756
...
@@ -10,14 +10,14 @@
...
@@ -10,14 +10,14 @@
%span
.pull-right
%span
.pull-right
-
if
merge_request
.
for_fork?
-
if
merge_request
.
for_fork?
%span
.light
%span
.light
=
"
#{
merge_request
.
source_project_path
}
"
#{
merge_request
.
source_project_namespace
}
:
=
"
#{
merge_request
.
source_branch
}
"
=
merge_request
.
source_branch
%i
.icon-angle-right.light
%i
.icon-angle-right.light
=
"
#{
merge_request
.
target_branch
}
"
=
merge_request
.
target_branch
-
else
-
else
=
"
#{
merge_request
.
source_branch
}
"
=
merge_request
.
source_branch
%i
.icon-angle-right.light
%i
.icon-angle-right.light
=
"
#{
merge_request
.
target_branch
}
"
=
merge_request
.
target_branch
.merge-request-info
.merge-request-info
-
if
merge_request
.
author
-
if
merge_request
.
author
authored by
#{
link_to_member
(
merge_request
.
source_project
,
merge_request
.
author
)
}
authored by
#{
link_to_member
(
merge_request
.
source_project
,
merge_request
.
author
)
}
...
...
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