diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-31 19:26:10 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-05-31 19:26:10 +0300 |
| commit | f9f0424443e4e8b5d39fadc437a8a573bba9e371 (patch) | |
| tree | 5104089fdc9dc6c63fb11a39f6cfec045b688c56 | |
| parent | 2281589c5bd4ad8dcd393f854e0ad79a0f76345a (diff) | |
| parent | a2c859427c4b8a8a9542cdc1299c35aade3e4555 (diff) | |
Merge branch 'user-callout-dismissed-method-rename' into 'master'
Fixed the show_user_callout method
See merge request !11689
| -rw-r--r-- | app/helpers/application_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/dashboard/projects/index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/users/show.html.haml | 2 |
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 |