diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-02-07 13:30:33 +0100 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-02-07 13:30:33 +0100 |
| commit | bc66944248bf62816f830b5769449c2c3a9dbd04 (patch) | |
| tree | 10c3b22141af43ae2039552f9c2b2a086312d210 /app/controllers | |
| parent | 1664354c65c103bd3ad55ebe32e84635bef22a6d (diff) | |
| download | gitlab-ce-bc66944248bf62816f830b5769449c2c3a9dbd04.tar.gz | |
Fix stoppable?
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 6eb542e4bd8..fedeb344a03 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -451,7 +451,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController deployment = environment.first_deployment_for(@merge_request.diff_head_commit) stop_url = - if environment.stoppable? && can?(current_user, :create_deployment, environment) + if environment.stop_action? && can?(current_user, :create_deployment, environment) stop_namespace_project_environment_path(project.namespace, project, environment) end |