Skip to content
GitLab
Next
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
Primary navigation
Search or go to…
Project
GitLab FOSS
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Privacy statement
Keyboard shortcuts
?
What's new
4
Snippets
Groups
Projects
Show more breadcrumbs
GitLab.org
GitLab FOSS
Merge requests
!21851
Rename squash before merge vue component
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Rename squash before merge vue component
gtsiolis/gitlab-foss:rename-squash-before-merge-vue-component
into
master
Overview
6
Commits
1
Pipelines
2
Changes
6
Merged
George Tsiolis
requested to merge
gtsiolis/gitlab-foss:rename-squash-before-merge-vue-component
into
master
6 years ago
Overview
6
Commits
1
Pipelines
2
Changes
6
Expand
What does this MR do?
Renames squash before merge vue component.
Deletes unnecessary relevant
.js
file.
What are the relevant issue numbers?
This is a follow-up from
!18956 (merged)
.
Does this MR meet the acceptance criteria?
Changelog entry
added, if necessary
Conforms to the
code review guidelines
Conforms to the
merge request performance guidelines
Conforms to the
style guides
Edited
6 years ago
by
George Tsiolis
0
0
Merge request reports
Compare
master
version 1
f279cfd6
6 years ago
master (base)
and
latest version
latest version
aa5d83d4
1 commit,
6 years ago
version 1
f279cfd6
1 commit,
6 years ago
6 files
+
8
−
18
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
6
Search (e.g. *.vue) (Ctrl+P)
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.js deleted
100644 → 0
+
0
−
15
Options
/*
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
:
''
,
};
Loading