diff options
| author | Z.J. van de Weg <zegerjan@gitlab.com> | 2016-09-27 20:15:46 +0200 |
|---|---|---|
| committer | Z.J. van de Weg <zegerjan@gitlab.com> | 2016-09-27 20:15:46 +0200 |
| commit | f61e03456968e67b338771f5c656afffc0e50e49 (patch) | |
| tree | c80dad2becbc2b01ba8d96917c7cd5512021aa05 | |
| parent | 0021cc2d0a7aad6476efda0c6d562b2015713e81 (diff) | |
| download | gitlab-ce-zj-deployed-ago-keep-around-commit.tar.gz | |
Incorporate feedback -- Deployed Time agozj-deployed-ago-keep-around-commit
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/merge_request.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index d0e262acdac..96275bc7b38 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -377,7 +377,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController environments = @merge_request.environments deployments = @merge_request.deployments - if environments + if environments.present? environments = environments.select { |e| can?(current_user, :read_environment, e) }.map do |environment| project = environment.project deployment = deployments.find { |d| d.environment == environment } diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 2ce03a31962..30aa27af480 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -673,11 +673,11 @@ class MergeRequest < ActiveRecord::Base environment.deployment_id_for(diff_head_commit) end.compact - target_project.deployments.find(deployment_ids) + Deployments.find(deployment_ids) end def environments - return [] unless diff_head_sha + return [] unless diff_head_commit environments = source_project.environments_for( source_branch, diff_head_commit) |