Commit eb48969a authored by Rémy Coutable's avatar Rémy Coutable Committed by Yorick Peterse

Merge branch 'fix/error-500-in-pipeline-when-fork' into 'master'

Use project that belongs to pipeline in view

This MR makes project in pipelines view match the one that pipeline has been created for.

Closes #17943

See merge request !4376
parent 0aec06ac
...@@ -12,6 +12,7 @@ v 8.8.3 ...@@ -12,6 +12,7 @@ v 8.8.3
- Make authentication service for Container Registry to be compatible with < Docker 1.11. !4363 - Make authentication service for Container Registry to be compatible with < Docker 1.11. !4363
- Add Application Setting to configure Container Registry token expire delay (default 5min). !4364 - Add Application Setting to configure Container Registry token expire delay (default 5min). !4364
- Pass the "Remember me" value to the 2FA token form. !4369 - Pass the "Remember me" value to the 2FA token form. !4369
- Fix incorrect links on pipeline page when merge request created from fork. !4376
v 8.8.2 v 8.8.2
- Added remove due date button. !4209 - Added remove due date button. !4209
......
.row-content-block.build-content.middle-block .row-content-block.build-content.middle-block
.pull-right .pull-right
- if can?(current_user, :update_pipeline, @project) - if can?(current_user, :update_pipeline, ci_commit.project)
- if ci_commit.builds.latest.failed.any?(&:retryable?) - if ci_commit.builds.latest.failed.any?(&:retryable?)
= link_to "Retry failed", retry_namespace_project_pipeline_path(@project.namespace, @project, ci_commit.id), class: 'btn btn-grouped btn-primary', method: :post = link_to "Retry failed", retry_namespace_project_pipeline_path(ci_commit.project.namespace, ci_commit.project, ci_commit.id), class: 'btn btn-grouped btn-primary', method: :post
- if ci_commit.builds.running_or_pending.any? - if ci_commit.builds.running_or_pending.any?
= link_to "Cancel running", cancel_namespace_project_pipeline_path(@project.namespace, @project, ci_commit.id), data: { confirm: 'Are you sure?' }, class: 'btn btn-grouped btn-danger', method: :post = link_to "Cancel running", cancel_namespace_project_pipeline_path(ci_commit.project.namespace, ci_commit.project, ci_commit.id), data: { confirm: 'Are you sure?' }, class: 'btn btn-grouped btn-danger', method: :post
.oneline.clearfix .oneline.clearfix
- if defined?(pipeline_details) && pipeline_details - if defined?(pipeline_details) && pipeline_details
Pipeline Pipeline
= link_to "##{ci_commit.id}", namespace_project_pipeline_path(@project.namespace, @project, ci_commit.id), class: "monospace" = link_to "##{ci_commit.id}", namespace_project_pipeline_path(ci_commit.project.namespace, ci_commit.project, ci_commit.id), class: "monospace"
with with
= pluralize ci_commit.statuses.count(:id), "build" = pluralize ci_commit.statuses.count(:id), "build"
- if ci_commit.ref - if ci_commit.ref
for for
= link_to ci_commit.ref, namespace_project_commits_path(@project.namespace, @project, ci_commit.ref), class: "monospace" = link_to ci_commit.ref, namespace_project_commits_path(ci_commit.project.namespace, ci_commit.project, ci_commit.ref), class: "monospace"
- if defined?(link_to_commit) && link_to_commit - if defined?(link_to_commit) && link_to_commit
for commit for commit
= link_to ci_commit.short_sha, namespace_project_commit_path(@project.namespace, @project, ci_commit.sha), class: "monospace" = link_to ci_commit.short_sha, namespace_project_commit_path(ci_commit.project.namespace, ci_commit.project, ci_commit.sha), class: "monospace"
- if ci_commit.duration - if ci_commit.duration
in in
= time_interval_in_words ci_commit.duration = time_interval_in_words ci_commit.duration
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
%li= error %li= error
You can also test your .gitlab-ci.yml in the #{link_to "Lint", ci_lint_path} You can also test your .gitlab-ci.yml in the #{link_to "Lint", ci_lint_path}
- if @project.builds_enabled? && !ci_commit.ci_yaml_file - if ci_commit.project.builds_enabled? && !ci_commit.ci_yaml_file
.bs-callout.bs-callout-warning .bs-callout.bs-callout-warning
\.gitlab-ci.yml not found in this commit \.gitlab-ci.yml not found in this commit
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
%th Tags %th Tags
%th Duration %th Duration
%th Finished at %th Finished at
- if @project.build_coverage_enabled? - if ci_commit.project.build_coverage_enabled?
%th Coverage %th Coverage
%th %th
- ci_commit.statuses.stages.each do |stage| - ci_commit.statuses.stages.each do |stage|
......
require 'spec_helper'
feature 'Merge request created from fork' do
given(:user) { create(:user) }
given(:project) { create(:project, :public) }
given(:fork_project) { create(:project, :public) }
given!(:merge_request) do
create(:forked_project_link, forked_to_project: fork_project,
forked_from_project: project)
create(:merge_request_with_diffs, source_project: fork_project,
target_project: project,
description: 'Test merge request')
end
background do
fork_project.team << [user, :master]
login_as user
end
scenario 'user can access merge request' do
visit_merge_request(merge_request)
expect(page).to have_content 'Test merge request'
end
context 'pipeline present in source project' do
include WaitForAjax
given(:pipeline) do
create(:ci_commit_with_two_jobs, project: fork_project,
sha: merge_request.last_commit.id,
ref: merge_request.source_branch)
end
background { pipeline.create_builds(user) }
scenario 'user visits a pipelines page', js: true do
visit_merge_request(merge_request)
page.within('.merge-request-tabs') { click_link 'Builds' }
wait_for_ajax
page.within('table.builds') do
expect(page).to have_content 'rspec'
expect(page).to have_content 'spinach'
end
expect(find_link('Cancel running')[:href])
.to include fork_project.path_with_namespace
end
end
def visit_merge_request(mr)
visit namespace_project_merge_request_path(project.namespace,
project, mr)
end
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