Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
38bcc1e0
Commit
38bcc1e0
authored
Feb 08, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Looks for correct key to pass to commit prop. Adds rspec test.
parent
e0d93a5a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
3 deletions
+11
-3
app/assets/javascripts/vue_shared/components/pipelines_table_row.js.es6
...ascripts/vue_shared/components/pipelines_table_row.js.es6
+3
-3
changelogs/unreleased/27880-pipelines-table-not-showing-commit-branch.yml
...eased/27880-pipelines-table-not-showing-commit-branch.yml
+4
-0
spec/features/projects/pipelines/pipelines_spec.rb
spec/features/projects/pipelines/pipelines_spec.rb
+4
-0
No files found.
app/assets/javascripts/vue_shared/components/pipelines_table_row.js.es6
View file @
38bcc1e0
...
@@ -111,7 +111,7 @@ require('./commit');
...
@@ -111,7 +111,7 @@ require('./commit');
* If provided, returns the commit ref.
* If provided, returns the commit ref.
* Needed to render the commit component column.
* Needed to render the commit component column.
*
*
* Matche
d `url` prop sent in the API to `path
` prop needed
* Matche
s `path` prop sent in the API to `ref_url
` prop needed
* in the commit component.
* in the commit component.
*
*
* @returns {Object|Undefined}
* @returns {Object|Undefined}
...
@@ -119,8 +119,8 @@ require('./commit');
...
@@ -119,8 +119,8 @@ require('./commit');
commitRef() {
commitRef() {
if (this.pipeline.ref) {
if (this.pipeline.ref) {
return Object.keys(this.pipeline.ref).reduce((accumulator, prop) => {
return Object.keys(this.pipeline.ref).reduce((accumulator, prop) => {
if (prop === '
url
') {
if (prop === '
path
') {
accumulator.
path
= this.pipeline.ref[prop];
accumulator.
ref_url
= this.pipeline.ref[prop];
} else {
} else {
accumulator[prop] = this.pipeline.ref[prop];
accumulator[prop] = this.pipeline.ref[prop];
}
}
...
...
changelogs/unreleased/27880-pipelines-table-not-showing-commit-branch.yml
0 → 100644
View file @
38bcc1e0
---
title
:
Fixes Pipelines table is not showing branch name for commit
merge_request
:
author
:
spec/features/projects/pipelines/pipelines_spec.rb
View file @
38bcc1e0
...
@@ -35,6 +35,10 @@ describe 'Pipelines', :feature, :js do
...
@@ -35,6 +35,10 @@ describe 'Pipelines', :feature, :js do
it
'contains pipeline commit short SHA'
do
it
'contains pipeline commit short SHA'
do
expect
(
page
).
to
have_content
(
pipeline
.
short_sha
)
expect
(
page
).
to
have_content
(
pipeline
.
short_sha
)
end
end
it
'contains branch name'
do
expect
(
page
).
to
have_content
(
pipeline
.
ref
)
end
end
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment