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
bb9e7a3f
Commit
bb9e7a3f
authored
Feb 16, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CE port of changes made to the pipeline bundle in EE - Fixes typos and adds i18n
Backport common class name for the tab content Backport more changes
parent
dc835fcc
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
23 additions
and
16 deletions
+23
-16
graph_component.vue
...avascripts/pipelines/components/graph/graph_component.vue
+1
-1
pipeline_details_bundle.js
app/assets/javascripts/pipelines/pipeline_details_bundle.js
+7
-3
pipeline_details_mediator.js
...assets/javascripts/pipelines/pipeline_details_mediator.js
+2
-1
pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+6
-3
_with_tabs.html.haml
app/views/projects/pipelines/_with_tabs.html.haml
+6
-6
pipeline_details_mediator_spec.js
spec/javascripts/pipelines/pipeline_details_mediator_spec.js
+1
-1
pipeline_store_spec.js
spec/javascripts/pipelines/pipeline_store_spec.js
+0
-1
No files found.
app/assets/javascripts/pipelines/components/graph/graph_component.vue
View file @
bb9e7a3f
...
...
@@ -52,7 +52,7 @@
</
script
>
<
template
>
<div
class=
"build-content middle-block js-pipeline-graph"
>
<div
class=
"pipeline-visualization pipeline-graph"
>
<div
class=
"pipeline-visualization pipeline-graph
pipeline-tab-content
"
>
<div
class=
"text-center"
>
<loading-icon
v-if=
"isLoading"
...
...
app/assets/javascripts/pipelines/pipeline_details_bundle.js
View file @
bb9e7a3f
import
Vue
from
'vue'
;
import
Flash
from
'../flash'
;
import
PipelinesMediator
from
'./pipeline_details_mediatior'
;
import
Flash
from
'~/flash'
;
import
Translate
from
'~/vue_shared/translate'
;
import
{
__
}
from
'~/locale'
;
import
PipelinesMediator
from
'./pipeline_details_mediator'
;
import
pipelineGraph
from
'./components/graph/graph_component.vue'
;
import
pipelineHeader
from
'./components/header_component.vue'
;
import
eventHub
from
'./event_hub'
;
Vue
.
use
(
Translate
);
document
.
addEventListener
(
'DOMContentLoaded'
,
()
=>
{
const
dataset
=
document
.
querySelector
(
'.js-pipeline-details-vue'
).
dataset
;
...
...
@@ -54,7 +58,7 @@ document.addEventListener('DOMContentLoaded', () => {
postAction
(
action
)
{
this
.
mediator
.
service
.
postAction
(
action
.
path
)
.
then
(()
=>
this
.
mediator
.
refreshPipeline
())
.
catch
(()
=>
new
Flash
(
'An error occurred while making the request.'
));
.
catch
(()
=>
Flash
(
__
(
'An error occurred while making the request.'
)
));
},
},
render
(
createElement
)
{
...
...
app/assets/javascripts/pipelines/pipeline_details_mediat
i
or.js
→
app/assets/javascripts/pipelines/pipeline_details_mediator.js
View file @
bb9e7a3f
import
Visibility
from
'visibilityjs'
;
import
Flash
from
'../flash'
;
import
Poll
from
'../lib/utils/poll'
;
import
{
__
}
from
'../locale'
;
import
PipelineStore
from
'./stores/pipeline_store'
;
import
PipelineService
from
'./services/pipeline_service'
;
...
...
@@ -47,7 +48,7 @@ export default class pipelinesMediator {
errorCallback
()
{
this
.
state
.
isLoading
=
false
;
return
new
Flash
(
'An error occurred while fetching the pipeline.'
);
Flash
(
__
(
'An error occurred while fetching the pipeline.'
)
);
}
refreshPipeline
()
{
...
...
app/assets/stylesheets/pages/pipelines.scss
View file @
bb9e7a3f
...
...
@@ -320,14 +320,17 @@
}
}
// Pipeline graph
.pipeline-graph
{
.pipeline-tab-content
{
width
:
100%
;
background-color
:
$gray-light
;
padding
:
$gl-padding
;
overflow
:
auto
;
}
// Pipeline graph
.pipeline-graph
{
white-space
:
nowrap
;
transition
:
max-height
0
.3s
,
padding
0
.3s
;
overflow
:
auto
;
.stage-column-list
,
.builds-container
>
ul
{
...
...
app/views/projects/pipelines/_with_tabs.html.haml
View file @
bb9e7a3f
...
...
@@ -3,16 +3,16 @@
.tabs-holder
%ul
.pipelines-tabs.nav-links.no-top.no-bottom.mobile-separator
%li
.js-pipeline-tab-link
=
link_to
project_pipeline_path
(
@project
,
@pipeline
),
data:
{
target:
'
div
#js-tab-pipeline'
,
action:
'pipelines'
,
toggle:
'tab'
},
class:
'pipeline-tab'
do
Pipeline
=
link_to
project_pipeline_path
(
@project
,
@pipeline
),
data:
{
target:
'#js-tab-pipeline'
,
action:
'pipelines'
,
toggle:
'tab'
},
class:
'pipeline-tab'
do
=
_
(
"Pipeline"
)
%li
.js-builds-tab-link
=
link_to
builds_project_pipeline_path
(
@project
,
@pipeline
),
data:
{
target:
'div
#js-tab-builds'
,
action:
'builds'
,
toggle:
'tab'
},
class:
'builds-tab'
do
Jobs
=
link_to
builds_project_pipeline_path
(
@project
,
@pipeline
),
data:
{
target:
'
#js-tab-builds'
,
action:
'builds'
,
toggle:
'tab'
},
class:
'builds-tab'
do
=
_
(
"Jobs"
)
%span
.badge.js-builds-counter
=
pipeline
.
total_size
-
if
failed_builds
.
present?
%li
.js-failures-tab-link
=
link_to
failures_project_pipeline_path
(
@project
,
@pipeline
),
data:
{
target:
'div
#js-tab-failures'
,
action:
'failures'
,
toggle:
'tab'
},
class:
'failures-tab'
do
Failed Jobs
=
link_to
failures_project_pipeline_path
(
@project
,
@pipeline
),
data:
{
target:
'
#js-tab-failures'
,
action:
'failures'
,
toggle:
'tab'
},
class:
'failures-tab'
do
=
_
(
"Failed Jobs"
)
%span
.badge.js-failures-counter
=
failed_builds
.
count
.tab-content
...
...
spec/javascripts/pipelines/pipeline_details_mediator_spec.js
View file @
bb9e7a3f
import
_
from
'underscore'
;
import
Vue
from
'vue'
;
import
PipelineMediator
from
'~/pipelines/pipeline_details_mediat
i
or'
;
import
PipelineMediator
from
'~/pipelines/pipeline_details_mediator'
;
describe
(
'PipelineMdediator'
,
()
=>
{
let
mediator
;
...
...
spec/javascripts/pipelines/pipeline_store_spec.js
View file @
bb9e7a3f
...
...
@@ -8,7 +8,6 @@ describe('Pipeline Store', () => {
});
it
(
'should set defaults'
,
()
=>
{
expect
(
store
.
state
).
toEqual
({
pipeline
:
{}
});
expect
(
store
.
state
.
pipeline
).
toEqual
({});
});
...
...
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