Commit f89fea54 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'fix/error-on-builds-page' into 'master'

Fix error on commit builds page

This MR fixes error on commit builds page that occurs before CI commit
(Pipeline) had been updated.

Closes #15509

See merge request !3874
parents b79c5c40 b822f65a
...@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date. ...@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.
v 8.8.0 (unreleased) v 8.8.0 (unreleased)
- Remove future dates from contribution calendar graph. - Remove future dates from contribution calendar graph.
- Fix error when visiting commit builds page before build was updated
v 8.7.1 (unreleased) v 8.7.1 (unreleased)
- Fix .gitlab-ci.yml parsing issue when hidde job is a template without script definition. !3849 - Fix .gitlab-ci.yml parsing issue when hidde job is a template without script definition. !3849
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
- 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(@project.namespace, @project, ci_commit.sha), class: "monospace"
- if ci_commit.duration > 0 - if ci_commit.duration
in in
= time_interval_in_words ci_commit.duration = time_interval_in_words ci_commit.duration
......
require 'spec_helper'
feature 'project commit builds' do
given(:project) { create(:project) }
background do
user = create(:user)
project.team << [user, :master]
login_as(user)
end
context 'when no builds triggered yet' do
background do
create(:ci_commit, project: project,
sha: project.commit.sha,
ref: 'master')
end
scenario 'user views commit builds page' do
visit builds_namespace_project_commit_path(project.namespace,
project, project.commit.sha)
expect(page).to have_content('Builds')
end
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