diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-07 03:07:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-07 03:07:50 +0300 |
commit | d95abc0bc994436aa963347bed29e264d5158fa5 (patch) | |
tree | fe2aab72e133e2913cba0959efd88fdb75669b91 /app/controllers/projects/error_tracking_controller.rb | |
parent | 015663b70f1bcdae4483e38c2beac884f92da5b8 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/error_tracking_controller.rb')
-rw-r--r-- | app/controllers/projects/error_tracking_controller.rb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/app/controllers/projects/error_tracking_controller.rb b/app/controllers/projects/error_tracking_controller.rb index 35e12c37056..dea8cd81f4f 100644 --- a/app/controllers/projects/error_tracking_controller.rb +++ b/app/controllers/projects/error_tracking_controller.rb @@ -1,11 +1,9 @@ # frozen_string_literal: true -class Projects::ErrorTrackingController < Projects::ApplicationController +class Projects::ErrorTrackingController < Projects::ErrorTracking::BaseController before_action :authorize_read_sentry_issue! before_action :set_issue_id, only: :details - POLLING_INTERVAL = 10_000 - def index respond_to do |format| format.html @@ -20,6 +18,7 @@ class Projects::ErrorTrackingController < Projects::ApplicationController respond_to do |format| format.html format.json do + set_polling_interval render_issue_detail_json end end @@ -74,10 +73,6 @@ class Projects::ErrorTrackingController < Projects::ApplicationController @issue_id = issue_details_params[:issue_id] end - def set_polling_interval - Gitlab::PollingInterval.set_header(response, interval: POLLING_INTERVAL) - end - def serialize_errors(errors) ErrorTracking::ErrorSerializer .new(project: project, user: current_user) |