summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-05-24 17:32:59 +0100
committerPhil Hughes <me@iamphill.com>2017-05-30 12:23:39 +0100
commita2c859427c4b8a8a9542cdc1299c35aade3e4555 (patch)
treee82488cd3d5fa9787acc78788d236bccd449b802
parentffe52f0143a222350c8356084215ff5e502ead20 (diff)
downloadgitlab-ce-user-callout-dismissed-method-rename.tar.gz
Fixed the show_user_callout methoduser-callout-dismissed-method-rename
-rw-r--r--app/helpers/application_helper.rb2
-rw-r--r--app/views/dashboard/projects/index.html.haml2
-rw-r--r--app/views/users/show.html.haml2
3 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index e5e64650708..36d9090b3ae 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -276,7 +276,7 @@ module ApplicationHelper
end
def show_user_callout?
- cookies[:user_callout_dismissed] == 'true'
+ cookies[:user_callout_dismissed].nil?
end
def linkedin_url(user)
diff --git a/app/views/dashboard/projects/index.html.haml b/app/views/dashboard/projects/index.html.haml
index 3b2a555a143..2890ae7173b 100644
--- a/app/views/dashboard/projects/index.html.haml
+++ b/app/views/dashboard/projects/index.html.haml
@@ -9,7 +9,7 @@
= render "projects/last_push"
%div{ class: container_class }
- - unless show_user_callout?
+ - if show_user_callout?
= render 'shared/user_callout'
- if @projects.any? || params[:name]
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index c587155bc4f..c239253c8d5 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_user_callout?
= render 'shared/user_callout'
.tab-content
#activity.tab-pane