From 9dd58c320a38cbcaf8134157103b2b2a2fad76d2 Mon Sep 17 00:00:00 2001
From: Marin Jankovski <marin@gitlab.com>
Date: Tue, 25 Mar 2014 17:54:32 +0100
Subject: Add to changelog.

---
 CHANGELOG              | 7 +++++--
 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
 
-- 
cgit v1.2.1