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
a5f17beb
Commit
a5f17beb
authored
Mar 23, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use Ci instead of CI.
Use kebab case instead of camelCase in templates props
parent
cfe2e6b7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
12 deletions
+12
-12
app/assets/javascripts/vue_pipelines_index/components/nav_controls.js
...avascripts/vue_pipelines_index/components/nav_controls.js
+2
-2
app/assets/javascripts/vue_pipelines_index/pipelines.js
app/assets/javascripts/vue_pipelines_index/pipelines.js
+5
-5
spec/javascripts/vue_pipelines_index/nav_controls_spec.js
spec/javascripts/vue_pipelines_index/nav_controls_spec.js
+5
-5
No files found.
app/assets/javascripts/vue_pipelines_index/components/nav_controls.js
View file @
a5f17beb
...
...
@@ -5,7 +5,7 @@ export default {
required
:
true
,
},
hasC
I
Enabled
:
{
hasC
i
Enabled
:
{
type
:
Boolean
,
required
:
true
,
},
...
...
@@ -36,7 +36,7 @@ export default {
</a>
<a
v-if="!hasC
I
Enabled"
v-if="!hasC
i
Enabled"
:href="helpPagePath"
class="btn btn-info">
Get started with Pipelines
...
...
app/assets/javascripts/vue_pipelines_index/pipelines.js
View file @
a5f17beb
...
...
@@ -106,7 +106,7 @@ export default {
this
.
state
.
pageInfo
.
total
>
this
.
state
.
pageInfo
.
perPage
;
},
hasC
I
Enabled
()
{
hasC
i
Enabled
()
{
return
this
.
hasCi
!==
undefined
;
},
...
...
@@ -190,11 +190,11 @@ export default {
:paths="paths" />
<navigation-controls
:new
PipelineP
ath="newPipelinePath"
:has
CIEnabled="hasCI
Enabled"
:help
PageP
ath="helpPagePath"
:new
-pipeline-p
ath="newPipelinePath"
:has
-ci-enabled="hasCi
Enabled"
:help
-page-p
ath="helpPagePath"
:ciLintPath="ciLintPath"
:can
CreateP
ipeline="canCreatePipelineParsed " />
:can
-create-p
ipeline="canCreatePipelineParsed " />
</div>
<div class="content-list pipelines">
...
...
spec/javascripts/vue_pipelines_index/nav_controls_spec.js
View file @
a5f17beb
...
...
@@ -11,7 +11,7 @@ describe('Pipelines Nav Controls', () => {
it
(
'
should render link to create a new pipeline
'
,
()
=>
{
const
mockData
=
{
newPipelinePath
:
'
foo
'
,
hasC
I
Enabled
:
true
,
hasC
i
Enabled
:
true
,
helpPagePath
:
'
foo
'
,
ciLintPath
:
'
foo
'
,
canCreatePipeline
:
true
,
...
...
@@ -28,7 +28,7 @@ describe('Pipelines Nav Controls', () => {
it
(
'
should not render link to create pipeline if no permission is provided
'
,
()
=>
{
const
mockData
=
{
newPipelinePath
:
'
foo
'
,
hasC
I
Enabled
:
true
,
hasC
i
Enabled
:
true
,
helpPagePath
:
'
foo
'
,
ciLintPath
:
'
foo
'
,
canCreatePipeline
:
false
,
...
...
@@ -44,7 +44,7 @@ describe('Pipelines Nav Controls', () => {
it
(
'
should render link for CI lint
'
,
()
=>
{
const
mockData
=
{
newPipelinePath
:
'
foo
'
,
hasC
I
Enabled
:
true
,
hasC
i
Enabled
:
true
,
helpPagePath
:
'
foo
'
,
ciLintPath
:
'
foo
'
,
canCreatePipeline
:
true
,
...
...
@@ -61,7 +61,7 @@ describe('Pipelines Nav Controls', () => {
it
(
'
should render link to help page when CI is not enabled
'
,
()
=>
{
const
mockData
=
{
newPipelinePath
:
'
foo
'
,
hasC
I
Enabled
:
false
,
hasC
i
Enabled
:
false
,
helpPagePath
:
'
foo
'
,
ciLintPath
:
'
foo
'
,
canCreatePipeline
:
true
,
...
...
@@ -78,7 +78,7 @@ describe('Pipelines Nav Controls', () => {
it
(
'
should not render link to help page when CI is enabled
'
,
()
=>
{
const
mockData
=
{
newPipelinePath
:
'
foo
'
,
hasC
I
Enabled
:
true
,
hasC
i
Enabled
:
true
,
helpPagePath
:
'
foo
'
,
ciLintPath
:
'
foo
'
,
canCreatePipeline
:
true
,
...
...
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