Commit 3cccb134 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch...

Merge branch 'blackst0ne-rails5-argumenterror-before-process_action-callback-reject_blocked-has-not-been-defined' into 'master'

Resolve "[Rails5] ArgumentError: Before process_action callback :reject_blocked has not been defined"

Closes #6604

See merge request gitlab-org/gitlab-ee!6257
parents 615c0aa8 c78463a2
...@@ -2,7 +2,7 @@ class Projects::VulnerabilityFeedbackController < Projects::ApplicationControlle ...@@ -2,7 +2,7 @@ class Projects::VulnerabilityFeedbackController < Projects::ApplicationControlle
before_action :vulnerability_feedback, only: [:destroy] before_action :vulnerability_feedback, only: [:destroy]
before_action :authorize_read_vulnerability_feedback!, only: [:index] before_action :authorize_read_vulnerability_feedback!, only: [:index]
before_action :authorize_admin_vulnerability_feedback!, only: [:create, :destroy] before_action :authorize_admin_vulnerability_feedback!, only: [:create, :destroy]
skip_before_action :authenticate_user!, only: [:index] skip_before_action :authenticate_user!, only: [:index], raise: false
respond_to :json respond_to :json
......
class UnsubscribesController < ApplicationController class UnsubscribesController < ApplicationController
skip_before_action :authenticate_user!, skip_before_action :authenticate_user!
:reject_blocked, :set_current_user_for_observers,
:add_abilities
def show def show
@user = get_user @user = get_user
......
---
title: "[Rails5] Fix error on missed :authenticate_user callback"
merge_request: 6257
author: "@blackst0ne"
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment