For form MR render only namespace name

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

For form MR render only namespace name
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets
1 parent db961b8b
Showing 2 changed files with 13 additions and 5 deletions Show diff stats
app/models/merge_request.rb
app/views/projects/merge_requests/_merge_request.html.haml
@@ -219,6 +219,14 @@ class MergeRequest &lt; ActiveRecord::Base
     end
   end
+  def source_project_namespace
+    if source_project && source_project.namespace
+      source_project.namespace.path
+    else
+      "(removed)"
+    end
+  end
+
   def source_branch_exists?
     return false unless self.source_project
@@ -10,14 +10,14 @@
       %span.pull-right
         - if merge_request.for_fork?
           %span.light
-            = "#{merge_request.source_project_path}"
-          = "#{merge_request.source_branch}"
+            #{merge_request.source_project_namespace}:
+          = merge_request.source_branch
           %i.icon-angle-right.light
-          = "#{merge_request.target_branch}"
+          = merge_request.target_branch
         - else
-          = "#{merge_request.source_branch}"
+          = merge_request.source_branch
           %i.icon-angle-right.light
-          = "#{merge_request.target_branch}"
+          = merge_request.target_branch
   .merge-request-info
     - if merge_request.author
       authored by #{link_to_member(merge_request.source_project, merge_request.author)}
	@@ -219,6 +219,14 @@ class MergeRequest < ActiveRecord::Base		@@ -219,6 +219,14 @@ class MergeRequest < ActiveRecord::Base
219	end	219	end
220	end	220	end
221		221
		222	+ def source_project_namespace
		223	+ if source_project && source_project.namespace
		224	+ source_project.namespace.path
		225	+ else
		226	+ "(removed)"
		227	+ end
		228	+ end
		229	+
222	def source_branch_exists?	230	def source_branch_exists?
223	return false unless self.source_project	231	return false unless self.source_project
224		232