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
Léo-Paul Géneau
gitlab-ce
Commits
4cdf4efd
Commit
4cdf4efd
authored
Oct 02, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '34371-ca-vue' into 'master'
Remove global components See merge request gitlab-org/gitlab-ce!14579
parents
664cd27f
b4d6bbf4
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
55 additions
and
35 deletions
+55
-35
app/assets/javascripts/cycle_analytics/components/stage_code_component.vue
...ripts/cycle_analytics/components/stage_code_component.vue
+4
-0
app/assets/javascripts/cycle_analytics/components/stage_component.vue
...avascripts/cycle_analytics/components/stage_component.vue
+4
-0
app/assets/javascripts/cycle_analytics/components/stage_plan_component.vue
...ripts/cycle_analytics/components/stage_plan_component.vue
+19
-15
app/assets/javascripts/cycle_analytics/components/stage_review_component.vue
...pts/cycle_analytics/components/stage_review_component.vue
+4
-0
app/assets/javascripts/cycle_analytics/components/stage_staging_component.vue
...ts/cycle_analytics/components/stage_staging_component.vue
+4
-0
app/assets/javascripts/cycle_analytics/components/stage_test_component.vue
...ripts/cycle_analytics/components/stage_test_component.vue
+20
-14
app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js
...ets/javascripts/cycle_analytics/cycle_analytics_bundle.js
+0
-6
No files found.
app/assets/javascripts/cycle_analytics/components/stage_code_component.vue
View file @
4cdf4efd
<
script
>
import
userAvatarImage
from
'
../../vue_shared/components/user_avatar/user_avatar_image.vue
'
;
import
limitWarning
from
'
./limit_warning_component.vue
'
;
import
totalTime
from
'
./total_time_component.vue
'
;
export
default
{
props
:
{
...
...
@@ -8,6 +10,8 @@
},
components
:
{
userAvatarImage
,
limitWarning
,
totalTime
,
},
};
</
script
>
...
...
app/assets/javascripts/cycle_analytics/components/stage_component.vue
View file @
4cdf4efd
<
script
>
import
userAvatarImage
from
'
../../vue_shared/components/user_avatar/user_avatar_image.vue
'
;
import
limitWarning
from
'
./limit_warning_component.vue
'
;
import
totalTime
from
'
./total_time_component.vue
'
;
export
default
{
props
:
{
...
...
@@ -8,6 +10,8 @@
},
components
:
{
userAvatarImage
,
limitWarning
,
totalTime
,
},
};
</
script
>
...
...
app/assets/javascripts/cycle_analytics/components/stage_plan_component.vue
View file @
4cdf4efd
<
script
>
import
userAvatarImage
from
'
../../vue_shared/components/user_avatar/user_avatar_image.vue
'
;
import
iconCommit
from
'
../svg/icon_commit.svg
'
;
import
userAvatarImage
from
'
../../vue_shared/components/user_avatar/user_avatar_image.vue
'
;
import
iconCommit
from
'
../svg/icon_commit.svg
'
;
import
limitWarning
from
'
./limit_warning_component.vue
'
;
import
totalTime
from
'
./total_time_component.vue
'
;
export
default
{
props
:
{
items
:
Array
,
stage
:
Object
,
},
components
:
{
userAvatarImage
,
},
computed
:
{
iconCommit
()
{
return
iconCommit
;
export
default
{
props
:
{
items
:
Array
,
stage
:
Object
,
},
},
};
components
:
{
userAvatarImage
,
totalTime
,
limitWarning
,
},
computed
:
{
iconCommit
()
{
return
iconCommit
;
},
},
};
</
script
>
<
template
>
<div>
...
...
app/assets/javascripts/cycle_analytics/components/stage_review_component.vue
View file @
4cdf4efd
<
script
>
import
userAvatarImage
from
'
../../vue_shared/components/user_avatar/user_avatar_image.vue
'
;
import
limitWarning
from
'
./limit_warning_component.vue
'
;
import
totalTime
from
'
./total_time_component.vue
'
;
export
default
{
props
:
{
...
...
@@ -8,6 +10,8 @@
},
components
:
{
userAvatarImage
,
totalTime
,
limitWarning
,
},
};
</
script
>
...
...
app/assets/javascripts/cycle_analytics/components/stage_staging_component.vue
View file @
4cdf4efd
<
script
>
import
userAvatarImage
from
'
../../vue_shared/components/user_avatar/user_avatar_image.vue
'
;
import
iconBranch
from
'
../svg/icon_branch.svg
'
;
import
limitWarning
from
'
./limit_warning_component.vue
'
;
import
totalTime
from
'
./total_time_component.vue
'
;
export
default
{
props
:
{
...
...
@@ -9,6 +11,8 @@
},
components
:
{
userAvatarImage
,
totalTime
,
limitWarning
,
},
computed
:
{
iconBranch
()
{
...
...
app/assets/javascripts/cycle_analytics/components/stage_test_component.vue
View file @
4cdf4efd
<
script
>
import
iconBuildStatus
from
'
../svg/icon_build_status.svg
'
;
import
iconBranch
from
'
../svg/icon_branch.svg
'
;
import
iconBuildStatus
from
'
../svg/icon_build_status.svg
'
;
import
iconBranch
from
'
../svg/icon_branch.svg
'
;
import
limitWarning
from
'
./limit_warning_component.vue
'
;
import
totalTime
from
'
./total_time_component.vue
'
;
export
default
{
props
:
{
items
:
Array
,
stage
:
Object
,
},
computed
:
{
iconBuildStatus
()
{
return
iconBuildStatus
;
export
default
{
props
:
{
items
:
Array
,
stage
:
Object
,
},
iconBranch
()
{
return
iconBranch
;
components
:
{
totalTime
,
limitWarning
,
},
},
};
computed
:
{
iconBuildStatus
()
{
return
iconBuildStatus
;
},
iconBranch
()
{
return
iconBranch
;
},
},
};
</
script
>
<
template
>
<div>
...
...
app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js
View file @
4cdf4efd
...
...
@@ -3,14 +3,12 @@
import
Vue
from
'
vue
'
;
import
Cookies
from
'
js-cookie
'
;
import
Translate
from
'
../vue_shared/translate
'
;
import
limitWarningComponent
from
'
./components/limit_warning_component.vue
'
;
import
stageCodeComponent
from
'
./components/stage_code_component.vue
'
;
import
stagePlanComponent
from
'
./components/stage_plan_component.vue
'
;
import
stageComponent
from
'
./components/stage_component.vue
'
;
import
stageReviewComponent
from
'
./components/stage_review_component.vue
'
;
import
stageStagingComponent
from
'
./components/stage_staging_component.vue
'
;
import
stageTestComponent
from
'
./components/stage_test_component.vue
'
;
import
totalTime
from
'
./components/total_time_component.vue
'
;
import
CycleAnalyticsService
from
'
./cycle_analytics_service
'
;
import
CycleAnalyticsStore
from
'
./cycle_analytics_store
'
;
...
...
@@ -133,8 +131,4 @@ $(() => {
},
},
});
// Register global components
Vue
.
component
(
'
limit-warning
'
,
limitWarningComponent
);
Vue
.
component
(
'
total-time
'
,
totalTime
);
});
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