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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
cc4434a4
Commit
cc4434a4
authored
Nov 24, 2016
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix after review
Adds require statement
parent
da8c2e69
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
13 deletions
+20
-13
app/assets/javascripts/dispatcher.js.es6
app/assets/javascripts/dispatcher.js.es6
+11
-1
app/assets/javascripts/pipelines.js.es6
app/assets/javascripts/pipelines.js.es6
+8
-1
app/views/projects/pipelines/_with_tabs.html.haml
app/views/projects/pipelines/_with_tabs.html.haml
+0
-10
app/views/projects/pipelines/show.html.haml
app/views/projects/pipelines/show.html.haml
+1
-1
No files found.
app/assets/javascripts/dispatcher.js.es6
View file @
cc4434a4
...
@@ -135,8 +135,18 @@
...
@@ -135,8 +135,18 @@
new TreeView();
new TreeView();
}
}
break;
break;
case 'projects:pipelines:builds':
case 'projects:pipelines:show':
case 'projects:pipelines:show':
new gl.Pipelines();
const controllerAction = document.querySelector('.js-pipeline-container').dataset.controllerAction;
new gl.Pipelines({
initTabs: true,
tabsOptions: {
action: controllerAction,
defaultAction: 'pipelines',
parentEl: '.pipelines-tabs',
},
});
break;
break;
case 'groups:activity':
case 'groups:activity':
new gl.Activities();
new gl.Activities();
...
...
app/assets/javascripts/pipelines.js.es6
View file @
cc4434a4
//= require lib/utils/bootstrap_linked_tabs
/* eslint-disable */
/* eslint-disable */
((global) => {
((global) => {
class Pipelines {
class Pipelines {
constructor() {
constructor(options) {
if (options.initTabs && options.tabsOptions) {
new window.gl.LinkedTabs(options.tabsOptions);
}
this.addMarginToBuildColumns();
this.addMarginToBuildColumns();
}
}
...
...
app/views/projects/pipelines/_with_tabs.html.haml
View file @
cc4434a4
...
@@ -52,13 +52,3 @@
...
@@ -52,13 +52,3 @@
%th
%th
-
pipeline
.
statuses
.
relevant
.
stages
.
each
do
|
stage
|
-
pipeline
.
statuses
.
relevant
.
stages
.
each
do
|
stage
|
=
render
'projects/commit/ci_stage'
,
stage:
stage
,
statuses:
pipeline
.
statuses
.
relevant
.
where
(
stage:
stage
)
=
render
'projects/commit/ci_stage'
,
stage:
stage
,
statuses:
pipeline
.
statuses
.
relevant
.
where
(
stage:
stage
)
:javascript
var
pipelines_tab
;
pipelines_tab
=
new
window
.
gl
.
LinkedTabs
({
action
:
"
#{
controller
.
action_name
}
"
,
defaultAction
:
'
pipelines
'
,
parentEl
:
'
.pipelines-tabs
'
});
app/views/projects/pipelines/show.html.haml
View file @
cc4434a4
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
-
page_title
"Pipeline"
-
page_title
"Pipeline"
=
render
"projects/pipelines/head"
=
render
"projects/pipelines/head"
%div
{
class:
container_class
}
%div
.js-pipeline-container
{
class:
container_class
,
data:
{
controller_action:
"#{controller.action_name}"
}
}
-
if
@commit
-
if
@commit
=
render
"projects/pipelines/info"
=
render
"projects/pipelines/info"
...
...
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