1. 17 Apr, 2019 2 commits
    • Michael Kozono's avatar
      Merge branch '10055-approvals-required-max' into 'master' · bf1f8edf
      Michael Kozono authored
      Use max of approvals_before_merge between project and MR at runtime
      
      Closes #10909 and #10055
      
      See merge request gitlab-org/gitlab-ee!10766
      bf1f8edf
    • Mark Chao's avatar
      Use max of approvals_before_merge between project and MR at runtime · 61741b1a
      Mark Chao authored
      Previously, MR#approvals_before_merge is nil when it is <= project
      (from `clamp_approvals_before_merge`).
      This changed in f480d145,
      which would always persist a min value.
      This caused regression that updating MR would fail if project's
      value is increased later on.
      
      The relationship between value being nil and validation can be easily
      overlooked.
      
      Removing validation and taking the max of the two makes logic clearer.
      61741b1a
  2. 16 Apr, 2019 38 commits