summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-05-01 11:33:54 +0200
committerDouwe Maan <douwe@gitlab.com>2015-05-01 11:33:54 +0200
commita2eee3181c6b0fc3ef8b95f3187704a2b12774e4 (patch)
treea6db7d8a28485ab1a76416c070d5f796fb1b6888
parent92fd3ccee05acdfd5e498734ed287458a8dd21a3 (diff)
downloadgitlab-ce-a2eee3181c6b0fc3ef8b95f3187704a2b12774e4.tar.gz
-rw-r--r--app/controllers/users_controller.rb3
-rw-r--r--app/views/users/show.html.haml3
2 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 7285098435b..2bb5c338cf6 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -12,9 +12,6 @@ class UsersController < ApplicationController
# Collect only groups common for both users
@groups = @user.groups & GroupsFinder.new.execute(current_user)
- @title = @user.name
- @title_url = user_path(@user)
-
respond_to do |format|
format.html
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 0576c6a11b9..6ed45fedfa2 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -1,3 +1,6 @@
+- page_title @user.name
+- header_title @user.name, user_path(@user)
+
= content_for :meta_tags do
= auto_discovery_link_tag(:atom, user_url(@user, format: :atom), title: "#{@user.name} activity")