BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
66e7f126
Commit
66e7f126
authored
Dec 22, 2016
by
Fatih Acet
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '25961-spec-list-blank' into 'master'
Fix dropdown content non appearing in MR view Closes #25961 See merge request !8255
parents
96822b69
fab2f071
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
5 deletions
+12
-5
dispatcher.js.es6
app/assets/javascripts/dispatcher.js.es6
+0
-5
merge_request_tabs.js.es6
app/assets/javascripts/merge_request_tabs.js.es6
+4
-0
pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+4
-0
25961-spec-list-blank.yml
changelogs/unreleased/25961-spec-list-blank.yml
+4
-0
No files found.
app/assets/javascripts/dispatcher.js.es6
View file @
66e7f126
...
...
@@ -140,11 +140,6 @@
case 'projects:merge_requests:commits':
new MergedButtons();
break;
case 'projects:merge_requests:pipelines':
new gl.MiniPipelineGraph({
container: '.js-pipeline-table',
});
break;
case "projects:merge_requests:diffs":
new gl.Diff();
new ZenMode();
...
...
app/assets/javascripts/merge_request_tabs.js.es6
View file @
66e7f126
...
...
@@ -259,6 +259,10 @@
gl.utils.localTimeAgo($('.js-timeago', '#pipelines'));
this.pipelinesLoaded = true;
this.scrollToElement('#pipelines');
new gl.MiniPipelineGraph({
container: '.js-pipeline-table',
});
},
});
}
...
...
app/assets/stylesheets/pages/pipelines.scss
View file @
66e7f126
...
...
@@ -52,6 +52,10 @@
}
}
.content-list.pipelines
.table-holder
{
min-height
:
300px
;
}
.pipeline-holder
{
width
:
100%
;
overflow
:
auto
;
...
...
changelogs/unreleased/25961-spec-list-blank.yml
0 → 100644
View file @
66e7f126
---
title
:
Fix Pipeline builds list blank on MR
merge_request
:
8255
author
:
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