Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2015-04-16 15:03:37 +0300
committerJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2015-04-20 16:39:37 +0300
commit5a4ebfb47af40de6cfe29fe59dae82f8c244e5e3 (patch)
treef87ac47a9d14849659a8a40a53576080593b0670 /app/controllers/groups_controller.rb
parent76aade28e25d1f6e8924b35ed9bd365c8889987f (diff)
Fixed the Rails/ActionFilter cop
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
Diffstat (limited to 'app/controllers/groups_controller.rb')
-rw-r--r--app/controllers/groups_controller.rb16
1 files changed, 8 insertions, 8 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 7af3c077182..294af0b1704 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -1,17 +1,17 @@
class GroupsController < Groups::ApplicationController
- skip_before_filter :authenticate_user!, only: [:show, :issues, :merge_requests]
+ skip_before_action :authenticate_user!, only: [:show, :issues, :merge_requests]
respond_to :html
- before_filter :group, except: [:new, :create]
+ before_action :group, except: [:new, :create]
# Authorize
- before_filter :authorize_read_group!, except: [:new, :create]
- before_filter :authorize_admin_group!, only: [:edit, :update, :destroy, :projects]
- before_filter :authorize_create_group!, only: [:new, :create]
+ before_action :authorize_read_group!, except: [:new, :create]
+ before_action :authorize_admin_group!, only: [:edit, :update, :destroy, :projects]
+ before_action :authorize_create_group!, only: [:new, :create]
# Load group projects
- before_filter :load_projects, except: [:new, :create, :projects, :edit, :update]
- before_filter :event_filter, only: :show
- before_filter :set_title, only: [:new, :create]
+ before_action :load_projects, except: [:new, :create, :projects, :edit, :update]
+ before_action :event_filter, only: :show
+ before_action :set_title, only: [:new, :create]
layout :determine_layout