1. 04 8月, 2016 2 次提交
  2. 03 8月, 2016 5 次提交
  3. 02 8月, 2016 8 次提交
  4. 01 8月, 2016 10 次提交
  5. 30 7月, 2016 3 次提交
    • S
      Improve diff performance by eliminating redundant checks for text blobs · 48ff40a0
      Stan Hu 提交于
      On a merge request with over 1000 changed files, there were redundant
      calls to blob_text_viewable?, which incurred about 7% of the time.
      
      Improves #14775
      48ff40a0
    • Z
      Use Grape DSL for environment endpoints · 1b72256f
      Z.J. van de Weg 提交于
      Also a couple of minor edits for this branch are included
      1b72256f
    • S
      Properly abort a merge when merge conflicts occur · 60529e02
      Stan Hu 提交于
      If somehow a user attempted to accept a merge request that had
      conflicts (e.g. the "Accept Merge Request" button or the MR itself was
      not updated), `MergeService` did not properly detect that a conflict
      occurred. It would assume that the MR went through without any issues
      and close the MR as though everything was fine. This could cause
      data loss if the source branch were removed.
      
      Closes #20425
      60529e02
  6. 29 7月, 2016 12 次提交