Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-03-24 15:41:42 +0300
committerPhil Hughes <me@iamphill.com>2017-03-24 19:36:23 +0300
commit3eedb2aede34165d7a34fa0dc77ed6c919f7dcb9 (patch)
treea5cb6e83b24b710a95711a8c3896a370c3bd4b23 /app/views/users/show.html.haml
parent4a8e516c1fcdc2d5cb2b1cd2fcded382413d95f6 (diff)
Refactored the user callout class
Instead of the JS being in charge of the HTML, the HAML now handles it. The HAML can then check the cookie & show it needed. It also allows the HAML access to the paths so we don't have to pass that through. Closes #29955
Diffstat (limited to 'app/views/users/show.html.haml')
-rw-r--r--app/views/users/show.html.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 601187455b3..1e5b0d2ece2 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -97,8 +97,8 @@
Snippets
%div{ class: container_class }
- - if @user == current_user
- .user-callout{ 'callout-svg' => custom_icon('icon_customization') }
+ - if @user == current_user && !show_user_callout?
+ = render 'shared/user_callout'
.tab-content
#activity.tab-pane
.row-content-block.calender-block.white.second-block.hidden-xs