Skip to content
This repository has been archived by the owner on Nov 22, 2022. It is now read-only.

feat(mr create): add --squash-before-merge parameter #855

Merged
merged 2 commits into from
Oct 4, 2021
Merged

feat(mr create): add --squash-before-merge parameter #855

merged 2 commits into from
Oct 4, 2021

Conversation

pataar
Copy link
Contributor

@pataar pataar commented Oct 3, 2021

Description
This adds the --squash-before-merge parameter to mr create. Which allows the merge request the be squashed by default. See: https://docs.gitlab.com/ee/api/merge_requests.html#create-mr

Related Issue
How Has This Been Tested?
I've used the binary built from this fork against a private Gitlab instance. Worked as expected.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation
  • Chore (Related to CI or Packaging to platforms)

@codecov
Copy link

codecov bot commented Oct 3, 2021

Codecov Report

Merging #855 (977e830) into trunk (5d497fd) will decrease coverage by 0.04%.
The diff coverage is 33.33%.

Impacted file tree graph

@@            Coverage Diff             @@
##            trunk     #855      +/-   ##
==========================================
- Coverage   59.35%   59.31%   -0.05%     
==========================================
  Files          93       93              
  Lines        7374     7383       +9     
==========================================
+ Hits         4377     4379       +2     
- Misses       2614     2619       +5     
- Partials      383      385       +2     
Impacted Files Coverage Δ
commands/mr/create/mr_create.go 33.24% <33.33%> (-0.26%) ⬇️
commands/root.go 77.50% <0.00%> (ø)
commands/api/pagination.go 95.31% <0.00%> (ø)
commands/project/clone/repo_clone.go 63.57% <0.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5d497fd...977e830. Read the comment docs.

commands/mr/create/mr_create.go Outdated Show resolved Hide resolved
@pataar pataar changed the title feat(mr create): add --squash parameter feat(mr create): add --squash-before-merge parameter Oct 4, 2021
@pataar
Copy link
Contributor Author

pataar commented Oct 4, 2021

@profclems Changed it to --squash-on-merge along with #856

@pataar pataar changed the title feat(mr create): add --squash-before-merge parameter feat(mr create): add --squash-on-merge parameter Oct 4, 2021
@profclems profclems changed the title feat(mr create): add --squash-on-merge parameter feat(mr create): add --squash-before-merge parameter Oct 4, 2021
@profclems profclems merged commit 3d9f97c into profclems:trunk Oct 4, 2021
@pataar pataar deleted the patch-3 branch October 4, 2021 08:47
This pull request was closed.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants