diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-07-16 09:56:19 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-07-16 09:56:19 +0000 |
commit | 6c237350b3967881cf9da50ec13a536e1a7e6755 (patch) | |
tree | 8ce3d51df9ce9e9716ef3ce8626b973d7f882547 /app/serializers | |
parent | f73fb2444985155c5bbec4fc43de9fbfb6710825 (diff) | |
parent | af00a1591412655202a634fbca999b80b97a676e (diff) | |
download | gitlab-ce-6c237350b3967881cf9da50ec13a536e1a7e6755.tar.gz |
Merge branch 'fix/gb/rename-environments-stop-actions' into 'master'
Make it more explicit what environment stop actions are
Closes #48672
See merge request gitlab-org/gitlab-ce!20587
Diffstat (limited to 'app/serializers')
-rw-r--r-- | app/serializers/environment_entity.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/environment_entity.rb b/app/serializers/environment_entity.rb index 0fc3f92b151..83558fc6659 100644 --- a/app/serializers/environment_entity.rb +++ b/app/serializers/environment_entity.rb @@ -7,7 +7,7 @@ class EnvironmentEntity < Grape::Entity expose :external_url expose :environment_type expose :last_deployment, using: DeploymentEntity - expose :stop_action?, as: :has_stop_action + expose :stop_action_available?, as: :has_stop_action expose :metrics_path, if: -> (environment, _) { environment.has_metrics? } do |environment| metrics_project_environment_path(environment.project, environment) |