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

feat(mr update): add --squash-before-merge parameter #856

Merged
merged 2 commits into from
Oct 12, 2021
Merged

feat(mr update): add --squash-before-merge parameter #856

merged 2 commits into from
Oct 12, 2021

Conversation

pataar
Copy link
Contributor

@pataar pataar commented Oct 3, 2021

Description

This adds the --squash-before-merge parameter to mr update. Which allows the merge request the be squashed by default.

A point of discussion: I thought it would be practical that this would toggle the option to squash. Not sure what your preference has, @profclems. If you'd like it differently, please let me know!

See: docs.gitlab.com/ee/api/merge_requests.html#update-mr

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 #856 (4170736) into trunk (2e4c14b) will increase coverage by 0.00%.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##            trunk     #856   +/-   ##
=======================================
  Coverage   59.31%   59.31%           
=======================================
  Files          93       93           
  Lines        7383     7384    +1     
=======================================
+ Hits         4379     4380    +1     
  Misses       2619     2619           
  Partials      385      385           
Impacted Files Coverage Δ
commands/ci/ci.go 100.00% <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 2e4c14b...4170736. Read the comment docs.

@pataar pataar changed the title feat(mr update): add --squash parameter feat(mr update): add --squash-before-merge parameter Oct 4, 2021
@pataar pataar changed the title feat(mr update): add --squash-before-merge parameter feat(mr update): add --squash-on-merge parameter Oct 4, 2021
@profclems profclems changed the title feat(mr update): add --squash-on-merge parameter feat(mr update): add --squash-before-merge parameter Oct 4, 2021
@pataar
Copy link
Contributor Author

pataar commented Oct 8, 2021

Fixed the pipelines!

@profclems profclems merged commit db39e2a into profclems:trunk Oct 12, 2021
@pataar pataar deleted the patch-4 branch October 13, 2021 02:11
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