diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /app/controllers/whats_new_controller.rb | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'app/controllers/whats_new_controller.rb')
-rw-r--r-- | app/controllers/whats_new_controller.rb | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/app/controllers/whats_new_controller.rb b/app/controllers/whats_new_controller.rb index cba86c65848..12a52f30bd0 100644 --- a/app/controllers/whats_new_controller.rb +++ b/app/controllers/whats_new_controller.rb @@ -5,7 +5,6 @@ class WhatsNewController < ApplicationController skip_before_action :authenticate_user! - before_action :check_feature_flag before_action :check_valid_page_param, :set_pagination_headers, unless: -> { has_version_param? } feature_category :navigation @@ -13,17 +12,13 @@ class WhatsNewController < ApplicationController def index respond_to do |format| format.js do - render json: highlight_items + render json: highlights.items end end end private - def check_feature_flag - render_404 unless Feature.enabled?(:whats_new_drawer, current_user) - end - def check_valid_page_param render_404 if current_page < 1 end @@ -42,10 +37,6 @@ class WhatsNewController < ApplicationController end end - def highlight_items - highlights.map {|item| Gitlab::WhatsNew::ItemPresenter.present(item) } - end - def set_pagination_headers response.set_header('X-Next-Page', highlights.next_page) end |