diff options
| author | Francisco Javier López <fjlopez@gitlab.com> | 2019-04-04 18:32:02 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-04-04 18:32:02 +0000 |
| commit | 8a134f4c6505c4f8f3c89e0ae4d4ea2293765be3 (patch) | |
| tree | 910dce4df7fd61af86a9f282f52fcc72ff056975 /app/controllers/projects | |
| parent | 465f82e32cd1ca7c87ca7553e350af4c52b00805 (diff) | |
| download | gitlab-ce-8a134f4c6505c4f8f3c89e0ae4d4ea2293765be3.tar.gz | |
Renamed terminal_specification to channel_specification
We're moving from using terminology related to terminals when
we refer to Websockets connections in Workhorse.
It's more appropiate a concept like channel.
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/environments_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/projects/jobs_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb index 4fa6cd94ae5..301449cfa90 100644 --- a/app/controllers/projects/environments_controller.rb +++ b/app/controllers/projects/environments_controller.rb @@ -117,7 +117,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController terminal = environment.terminals.try(:first) if terminal set_workhorse_internal_api_content_type - render json: Gitlab::Workhorse.terminal_websocket(terminal) + render json: Gitlab::Workhorse.channel_websocket(terminal) else render html: 'Not found', status: :not_found end diff --git a/app/controllers/projects/jobs_controller.rb b/app/controllers/projects/jobs_controller.rb index 35cc32d3e63..2a4933e7bc2 100644 --- a/app/controllers/projects/jobs_controller.rb +++ b/app/controllers/projects/jobs_controller.rb @@ -157,7 +157,7 @@ class Projects::JobsController < Projects::ApplicationController # GET .../terminal.ws : implemented in gitlab-workhorse def terminal_websocket_authorize set_workhorse_internal_api_content_type - render json: Gitlab::Workhorse.terminal_websocket(@build.terminal_specification) + render json: Gitlab::Workhorse.channel_websocket(@build.terminal_specification) end private |