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
6c9027f8
Unverified
Commit
6c9027f8
authored
May 25, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed up after bootstrap upgrade
parent
65c16758
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
27 additions
and
17 deletions
+27
-17
stage.vue
app/assets/javascripts/ide/components/jobs/stage.vue
+12
-9
right.vue
app/assets/javascripts/ide/components/panes/right.vue
+6
-1
list.vue
app/assets/javascripts/ide/components/pipelines/list.vue
+2
-2
tabs.js
app/assets/javascripts/vue_shared/components/tabs/tabs.js
+1
-1
mutations_spec.js
...avascripts/ide/stores/modules/pipelines/mutations_spec.js
+6
-4
No files found.
app/assets/javascripts/ide/components/jobs/stage.vue
View file @
6c9027f8
...
...
@@ -54,10 +54,13 @@ export default {
<
template
>
<div
class=
"
panel panel-default
prepend-top-default"
class=
"
card
prepend-top-default"
>
<div
class=
"panel-heading"
class=
"card-header"
:class=
"
{
'border-bottom-0': stage.isCollapsed
}"
@click="toggleStageCollapsed(stage.id)"
>
<ci-icon
...
...
@@ -75,9 +78,9 @@ export default {
</strong>
<div
v-if=
"!stage.isLoading || stage.jobs.length"
class=
"append-right-8"
class=
"append-right-8
prepend-left-4
"
>
<span
class=
"badge"
>
<span
class=
"badge
badge-pill
"
>
{{
jobsCount
}}
</span>
</div>
...
...
@@ -87,7 +90,7 @@ export default {
/>
</div>
<div
class=
"
panel
-body"
class=
"
card
-body"
v-show=
"!stage.isCollapsed"
>
<loading-icon
...
...
@@ -105,20 +108,20 @@ export default {
</template>
<
style
scoped
>
.
panel-heading
{
.
card-header
{
display
:
flex
;
cursor
:
pointer
;
}
.
panel-heading
.ci-status-icon
{
.
card-header
.ci-status-icon
{
display
:
flex
;
align-items
:
center
;
}
.
panel-heading
.pull-right
{
.
card-header
.pull-right
{
margin
:
auto
0
auto
auto
;
}
.
panel
-body
{
.
card
-body
{
padding
:
0
;
}
...
...
app/assets/javascripts/ide/components/panes/right.vue
View file @
6c9027f8
...
...
@@ -18,6 +18,11 @@ export default {
},
methods
:
{
...
mapActions
([
'setRightPane'
]),
clickTab
(
e
,
view
)
{
e
.
target
.
blur
();
this
.
setRightPane
(
view
);
},
},
rightSidebarViews
,
};
...
...
@@ -46,7 +51,7 @@ export default {
active: rightPane === $options.rightSidebarViews.pipelines
}"
type="button"
@click="
setRightPane(
$options.rightSidebarViews.pipelines)"
@click="
clickTab($event,
$options.rightSidebarViews.pipelines)"
>
<icon
:size=
"16"
...
...
app/assets/javascripts/ide/components/pipelines/list.vue
View file @
6c9027f8
...
...
@@ -69,7 +69,7 @@ export default {
Jobs
<span
v-if=
"jobsCount"
class=
"badge"
class=
"badge
badge-pill
"
>
{{
jobsCount
}}
</span>
...
...
@@ -86,7 +86,7 @@ export default {
Failed Jobs
<span
v-if=
"failedJobsCount"
class=
"badge"
class=
"badge
badge-pill
"
>
{{
failedJobsCount
}}
</span>
...
...
app/assets/javascripts/vue_shared/components/tabs/tabs.js
View file @
6c9027f8
...
...
@@ -26,12 +26,12 @@ export default {
'li'
,
{
key
:
i
,
class
:
tab
.
localActive
?
'active'
:
null
,
},
[
h
(
'a'
,
{
class
:
tab
.
localActive
?
'active'
:
null
,
attrs
:
{
href
:
'#'
,
},
...
...
spec/javascripts/ide/stores/modules/pipelines/mutations_spec.js
View file @
6c9027f8
...
...
@@ -65,17 +65,19 @@ describe('IDE pipelines mutations', () => {
expect
(
mockedState
.
stages
.
length
).
toBe
(
2
);
expect
(
mockedState
.
stages
).
toEqual
([
{
...
stages
[
0
],
dropdownPath
:
stages
[
0
].
dropdownPath
,
id
:
0
,
dropdownPath
:
stages
[
0
].
dropdown_path
,
name
:
stages
[
0
].
name
,
status
:
stages
[
0
].
status
,
isCollapsed
:
false
,
isLoading
:
false
,
jobs
:
[],
},
{
...
stages
[
1
],
dropdownPath
:
stages
[
1
].
dropdownPath
,
id
:
1
,
dropdownPath
:
stages
[
1
].
dropdown_path
,
name
:
stages
[
1
].
name
,
status
:
stages
[
1
].
status
,
isCollapsed
:
false
,
isLoading
:
false
,
jobs
:
[],
...
...
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