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
e2869421
Commit
e2869421
authored
May 08, 2018
by
George Tsiolis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move SquashBeforeMerge vue component
parent
c8bfb3e4
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
4 deletions
+9
-4
mr_widget_squash_before_merge.vue
...idget/components/states/mr_widget_squash_before_merge.vue
+3
-3
dependencies.js
...sets/javascripts/vue_merge_request_widget/dependencies.js
+1
-1
refactor-move-squash-before-merge-vue-component.yml
...eased/refactor-move-squash-before-merge-vue-component.yml
+5
-0
No files found.
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.
js
→
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.
vue
View file @
e2869421
...
...
@@ -10,6 +10,6 @@ In EE, the configuration extends this object to add a functioning squash-before-
button.
*/
export
default
{
template
:
''
,
};
<
script
>
export
default
{};
</
script
>
app/assets/javascripts/vue_merge_request_widget/dependencies.js
View file @
e2869421
...
...
@@ -41,7 +41,7 @@ export { default as MRWidgetService } from './services/mr_widget_service';
export
{
default
as
eventHub
}
from
'./event_hub'
;
export
{
default
as
getStateKey
}
from
'./stores/get_state_key'
;
export
{
default
as
stateMaps
}
from
'./stores/state_maps'
;
export
{
default
as
SquashBeforeMerge
}
from
'./components/states/mr_widget_squash_before_merge'
;
export
{
default
as
SquashBeforeMerge
}
from
'./components/states/mr_widget_squash_before_merge
.vue
'
;
export
{
default
as
notify
}
from
'../lib/utils/notify'
;
export
{
default
as
SourceBranchRemovalStatus
}
from
'./components/source_branch_removal_status.vue'
;
...
...
changelogs/unreleased/refactor-move-squash-before-merge-vue-component.yml
0 → 100644
View file @
e2869421
---
title
:
Move SquashBeforeMerge vue component
merge_request
:
18813
author
:
George Tsiolis
type
:
performance
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