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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
6577d3a4
Commit
6577d3a4
authored
Jun 22, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Markdown now support users from groups
parent
fdf7fc04
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
app/models/project.rb
app/models/project.rb
+1
-0
lib/gitlab/markdown.rb
lib/gitlab/markdown.rb
+1
-1
No files found.
app/models/project.rb
View file @
6577d3a4
...
...
@@ -68,6 +68,7 @@ class Project < 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
...
...
lib/gitlab/markdown.rb
View file @
6577d3a4
...
...
@@ -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
...
...
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