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
385c0779
Commit
385c0779
authored
May 22, 2018
by
George Tsiolis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename merge request widget author component
parent
592b8d71
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
8 deletions
+13
-8
mr_widget_author.vue
.../vue_merge_request_widget/components/mr_widget_author.vue
+1
-1
mr_widget_author_time.vue
...merge_request_widget/components/mr_widget_author_time.vue
+2
-2
mr_widget_merge_when_pipeline_succeeds.vue
...ponents/states/mr_widget_merge_when_pipeline_succeeds.vue
+2
-2
rename-merge-request-widget-author-component.yml
...released/rename-merge-request-widget-author-component.yml
+5
-0
mr_widget_author_spec.js
...scripts/vue_mr_widget/components/mr_widget_author_spec.js
+3
-3
No files found.
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_author.vue
View file @
385c0779
...
...
@@ -2,7 +2,7 @@
import
tooltip
from
'../../vue_shared/directives/tooltip'
;
export
default
{
name
:
'M
R
WidgetAuthor'
,
name
:
'M
r
WidgetAuthor'
,
directives
:
{
tooltip
,
},
...
...
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_author_time.vue
View file @
385c0779
<
script
>
import
m
rWidgetAuthor
from
'./mr_widget_author.vue'
;
import
M
rWidgetAuthor
from
'./mr_widget_author.vue'
;
export
default
{
name
:
'MRWidgetAuthorTime'
,
components
:
{
m
rWidgetAuthor
,
M
rWidgetAuthor
,
},
props
:
{
actionText
:
{
...
...
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.vue
View file @
385c0779
<
script
>
import
Flash
from
'../../../flash'
;
import
statusIcon
from
'../mr_widget_status_icon.vue'
;
import
m
rWidgetAuthor
from
'../../components/mr_widget_author.vue'
;
import
M
rWidgetAuthor
from
'../../components/mr_widget_author.vue'
;
import
eventHub
from
'../../event_hub'
;
export
default
{
name
:
'MRWidgetMergeWhenPipelineSucceeds'
,
components
:
{
m
rWidgetAuthor
,
M
rWidgetAuthor
,
statusIcon
,
},
props
:
{
...
...
changelogs/unreleased/rename-merge-request-widget-author-component.yml
0 → 100644
View file @
385c0779
---
title
:
Rename merge request widget author component
merge_request
:
19079
author
:
George Tsiolis
type
:
changed
spec/javascripts/vue_mr_widget/components/mr_widget_author_spec.js
View file @
385c0779
import
Vue
from
'vue'
;
import
authorComponent
from
'~/vue_merge_request_widget/components/mr_widget_author.vue'
;
import
MrWidgetAuthor
from
'~/vue_merge_request_widget/components/mr_widget_author.vue'
;
import
mountComponent
from
'spec/helpers/vue_mount_component_helper'
;
describe
(
'M
R
WidgetAuthor'
,
()
=>
{
describe
(
'M
r
WidgetAuthor'
,
()
=>
{
let
vm
;
beforeEach
(()
=>
{
const
Component
=
Vue
.
extend
(
authorComponent
);
const
Component
=
Vue
.
extend
(
MrWidgetAuthor
);
vm
=
mountComponent
(
Component
,
{
author
:
{
...
...
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