diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-12-18 08:42:04 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-12-18 08:42:04 +0000 |
| commit | 37e6863e963ed8e6c04db38c1ffaacf6db61db99 (patch) | |
| tree | 99a51d9b97c63afcc00f96aa23f15bc57300dd74 /app/controllers | |
| parent | 7fa35300a14d39d6e7c3eaa7930865aeb78344ae (diff) | |
| parent | bada3f415fcd85ad72fbd473aab0075ce14593dc (diff) | |
| download | gitlab-ce-37e6863e963ed8e6c04db38c1ffaacf6db61db99.tar.gz | |
Merge branch 'fj-fix-action-name-jobscontroller' into 'master'
Fixed action name in JobsController
See merge request gitlab-org/gitlab-ce!23888
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/jobs_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/jobs_controller.rb b/app/controllers/projects/jobs_controller.rb index c58b30eace7..bfbbcba883f 100644 --- a/app/controllers/projects/jobs_controller.rb +++ b/app/controllers/projects/jobs_controller.rb @@ -9,7 +9,7 @@ class Projects::JobsController < Projects::ApplicationController before_action :authorize_update_build!, except: [:index, :show, :status, :raw, :trace, :cancel_all, :erase] before_action :authorize_erase_build!, only: [:erase] - before_action :authorize_use_build_terminal!, only: [:terminal, :terminal_workhorse_authorize] + before_action :authorize_use_build_terminal!, only: [:terminal, :terminal_websocket_authorize] before_action :verify_api_request!, only: :terminal_websocket_authorize layout 'project' |