Commit 7fec0367 authored by Clement Ho's avatar Clement Ho

Merge branch '8263-clicking-on-commit-sha-and-text-reloads-ops-dashboard' into 'master'

Resolve "Clicking on Commit SHA and Text reloads ops dashboard"

Closes #8263

See merge request gitlab-org/gitlab-ee!8214
parents 9eae11aa 3e4d13ad
...@@ -72,10 +72,10 @@ export default { ...@@ -72,10 +72,10 @@ export default {
<commit <commit
:commit-ref="commitRef" :commit-ref="commitRef"
:short-sha="project.last_deployment.commit.short_id" :short-sha="project.last_deployment.commit.short_id"
:commit-url="project.last_deployment.commit.web_url" :commit-url="project.last_deployment.commit.commit_url"
:title="project.last_deployment.commit.title" :title="project.last_deployment.commit.title"
:author="author" :author="author"
:tag="project.last_deployment.commit.tag" :tag="project.last_deployment.tag"
/> />
</div> </div>
<div <div
......
---
title: Link project short SHA to commit url
merge_request: 8214
author:
type: fixed
...@@ -74,8 +74,8 @@ describe('project component', () => { ...@@ -74,8 +74,8 @@ describe('project component', () => {
expect(commit.shortSha).toBe(vm.project.last_deployment.commit.short_id); expect(commit.shortSha).toBe(vm.project.last_deployment.commit.short_id);
}); });
it('binds web_url to commitUrl', () => { it('binds commitUrl', () => {
expect(commit.commitUrl).toBe(vm.project.last_deployment.commit.web_url); expect(commit.commitUrl).toBe(vm.project.last_deployment.commit.commit_url);
}); });
it('binds title', () => { it('binds title', () => {
...@@ -87,7 +87,7 @@ describe('project component', () => { ...@@ -87,7 +87,7 @@ describe('project component', () => {
}); });
it('binds tag', () => { it('binds tag', () => {
expect(commit.tag).toBe(vm.project.last_deployment.commit.tag); expect(commit.tag).toBe(vm.project.last_deployment.tag);
}); });
}); });
......
...@@ -34,10 +34,10 @@ export function mockProjectData( ...@@ -34,10 +34,10 @@ export function mockProjectData(
created_at: deployTimeStamp, created_at: deployTimeStamp,
commit: { commit: {
short_id: 'mock-short_id', short_id: 'mock-short_id',
tag: isTag,
title: 'mock-title', title: 'mock-title',
web_url: 'https://mock-web_url/', commit_url: 'https://mock-commit_url/',
}, },
tag: isTag,
user: { user: {
avatar_url: null, avatar_url: null,
path: 'mock-path', path: 'mock-path',
......
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