Merge branch 'deprecated-redirect-back' into 'master'

Fix deprecation: redirect_to :back is deprecated

See merge request gitlab-org/gitlab-ce!23943

app/controllers/admin/application_settings_controller.rb

@@ -77,7 +77,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
   def reset_health_check_token
     @application_setting.reset_health_check_access_token!
     flash[:notice] = 'New health check access token has been generated!'
-    redirect_to :back
+    redirect_back_or_default
   end
 
   def clear_repository_check_states

app/controllers/application_controller.rb

@@ -76,7 +76,7 @@ class ApplicationController < ActionController::Base
   end
 
   def redirect_back_or_default(default: root_path, options: {})
-    redirect_to request.referer.present? ? :back : default, options
+    redirect_back(fallback_location: default, **options)
   end
 
   def not_found

app/controllers/sherlock/transactions_controller.rb

@@ -15,7 +15,7 @@ module Sherlock
     def destroy_all
       Gitlab::Sherlock.collection.clear
 
-      redirect_to :back, status: :found
+      redirect_back_or_default(options: { status: :found })
     end
   end
 end

changelogs/unreleased/deprecated-redirect-back.yml

+---
+title: 'Fix deprecation: redirect_to :back is deprecated'
+merge_request: 23943
+author: Jasper Maes
+type: other