Skip to content
Snippets Groups Projects
Commit c7e3b92b authored by Zeger-Jan van de Weg's avatar Zeger-Jan van de Weg
Browse files

Incorporate feedback -- Deployed Time ago

Former-commit-id: f61e0345
parent 05838918
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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 }
Loading
Loading
Loading
Loading
@@ -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)
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment