summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-04-08 19:44:23 +0100
committerJacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>2016-04-12 13:10:43 -0400
commit63e54f1555f02b93347588fbf332c7521d19d2a6 (patch)
treed56f34e82da4e3b57c4a9f2bd557ae4815bbe846
parent4293485a22bfdbd2afdbb20dcf5d777f379fac87 (diff)
downloadgitlab-ce-63e54f1555f02b93347588fbf332c7521d19d2a6.tar.gz
Updated based on Ruby feedback
-rw-r--r--CHANGELOG8
-rw-r--r--app/helpers/projects_helper.rb2
2 files changed, 9 insertions, 1 deletions
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