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
aa5d83d4
Commit
aa5d83d4
authored
Sep 21, 2018
by
George Tsiolis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename squash before merge vue component
parent
a2936404
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
18 deletions
+8
-18
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.js
...widget/components/states/mr_widget_squash_before_merge.js
+0
-15
app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
...merge_request_widget/components/states/ready_to_merge.vue
+1
-1
app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue
..._request_widget/components/states/squash_before_merge.vue
+0
-0
app/assets/javascripts/vue_merge_request_widget/dependencies.js
...sets/javascripts/vue_merge_request_widget/dependencies.js
+1
-1
changelogs/unreleased/rename-squash-before-merge-vue-component.yml
...s/unreleased/rename-squash-before-merge-vue-component.yml
+5
-0
qa/qa/page/merge_request/show.rb
qa/qa/page/merge_request/show.rb
+1
-1
No files found.
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.js
deleted
100644 → 0
View file @
a2936404
/*
The squash-before-merge button is EE only, but it's located right in the middle
of the readyToMerge state component template.
If we didn't declare this component in CE, we'd need to maintain a separate copy
of the readyToMergeState template in EE, which is pretty big and likely to change.
Instead, in CE, we declare the component, but it's hidden and is configured to do nothing.
In EE, the configuration extends this object to add a functioning squash-before-merge
button.
*/
export
default
{
template
:
''
,
};
app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
View file @
aa5d83d4
...
@@ -6,7 +6,7 @@ import MergeRequest from '../../../merge_request';
...
@@ -6,7 +6,7 @@ import MergeRequest from '../../../merge_request';
import
Flash
from
'
../../../flash
'
;
import
Flash
from
'
../../../flash
'
;
import
statusIcon
from
'
../mr_widget_status_icon.vue
'
;
import
statusIcon
from
'
../mr_widget_status_icon.vue
'
;
import
eventHub
from
'
../../event_hub
'
;
import
eventHub
from
'
../../event_hub
'
;
import
SquashBeforeMerge
from
'
./
mr_widget_
squash_before_merge.vue
'
;
import
SquashBeforeMerge
from
'
./squash_before_merge.vue
'
;
export
default
{
export
default
{
name
:
'
ReadyToMerge
'
,
name
:
'
ReadyToMerge
'
,
...
...
app/assets/javascripts/vue_merge_request_widget/components/states/
mr_widget_
squash_before_merge.vue
→
app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue
View file @
aa5d83d4
File moved
app/assets/javascripts/vue_merge_request_widget/dependencies.js
View file @
aa5d83d4
...
@@ -40,7 +40,7 @@ export { default as MRWidgetService } from './services/mr_widget_service';
...
@@ -40,7 +40,7 @@ export { default as MRWidgetService } from './services/mr_widget_service';
export
{
default
as
eventHub
}
from
'
./event_hub
'
;
export
{
default
as
eventHub
}
from
'
./event_hub
'
;
export
{
default
as
getStateKey
}
from
'
./stores/get_state_key
'
;
export
{
default
as
getStateKey
}
from
'
./stores/get_state_key
'
;
export
{
default
as
stateMaps
}
from
'
./stores/state_maps
'
;
export
{
default
as
stateMaps
}
from
'
./stores/state_maps
'
;
export
{
default
as
SquashBeforeMerge
}
from
'
./components/states/
mr_widget_
squash_before_merge.vue
'
;
export
{
default
as
SquashBeforeMerge
}
from
'
./components/states/squash_before_merge.vue
'
;
export
{
default
as
notify
}
from
'
../lib/utils/notify
'
;
export
{
default
as
notify
}
from
'
../lib/utils/notify
'
;
export
{
default
as
SourceBranchRemovalStatus
}
from
'
./components/source_branch_removal_status.vue
'
;
export
{
default
as
SourceBranchRemovalStatus
}
from
'
./components/source_branch_removal_status.vue
'
;
...
...
changelogs/unreleased/rename-squash-before-merge-vue-component.yml
0 → 100644
View file @
aa5d83d4
---
title
:
Rename squash before merge vue component
merge_request
:
21851
author
:
George Tsiolis
type
:
other
qa/qa/page/merge_request/show.rb
View file @
aa5d83d4
...
@@ -19,7 +19,7 @@ module QA
...
@@ -19,7 +19,7 @@ module QA
element
:no_fast_forward_message
,
'Fast-forward merge is not possible'
element
:no_fast_forward_message
,
'Fast-forward merge is not possible'
end
end
view
'app/assets/javascripts/vue_merge_request_widget/components/states/
mr_widget_
squash_before_merge.vue'
do
view
'app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue'
do
element
:squash_checkbox
element
:squash_checkbox
end
end
...
...
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