diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2019-01-29 20:45:47 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2019-01-29 20:45:47 +0000 |
| commit | fc16bebb679da286e8fd11ba76ebe9acc18f93a8 (patch) | |
| tree | 6d64151e6b80138cb2f191b7fe7ca946a5df78e0 /app | |
| parent | 5652533a9cd1f64a932c565e3a0f9707ceec766b (diff) | |
| parent | def2b548d2ee5e33948350f7e3f47d485e35e22e (diff) | |
| download | gitlab-ce-fc16bebb679da286e8fd11ba76ebe9acc18f93a8.tar.gz | |
Merge branch 'revert-add-whats-new' into 'master'
Revert the "What's new" feature
See merge request gitlab-org/gitlab-ce!24772
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/release_blog_post_helper.rb | 7 | ||||
| -rw-r--r-- | app/views/layouts/header/_help_dropdown.html.haml | 4 |
2 files changed, 0 insertions, 11 deletions
diff --git a/app/helpers/release_blog_post_helper.rb b/app/helpers/release_blog_post_helper.rb deleted file mode 100644 index 31b5b7edc39..00000000000 --- a/app/helpers/release_blog_post_helper.rb +++ /dev/null @@ -1,7 +0,0 @@ -# frozen_string_literal: true - -module ReleaseBlogPostHelper - def blog_post_url - Gitlab::ReleaseBlogPost.instance.blog_post_url - end -end diff --git a/app/views/layouts/header/_help_dropdown.html.haml b/app/views/layouts/header/_help_dropdown.html.haml index 513902890af..cd9128c452b 100644 --- a/app/views/layouts/header/_help_dropdown.html.haml +++ b/app/views/layouts/header/_help_dropdown.html.haml @@ -1,12 +1,8 @@ -- show_blog_link = current_user_menu?(:help) && blog_post_url.present? %ul - if current_user_menu?(:help) %li = link_to _("Help"), help_path %li.divider - - if show_blog_link - %li - = link_to _("What's new?"), blog_post_url %li = link_to _("Submit feedback"), "https://about.gitlab.com/submit-feedback" - if current_user_menu?(:help) || current_user_menu?(:settings) || current_user_menu?(:profile) |