summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-15 00:09:27 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-15 00:09:27 +0000
commit30a8d158a29cc09ece1a71771a28f7bc1483506b (patch)
tree223fab9858e274fff5e901116890d2d7c8ad162b /app/controllers
parentae93b284016c07a8a4b47e2510789253d14870f3 (diff)
downloadgitlab-ce-30a8d158a29cc09ece1a71771a28f7bc1483506b.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/projects/issues_controller.rb4
-rw-r--r--app/controllers/projects/merge_requests_controller.rb4
2 files changed, 0 insertions, 8 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 96650e2cae9..51ad8edb012 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -50,10 +50,6 @@ class Projects::IssuesController < Projects::ApplicationController
push_frontend_feature_flag(:save_issuable_health_status, project.group, default_enabled: true)
end
- before_action only: :show do
- push_frontend_feature_flag(:sort_discussions, @project)
- end
-
around_action :allow_gitaly_ref_name_caching, only: [:discussions]
respond_to :html
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 038b6146bab..89de40006ff 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -31,10 +31,6 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
push_frontend_feature_flag(:vue_issuable_sidebar, @project.group)
end
- before_action only: :show do
- push_frontend_feature_flag(:sort_discussions, @project)
- end
-
around_action :allow_gitaly_ref_name_caching, only: [:index, :show, :discussions]
def index