Skip to content
Snippets Groups Projects

Allow setting required approval count on MR

Merged Allow setting required approval count on MR
314-add-merge-approval-field-in-mr-form into master
Merged username-removed-443319 requested to merge 314-add-merge-approval-field-in-mr-form into master

Closes #314 (closed).

@rspeicher can you take a look at this please? Still to do:

  • Controller specs.
  • Feature specs.

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
app/controllers/projects/merge_requests_controller.rb
136 136
137 137 def create
138 138 @target_branches ||= []
139 @merge_request = MergeRequests::CreateService.new(project, current_user, merge_request_params).execute
139 create_params = merge_request_params
140
141 if create_params[:approvals_before_merge].to_i <= project.approvals_before_merge
142 create_params.delete(:approvals_before_merge)
143 end
  • username-removed-443319
    username-removed-443319 @smcgivern ·
    Author Contributor

    This is because I thought a UI for 'you can set this to > this value, but you can also leave it unset' would be pretty awkward (as opposed to the API, where that pattern is more natural). I'm not super thrilled with it though :-/

  • username-removed-443319 Marked the task Controller specs. as completed

    Marked the task Controller specs. as completed

  • username-removed-443319 Added 475 commits:

    Added 475 commits:

    • 685af85c...8055ca04 - 474 commits from branch master
    • bab17d37 - Allow setting required approval count on MR
  • username-removed-443319 Marked the task Feature specs. as completed

    Marked the task Feature specs. as completed

  • Robert Speicher
    Robert Speicher @rspeicher started a thread on the diff
    • CHANGELOG-EE
    13 13
    14 14 v 8.8.5
    15 15 - Make sure OAuth routes that we generate for Geo matches with the ones in Rails routes !444
    16 - Allow overriding the number of approvers for a merge request
  • Robert Speicher
    Robert Speicher @rspeicher started a thread on the diff
    • app/controllers/projects/merge_requests_controller.rb
    136 136
    137 137 def create
    138 138 @target_branches ||= []
    139 @merge_request = MergeRequests::CreateService.new(project, current_user, merge_request_params).execute
    139 create_params = merge_request_params
  • Robert Speicher
  • Robert Speicher
  • Robert Speicher
  • Robert Speicher
  • Robert Speicher Reassigned to @smcgivern

    Reassigned to @smcgivern

  • username-removed-443319 Added 1 commit:

    Added 1 commit:

    • 99c47707 - fixup! Allow setting required approval count on MR
  • username-removed-443319
    username-removed-443319 @smcgivern ·
    Author Contributor

    @rspeicher fixed. If you're happy I'll squash :thumbsup:

  • username-removed-443319 Reassigned to @rspeicher

    Reassigned to @rspeicher

  • Robert Speicher Added 13 commits:

    Added 13 commits:

    • 99c47707...77b42d92 - 12 commits from branch master
    • e6a7f1ba - Allow setting required approval count on MR
  • Robert Speicher
    Robert Speicher @rspeicher ·
    Owner

    @smcgivern: Thanks, squashed it myself so we can get it into this RC.

  • Robert Speicher Enabled an automatic merge when the build for e6a7f1ba succeeds

    Enabled an automatic merge when the build for e6a7f1ba succeeds

  • Robert Speicher Status changed to merged

    Status changed to merged

  • Robert Speicher mentioned in commit ca2adb08

    mentioned in commit ca2adb08

  • Robert Speicher Removed ~149424 label

    Removed ~149424 label

  • Robert Speicher
    Robert Speicher @rspeicher ·
    Owner

    Picked into 8-9-stable-ee, will be in RC8.

  • Robert Speicher mentioned in commit be89baa6

    mentioned in commit be89baa6

  • username-removed-443319 mentioned in merge request !496 (merged)

    mentioned in merge request !496 (merged)

  • Douwe Maan mentioned in commit 9525c1d6

    mentioned in commit 9525c1d6

  • Douwe Maan mentioned in commit 73eb5e4f

    mentioned in commit 73eb5e4f

  • Stan Hu mentioned in issue #793 (closed)

    mentioned in issue #793 (closed)

  • Robert Speicher Mentioned in commit be89baa6

    Mentioned in commit be89baa6

  • Douwe Maan Mentioned in commit 73eb5e4f

    Mentioned in commit 73eb5e4f

  • Robert Speicher Mentioned in commit ca2adb08

    Mentioned in commit ca2adb08

  • Valery Sizov mentioned in commit 20a31f42

    mentioned in commit 20a31f42

    • Please register or sign in to reply