Commit f9f04244 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'user-callout-dismissed-method-rename' into 'master'

Fixed the show_user_callout method

See merge request !11689
parents 2281589c a2c85942
...@@ -276,7 +276,7 @@ module ApplicationHelper ...@@ -276,7 +276,7 @@ module ApplicationHelper
end end
def show_user_callout? def show_user_callout?
cookies[:user_callout_dismissed] == 'true' cookies[:user_callout_dismissed].nil?
end end
def linkedin_url(user) def linkedin_url(user)
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
= render "projects/last_push" = render "projects/last_push"
%div{ class: container_class } %div{ class: container_class }
- unless show_user_callout? - if show_user_callout?
= render 'shared/user_callout' = render 'shared/user_callout'
- if @projects.any? || params[:name] - if @projects.any? || params[:name]
......
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
Snippets Snippets
%div{ class: container_class } %div{ class: container_class }
- if @user == current_user && !show_user_callout? - if @user == current_user && show_user_callout?
= render 'shared/user_callout' = render 'shared/user_callout'
.tab-content .tab-content
#activity.tab-pane #activity.tab-pane
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment