Коммит fb2fc314 создал по автору Max Woolf's avatar Max Woolf
Просмотр файлов

Merge branch...

Merge branch '390767-authenticate-authorize-the-user-access-with-browser-cookie-in-environment-index-page' into 'master'

Authenticate/authorize the user access with browser cookie in Environment index page

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119858



Merged-by: default avatarMax Woolf <mwoolf@gitlab.com>
Approved-by: default avatarTimo Furrer <tfurrer@gitlab.com>
Approved-by: default avatarMax Woolf <mwoolf@gitlab.com>
Co-authored-by: default avatarAnna Vovchenko <avovchenko@gitlab.com>
владельцы 6d97a8bd dce023a5
...@@ -9,6 +9,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController ...@@ -9,6 +9,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController
include MetricsDashboard include MetricsDashboard
include ProductAnalyticsTracking include ProductAnalyticsTracking
include KasCookie
layout 'project' layout 'project'
...@@ -32,6 +33,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController ...@@ -32,6 +33,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController
before_action :environment, only: [:show, :edit, :update, :stop, :terminal, :terminal_websocket_authorize, :metrics, :cancel_auto_stop] before_action :environment, only: [:show, :edit, :update, :stop, :terminal, :terminal_websocket_authorize, :metrics, :cancel_auto_stop]
before_action :verify_api_request!, only: :terminal_websocket_authorize before_action :verify_api_request!, only: :terminal_websocket_authorize
before_action :expire_etag_cache, only: [:index], unless: -> { request.format.json? } before_action :expire_etag_cache, only: [:index], unless: -> { request.format.json? }
before_action :set_kas_cookie, only: [:index], if: -> { current_user }
after_action :expire_etag_cache, only: [:cancel_auto_stop] after_action :expire_etag_cache, only: [:cancel_auto_stop]
track_event :index, :folder, :show, :new, :edit, :create, :update, :stop, :cancel_auto_stop, :terminal, track_event :index, :folder, :show, :new, :edit, :create, :update, :stop, :cancel_auto_stop, :terminal,
......
Поддерживает Markdown
0% или .
You are about to add 0 people to the discussion. Proceed with caution.
Сначала завершите редактирование этого сообщения!
Пожалуйста, зарегистрируйтесь или чтобы прокомментировать