Read about our upcoming Code of Conduct on this issue

Commit 94105993 authored by Kamil Trzcinski's avatar Kamil Trzcinski
Browse files

Scope environments to project

parent 7ed6eb493788
......@@ -70,6 +70,10 @@ def runner_path(runner, *args)
namespace_project_runner_path(@project.namespace, @project, runner, *args)
end
def environment_path(environment, *args)
namespace_project_environment_path(environment.project.namespace, environment.project, environment, *args)
end
def issue_path(entity, *args)
namespace_project_issue_path(entity.project.namespace, entity.project, entity, *args)
end
......
......@@ -1304,7 +1304,7 @@ def environments_for(ref, commit, with_tags: false)
environment_ids.where(ref: ref)
end
Environment.where(id: environment_ids).select do |environment|
environments.where(id: environment_ids).select do |environment|
environment.includes_commit?(commit)
end
end
......
......@@ -51,7 +51,7 @@
%span.hidden-sm
Deployed to
= succeed '.' do
= link_to environment.name, namespace_project_environment_path(environment.project.namespace, environment.project, environment), class: 'environment'
= link_to environment.name, environment_path(environment), class: 'environment'
- external_url = environment.external_url
- if external_url
= link_to external_url, target: '_blank' do
......
......@@ -15,6 +15,8 @@
assign(:merge_request, merge_request)
assign(:project, project)
allow(view).to receive(:can?).and_return(true)
render
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment