1. 09 Nov, 2015 2 commits
    • Douwe Maan's avatar
      Merge branch 'fix-commits-manual-merge' into 'master' · 03b12ee5
      Douwe Maan authored
      Fix bug where manually merged branches in a MR would end up with an empty diff
      
      This bug manifested in 8.1 with the refactoring of `RefreshService`. Here's what happens:
      
      1. User create a new branch `foo`.
      2. User creates a merge request for `foo`.
      3. User merges `foo` into `master` by hand.
      4. `RefreshService` reloads the merge request. Since `master` is equivalent to `foo`, this results in an empty diff.
      5. `RefreshService` then closes the MR.
      
      This wasn't an issue when you use the normal "Accept Merge Request" flow because the act of clicking the button closes the merge request, so step 4 never happens.
      
      Closes #3314
      
      See merge request !1758
      03b12ee5
    • Kamil Trzciński's avatar
      Merge branch 'shared_runners' into 'master' · 9f055126
      Kamil Trzciński authored
      Enable shared runners for all new projects
      
      This adds Admin Setting option to enable shared runners for all new projects, and by default it is set to true.
      
      /cc @dzaporozhets @sytses 
      
      
      See merge request !1738
      9f055126
  2. 08 Nov, 2015 1 commit
  3. 07 Nov, 2015 7 commits
  4. 06 Nov, 2015 10 commits
  5. 05 Nov, 2015 16 commits
  6. 04 Nov, 2015 4 commits