Markdown now support users from groups

Dmitriy Zaporozhets
1 parent fdf7fc04
Showing 2 changed files with 2 additions and 1 deletions Show diff stats
app/models/project.rb
lib/gitlab/markdown.rb
@@ -68,6 +68,7 @@ class Project &lt; ActiveRecord::Base
   has_many :deploy_keys, through: :deploy_keys_projects
  
   delegate :name, to: :owner, allow_nil: true, prefix: true
+  delegate :members, to: :team, prefix: true
  
   # Validations
   validates :creator, presence: true
@@ -166,7 +166,7 @@ module Gitlab
     end
  
     def reference_user(identifier)
-      if member = @project.users_projects.joins(:user).where(users: { username: identifier }).first
+      if member = @project.team_members.find { |user| user.username == identifier }
         link_to("@#{identifier}", user_path(identifier), html_options.merge(class: "gfm gfm-team_member #{html_options[:class]}")) if member
       end
     end
...	...	@@ -68,6 +68,7 @@ class Project < ActiveRecord::Base
68	68	has_many :deploy_keys, through: :deploy_keys_projects
69	69
70	70	delegate :name, to: :owner, allow_nil: true, prefix: true
	71	+ delegate :members, to: :team, prefix: true
71	72
72	73	# Validations
73	74	validates :creator, presence: true
...	...
...	...	@@ -166,7 +166,7 @@ module Gitlab
166	166	end
167	167
168	168	def reference_user(identifier)
169		- if member = @project.users_projects.joins(:user).where(users: { username: identifier }).first
	169	+ if member = @project.team_members.find { \|user\| user.username == identifier }
170	170	link_to("@#{identifier}", user_path(identifier), html_options.merge(class: "gfm gfm-team_member #{html_options[:class]}")) if member
171	171	end
172	172	end
...	...