1. 09 Nov, 2015 2 commits
    • 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
    • Stan Hu's avatar
      Merge branch 'fix-infinite-redirect' into 'master' · a76d4d27
      Stan Hu authored
      Only redirect to homepage url when its not the root url
      
      It was possible to create an infi redirect when the user set up the
      `home_page_url` to redirect to the main URL of the gitlab instance.
      
      This fix makes sure this redirect is not possible.
      
      Fixes #1020 
      
      /cc @dblessing 
      
      See merge request !1703
      a76d4d27
  2. 06 Nov, 2015 1 commit
  3. 04 Nov, 2015 4 commits
  4. 31 Oct, 2015 1 commit
    • 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
  5. 27 Oct, 2015 3 commits
  6. 26 Oct, 2015 7 commits
  7. 24 Oct, 2015 1 commit
  8. 23 Oct, 2015 7 commits
  9. 22 Oct, 2015 13 commits
  10. 21 Oct, 2015 1 commit