diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-09-21 08:23:49 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-09-21 08:23:49 +0000 |
| commit | 39b90bcec48f26a5a8c1eea468ffca7d89097f8b (patch) | |
| tree | 7def0f920ea6ec52335187c9181f93e509f15e8e /app | |
| parent | 87f179e09b0ab456250534747a726708ad4e7e9b (diff) | |
| parent | eebd99b2fce4fd62398f0591dab671a249b785e5 (diff) | |
| download | gitlab-ce-39b90bcec48f26a5a8c1eea468ffca7d89097f8b.tar.gz | |
Merge branch '38088-remove-banner-to-customize-experience' into 'master'
Resolve "Remove banner to customize experience"
Closes #38088
See merge request gitlab-org/gitlab-ce!14384
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/dashboard/projects/index.html.haml | 3 | ||||
| -rw-r--r-- | app/views/shared/_user_callout.html.haml | 13 | ||||
| -rw-r--r-- | app/views/users/show.html.haml | 2 |
3 files changed, 0 insertions, 18 deletions
diff --git a/app/views/dashboard/projects/index.html.haml b/app/views/dashboard/projects/index.html.haml index c546252455a..a4dc49d2120 100644 --- a/app/views/dashboard/projects/index.html.haml +++ b/app/views/dashboard/projects/index.html.haml @@ -10,9 +10,6 @@ = render "projects/last_push" %div{ class: container_class } - - if show_callout?('user_callout_dismissed') - = render 'shared/user_callout' - - if has_projects_or_name?(@projects, params) = render 'dashboard/projects_head' = render 'projects' diff --git a/app/views/shared/_user_callout.html.haml b/app/views/shared/_user_callout.html.haml deleted file mode 100644 index 17ffcba69d8..00000000000 --- a/app/views/shared/_user_callout.html.haml +++ /dev/null @@ -1,13 +0,0 @@ -.user-callout{ data: { uid: 'user_callout_dismissed' } } - .bordered-box.landing.content-block - %button.btn.btn-default.close.js-close-callout{ type: 'button', - 'aria-label' => 'Dismiss customize experience box' } - = icon('times', class: 'dismiss-icon', 'aria-hidden' => 'true') - .svg-container - = custom_icon('icon_customization') - .user-callout-copy - %h4 - Customize your experience - %p - Change syntax themes, default project pages, and more in preferences. - = link_to 'Check it out', profile_preferences_path, class: 'btn btn-primary js-close-callout' diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 879e0f99b14..d0ffcc88d43 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -99,8 +99,6 @@ Snippets %div{ class: container_class } - - if @user == current_user && show_callout?('user_callout_dismissed') - = render 'shared/user_callout' .tab-content #activity.tab-pane .row-content-block.calender-block.white.second-block.hidden-xs |