diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-10-18 11:22:22 +0200 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-10-18 11:32:11 +0200 |
commit | 829a708a970b31afdcda21fff072eda0c61dfd4c (patch) | |
tree | f650fc5ce7a421bdf3d94899705b1cba7ef8c21d /app/controllers/projects | |
parent | e35af6e25eae3f9323bd2a72cbc16f9cc4559e17 (diff) | |
download | gitlab-ce-829a708a970b31afdcda21fff072eda0c61dfd4c.tar.gz |
Fix remaining specs failures
Diffstat (limited to 'app/controllers/projects')
-rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 86e12660c23..7bac0a2b1c7 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -412,11 +412,16 @@ class Projects::MergeRequestsController < Projects::ApplicationController project = environment.project deployment = environment.first_deployment_for(@merge_request.diff_head_commit) + stop_url = + if environment.stoppable? && can?(current_user, :create_deployment, environment) + stop_namespace_project_environment_path(project.namespace, project, environment) + end + { id: environment.id, name: environment.name, url: namespace_project_environment_path(project.namespace, project, environment), - stop_url: (stop_namespace_project_environment_path(project.namespace, project, environment) if environment.stoppable?), + stop_url: stop_url, external_url: environment.external_url, external_url_formatted: environment.formatted_external_url, deployed_at: deployment.try(:created_at), |