summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-04-19 14:05:28 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-04-19 14:05:28 +0000
commit0063194ad6029915361d282392b6ab207ffd1520 (patch)
tree90c8f35da198e81a35a1cf8a62bc7e47b2ec6924
parent2011f02b5dc718b39ee7b3de7db4cea2fffafd36 (diff)
parentfe603d4d314ddb584d160913ae52bac813abbaad (diff)
downloadgitlab-ce-0063194ad6029915361d282392b6ab207ffd1520.tar.gz
Merge branch 'profile-aside-toggle' into 'master'
Removed aside toggle on profile pages Closes #13943 See merge request !3796
-rw-r--r--app/views/users/show.html.haml2
1 files changed, 0 insertions, 2 deletions
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 0c4b6a5618b..3028491e5b6 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -6,8 +6,6 @@
= content_for :meta_tags do
= auto_discovery_link_tag(:atom, user_url(@user, format: :atom), title: "#{@user.name} activity")
-= render 'shared/show_aside'
-
.user-profile
.cover-block
.cover-controls