summaryrefslogtreecommitdiff
path: root/app/controllers/ci
diff options
context:
space:
mode:
Diffstat (limited to 'app/controllers/ci')
-rw-r--r--app/controllers/ci/admin/runners_controller.rb2
-rw-r--r--app/controllers/ci/builds_controller.rb14
-rw-r--r--app/controllers/ci/charts_controller.rb8
-rw-r--r--app/controllers/ci/commits_controller.rb12
-rw-r--r--app/controllers/ci/events_controller.rb6
-rw-r--r--app/controllers/ci/lints_controller.rb2
-rw-r--r--app/controllers/ci/projects_controller.rb14
-rw-r--r--app/controllers/ci/runner_projects_controller.rb6
-rw-r--r--app/controllers/ci/runners_controller.rb10
-rw-r--r--app/controllers/ci/services_controller.rb10
-rw-r--r--app/controllers/ci/triggers_controller.rb8
-rw-r--r--app/controllers/ci/variables_controller.rb8
-rw-r--r--app/controllers/ci/web_hooks_controller.rb8
13 files changed, 54 insertions, 54 deletions
diff --git a/app/controllers/ci/admin/runners_controller.rb b/app/controllers/ci/admin/runners_controller.rb
index 4f5f3776ddc..2aabe21ed66 100644
--- a/app/controllers/ci/admin/runners_controller.rb
+++ b/app/controllers/ci/admin/runners_controller.rb
@@ -1,6 +1,6 @@
module Ci
class Admin::RunnersController < Ci::Admin::ApplicationController
- before_filter :runner, except: :index
+ before_action :runner, except: :index
def index
@runners = Ci::Runner.order('id DESC')
diff --git a/app/controllers/ci/builds_controller.rb b/app/controllers/ci/builds_controller.rb
index 9338b37e678..fbfb02af4fb 100644
--- a/app/controllers/ci/builds_controller.rb
+++ b/app/controllers/ci/builds_controller.rb
@@ -1,12 +1,12 @@
module Ci
class BuildsController < Ci::ApplicationController
- before_filter :authenticate_user!, except: [:status, :show]
- before_filter :authenticate_public_page!, only: :show
- before_filter :project
- before_filter :authorize_access_project!, except: [:status, :show]
- before_filter :authorize_manage_project!, except: [:status, :show, :retry, :cancel]
- before_filter :authorize_manage_builds!, only: [:retry, :cancel]
- before_filter :build, except: [:show]
+ before_action :authenticate_user!, except: [:status, :show]
+ before_action :authenticate_public_page!, only: :show
+ before_action :project
+ before_action :authorize_access_project!, except: [:status, :show]
+ before_action :authorize_manage_project!, except: [:status, :show, :retry, :cancel]
+ before_action :authorize_manage_builds!, only: [:retry, :cancel]
+ before_action :build, except: [:show]
layout 'ci/project'
def show
diff --git a/app/controllers/ci/charts_controller.rb b/app/controllers/ci/charts_controller.rb
index 63326ef36cc..aa875e70987 100644
--- a/app/controllers/ci/charts_controller.rb
+++ b/app/controllers/ci/charts_controller.rb
@@ -1,9 +1,9 @@
module Ci
class ChartsController < Ci::ApplicationController
- before_filter :authenticate_user!
- before_filter :project
- before_filter :authorize_access_project!
- before_filter :authorize_manage_project!
+ before_action :authenticate_user!
+ before_action :project
+ before_action :authorize_access_project!
+ before_action :authorize_manage_project!
layout 'ci/project'
diff --git a/app/controllers/ci/commits_controller.rb b/app/controllers/ci/commits_controller.rb
index f0c0ff1bc11..e41f3487de4 100644
--- a/app/controllers/ci/commits_controller.rb
+++ b/app/controllers/ci/commits_controller.rb
@@ -1,11 +1,11 @@
module Ci
class CommitsController < Ci::ApplicationController
- before_filter :authenticate_user!, except: [:status, :show]
- before_filter :authenticate_public_page!, only: :show
- before_filter :project
- before_filter :authorize_access_project!, except: [:status, :show, :cancel]
- before_filter :authorize_manage_builds!, only: [:cancel]
- before_filter :commit, only: :show
+ before_action :authenticate_user!, except: [:status, :show]
+ before_action :authenticate_public_page!, only: :show
+ before_action :project
+ before_action :authorize_access_project!, except: [:status, :show, :cancel]
+ before_action :authorize_manage_builds!, only: [:cancel]
+ before_action :commit, only: :show
layout 'ci/project'
def show
diff --git a/app/controllers/ci/events_controller.rb b/app/controllers/ci/events_controller.rb
index c515caabe63..89b784a1e89 100644
--- a/app/controllers/ci/events_controller.rb
+++ b/app/controllers/ci/events_controller.rb
@@ -2,9 +2,9 @@ module Ci
class EventsController < Ci::ApplicationController
EVENTS_PER_PAGE = 50
- before_filter :authenticate_user!
- before_filter :project
- before_filter :authorize_manage_project!
+ before_action :authenticate_user!
+ before_action :project
+ before_action :authorize_manage_project!
layout 'ci/project'
diff --git a/app/controllers/ci/lints_controller.rb b/app/controllers/ci/lints_controller.rb
index 62c2ba86e86..a81e4e319ff 100644
--- a/app/controllers/ci/lints_controller.rb
+++ b/app/controllers/ci/lints_controller.rb
@@ -1,6 +1,6 @@
module Ci
class LintsController < Ci::ApplicationController
- before_filter :authenticate_user!
+ before_action :authenticate_user!
def show
end
diff --git a/app/controllers/ci/projects_controller.rb b/app/controllers/ci/projects_controller.rb
index 454810ca01f..6483a84ee91 100644
--- a/app/controllers/ci/projects_controller.rb
+++ b/app/controllers/ci/projects_controller.rb
@@ -2,13 +2,13 @@ module Ci
class ProjectsController < Ci::ApplicationController
PROJECTS_BATCH = 100
- before_filter :authenticate_user!, except: [:build, :badge, :index, :show]
- before_filter :authenticate_public_page!, only: :show
- before_filter :project, only: [:build, :integration, :show, :badge, :edit, :update, :destroy, :toggle_shared_runners, :dumped_yaml]
- before_filter :authorize_access_project!, except: [:build, :gitlab, :badge, :index, :show, :new, :create]
- before_filter :authorize_manage_project!, only: [:edit, :integration, :update, :destroy, :toggle_shared_runners, :dumped_yaml]
- before_filter :authenticate_token!, only: [:build]
- before_filter :no_cache, only: [:badge]
+ before_action :authenticate_user!, except: [:build, :badge, :index, :show]
+ before_action :authenticate_public_page!, only: :show
+ before_action :project, only: [:build, :integration, :show, :badge, :edit, :update, :destroy, :toggle_shared_runners, :dumped_yaml]
+ before_action :authorize_access_project!, except: [:build, :gitlab, :badge, :index, :show, :new, :create]
+ before_action :authorize_manage_project!, only: [:edit, :integration, :update, :destroy, :toggle_shared_runners, :dumped_yaml]
+ before_action :authenticate_token!, only: [:build]
+ before_action :no_cache, only: [:badge]
protect_from_forgery except: :build
layout 'ci/project', except: [:index, :gitlab]
diff --git a/app/controllers/ci/runner_projects_controller.rb b/app/controllers/ci/runner_projects_controller.rb
index 3a52087cc6b..5365f51082f 100644
--- a/app/controllers/ci/runner_projects_controller.rb
+++ b/app/controllers/ci/runner_projects_controller.rb
@@ -1,8 +1,8 @@
module Ci
class RunnerProjectsController < Ci::ApplicationController
- before_filter :authenticate_user!
- before_filter :project
- before_filter :authorize_manage_project!
+ before_action :authenticate_user!
+ before_action :project
+ before_action :authorize_manage_project!
layout 'ci/project'
diff --git a/app/controllers/ci/runners_controller.rb b/app/controllers/ci/runners_controller.rb
index 0e9d576a15b..a672370302b 100644
--- a/app/controllers/ci/runners_controller.rb
+++ b/app/controllers/ci/runners_controller.rb
@@ -1,10 +1,10 @@
module Ci
class RunnersController < Ci::ApplicationController
- before_filter :authenticate_user!
- before_filter :project
- before_filter :set_runner, only: [:edit, :update, :destroy, :pause, :resume, :show]
- before_filter :authorize_access_project!
- before_filter :authorize_manage_project!
+ before_action :authenticate_user!
+ before_action :project
+ before_action :set_runner, only: [:edit, :update, :destroy, :pause, :resume, :show]
+ before_action :authorize_access_project!
+ before_action :authorize_manage_project!
layout 'ci/project'
diff --git a/app/controllers/ci/services_controller.rb b/app/controllers/ci/services_controller.rb
index e99f40f3a0a..1495223786d 100644
--- a/app/controllers/ci/services_controller.rb
+++ b/app/controllers/ci/services_controller.rb
@@ -1,10 +1,10 @@
module Ci
class ServicesController < Ci::ApplicationController
- before_filter :authenticate_user!
- before_filter :project
- before_filter :authorize_access_project!
- before_filter :authorize_manage_project!
- before_filter :service, only: [:edit, :update, :test]
+ before_action :authenticate_user!
+ before_action :project
+ before_action :authorize_access_project!
+ before_action :authorize_manage_project!
+ before_action :service, only: [:edit, :update, :test]
respond_to :html
diff --git a/app/controllers/ci/triggers_controller.rb b/app/controllers/ci/triggers_controller.rb
index 6ba37cd843e..a39cc5d3a56 100644
--- a/app/controllers/ci/triggers_controller.rb
+++ b/app/controllers/ci/triggers_controller.rb
@@ -1,9 +1,9 @@
module Ci
class TriggersController < Ci::ApplicationController
- before_filter :authenticate_user!
- before_filter :project
- before_filter :authorize_access_project!
- before_filter :authorize_manage_project!
+ before_action :authenticate_user!
+ before_action :project
+ before_action :authorize_access_project!
+ before_action :authorize_manage_project!
layout 'ci/project'
diff --git a/app/controllers/ci/variables_controller.rb b/app/controllers/ci/variables_controller.rb
index 6908e0877f0..9c6c775fde8 100644
--- a/app/controllers/ci/variables_controller.rb
+++ b/app/controllers/ci/variables_controller.rb
@@ -1,9 +1,9 @@
module Ci
class VariablesController < Ci::ApplicationController
- before_filter :authenticate_user!
- before_filter :project
- before_filter :authorize_access_project!
- before_filter :authorize_manage_project!
+ before_action :authenticate_user!
+ before_action :project
+ before_action :authorize_access_project!
+ before_action :authorize_manage_project!
layout 'ci/project'
diff --git a/app/controllers/ci/web_hooks_controller.rb b/app/controllers/ci/web_hooks_controller.rb
index eea4842c91c..24074a6d9ac 100644
--- a/app/controllers/ci/web_hooks_controller.rb
+++ b/app/controllers/ci/web_hooks_controller.rb
@@ -1,9 +1,9 @@
module Ci
class WebHooksController < Ci::ApplicationController
- before_filter :authenticate_user!
- before_filter :project
- before_filter :authorize_access_project!
- before_filter :authorize_manage_project!
+ before_action :authenticate_user!
+ before_action :project
+ before_action :authorize_access_project!
+ before_action :authorize_manage_project!
layout 'ci/project'
View Lorry Controller Status