diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-08 18:08:32 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-08 18:08:32 +0000 |
| commit | 2ac48330152821211934d8aee396679d5895c5fe (patch) | |
| tree | 4fa11de67f08298313bc73958980b55aed814ae2 /app/controllers/projects/environments_controller.rb | |
| parent | 1ec1bec4ee7ef7cb2e6faa7af625950f6d7aa290 (diff) | |
| download | gitlab-ce-2ac48330152821211934d8aee396679d5895c5fe.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/environments_controller.rb')
| -rw-r--r-- | app/controllers/projects/environments_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb index 71195fdb892..c37abf82fe9 100644 --- a/app/controllers/projects/environments_controller.rb +++ b/app/controllers/projects/environments_controller.rb @@ -25,6 +25,8 @@ class Projects::EnvironmentsController < Projects::ApplicationController before_action :expire_etag_cache, only: [:index], unless: -> { request.format.json? } after_action :expire_etag_cache, only: [:cancel_auto_stop] + feature_category :continuous_delivery + def index @environments = project.environments .with_state(params[:scope] || :available) |