From 63e54f1555f02b93347588fbf332c7521d19d2a6 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 8 Apr 2016 19:44:23 +0100
Subject: [PATCH] Updated based on Ruby feedback

---
 CHANGELOG                      | 8 ++++++++
 app/helpers/projects_helper.rb | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index d12f703c7bc..ab2ef90fb08 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -60,6 +60,14 @@ v 8.6.4
   - Don't attempt to fetch any tags from a forked repo (Stan Hu)
   - Redesign the Labels page
   - Project switcher uses new dropdown styling
+  - Project switcher uses new dropdown styling
+
+v 8.6.5 (unreleased)
+  - Only update repository language if it is not set to improve performance
+  - Check permissions when user attempts to import members from another project
+
+v 8.6.4
+  - Don't attempt to fetch any tags from a forked repo (Stan Hu)
 
 v 8.6.3
   - Mentions on confidential issues doesn't create todos for non-members. !3374
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index ab77853da1a..7e00aacceaa 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -71,7 +71,7 @@ module ProjectsHelper
       project_link << icon("chevron-down", class: "dropdown-toggle-caret js-projects-dropdown-toggle", data: { target: ".js-dropdown-menu-projects", toggle: "dropdown" })
     end
 
-    full_title = namespace_link + ' / ' << project_link
+    full_title = "#{namespace_link} / #{project_link}".html_safe
     full_title << ' &middot; '.html_safe << link_to(simple_sanitize(name), url) if name
 
     full_title
-- 
GitLab