1. 01 Aug, 2016 32 commits
  2. 31 Jul, 2016 5 commits
  3. 30 Jul, 2016 3 commits
    • Robert Speicher's avatar
      Merge branch 'clarify-deletion-message' into 'master' · e299504b
      Robert Speicher authored
      Clarify which project is deleted to avoid alarm
      
      Some users were alarmed when navigating after deleting  a project. Add the project name to avoid cause for alarm.
      
      Closes #13654 
      
      See merge request !5574
      e299504b
    • Robert Speicher's avatar
      Merge branch 'reject-merge-conflicts' into 'master' · e12c1850
      Robert Speicher authored
      Properly abort a merge when merge conflicts occur
      
      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
      
      See merge request !5569
      e12c1850
    • Yorick Peterse's avatar
      Merge branch 'remove-redundant-blob-text-calls' into 'master' · 37881a8e
      Yorick Peterse authored
      Improve diff performance by eliminating redundant checks for text blobs
      
      See merge request !5575
      37881a8e