Skip to content
Snippets Groups Projects
  1. Nov 11, 2015
  2. Nov 10, 2015
  3. Nov 09, 2015
    • Robert Speicher's avatar
      Merge branch 'fix-incoming-email-default' into 'master' · 8fab8377
      Robert Speicher authored
      Fix incoming email config defaults
      
      Fixes #3377.
      
      See merge request !1766
      8fab8377
    • Robert Speicher's avatar
      Update CHANGELOG · 3436ce0d
      Robert Speicher authored
      [ci skip]
      3436ce0d
    • Robert Speicher's avatar
      Update CHANGELOG · ad75d7fe
      Robert Speicher authored
      [ci skip]
      ad75d7fe
    • Douwe Maan's avatar
      Merge branch 'fix-commits-manual-merge' into 'master' · fb3c685f
      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
      fb3c685f
  4. Nov 04, 2015
  5. Oct 31, 2015
    • Douwe Maan's avatar
      Merge branch 'fix-issue-3138' into 'master' · 38039e3a
      Douwe Maan authored
      Force update refs/merge-requests/X/head upon a push to the source branch of a merge request
      
      If a user rebases and does a force push, GitLab would not update the `refs/merge-requests/X/head` link. Using the -f flag forces this to happen.
      
      Closes #3138
      
      See merge request !1683
      38039e3a
  6. Oct 27, 2015
  7. Oct 26, 2015
  8. Oct 23, 2015
  9. Oct 22, 2015
  10. Oct 21, 2015
  11. Oct 20, 2015
  12. Oct 19, 2015
  13. Oct 17, 2015
Loading