diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-03-25 17:54:32 +0100 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-03-25 18:53:09 +0100 |
| commit | 9dd58c320a38cbcaf8134157103b2b2a2fad76d2 (patch) | |
| tree | ddfc9f5e6d7d8f8c5f1f466f607ca447426acb27 | |
| parent | 5245fac63b7ec7b4ad17c91e821350cff8e3bf04 (diff) | |
| download | gitlab-ce-9dd58c320a38cbcaf8134157103b2b2a2fad76d2.tar.gz | |
Add to changelog.
| -rw-r--r-- | CHANGELOG | 7 | ||||
| -rw-r--r-- | lib/gitlab/markdown.rb | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index 75d88e2ce3f..2a025d6481e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,10 @@ -v6.7.2 +v 6.8.0 + - Ability to at mention users that are participating in issue and merge req. discussion + +v 6.7.2 - Fix upgrader script -v6.7.1 +v 6.7.1 - Fix GitLab CI integration v 6.7.0 diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb index 1d3c6ac6eea..de14a3eca27 100644 --- a/lib/gitlab/markdown.rb +++ b/lib/gitlab/markdown.rb @@ -167,7 +167,7 @@ module Gitlab def reference_user(identifier) if user = User.find_by_username(identifier) - link_to("@#{identifier}", user_url(identifier), html_options.merge(class: "gfm gfm-team_member #{html_options[:class]}")) if user + link_to("@#{identifier}", user_url(identifier), html_options.merge(class: "gfm gfm-team_member #{html_options[:class]}")) end end |