diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-05 12:18:12 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-05 12:18:12 +0300 |
| commit | 3b39cf4e0c5d0ca680a40bb7232fee4f7fdfb02e (patch) | |
| tree | ef2c85a93d787ca15ee857f1aa3754e58dbc163e /app/views/users | |
| parent | e90ca0f0fcae087f95b92a4699f884167b47eaaf (diff) | |
| parent | d913ce176351094e2908344206a6136163fdfa89 (diff) | |
Merge branch '30469-convdev-index' into 'master'
ConvDev Index
Closes #30469
See merge request !11377
Diffstat (limited to 'app/views/users')
| -rw-r--r-- | app/views/users/show.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index c239253c8d5..f246bd7a586 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -100,7 +100,7 @@ Snippets %div{ class: container_class } - - if @user == current_user && show_user_callout? + - if @user == current_user && show_callout?('user_callout_dismissed') = render 'shared/user_callout' .tab-content #activity.tab-pane |