An error occurred fetching the project authors.
  1. 26 Jul, 2019 1 commit
  2. 05 Jul, 2019 1 commit
  3. 24 Jan, 2019 2 commits
  4. 01 Nov, 2018 1 commit
  5. 28 Nov, 2017 1 commit
    • Sean McGivern's avatar
      Ensure MRs always use branch refs for comparison · 3c6a4d63
      Sean McGivern authored
      If a merge request was created with a branch name that also matched a tag name,
      we'd generate a comparison to or from the tag respectively, rather than the
      branch. Merging would still use the branch, of course.
      
      To avoid this, ensure that when we get the branch heads, we prepend the
      reference prefix for branches, which will ensure that we generate the correct
      comparison.
      3c6a4d63
  6. 07 Oct, 2017 1 commit
  7. 15 Sep, 2017 2 commits
  8. 27 Jul, 2017 1 commit
  9. 26 Jul, 2017 1 commit
  10. 23 May, 2017 1 commit
  11. 10 May, 2017 2 commits
  12. 24 Apr, 2017 1 commit
  13. 20 Apr, 2017 2 commits
  14. 10 Feb, 2017 1 commit
  15. 03 Feb, 2017 1 commit
  16. 02 Feb, 2017 1 commit
    • Lin Jen-Shin's avatar
      Merge remote-tracking branch 'ce/fix-git-hooks-when-creating-file' into master-ce · 9c4f82ab
      Lin Jen-Shin authored
      * ce/fix-git-hooks-when-creating-file: (78 commits)
        Make sure different project gets a merge request
        Try to check if branch diverged explicitly
        We don't care about the return value now
        Make GitHooksService#execute return block value
        Use commit rather than branch, and rename to avoid confusion
        @tree_edit_project is no longer used
        Fix renaming
        Rename from base to start because base could mean merge base
        Detect if we really want a new merge request properly
        Properly fix the edge case!
        Rename source to base to avoid confusion from MR
        Don't set invalid @mr_source_branch when create_merge_request?
        Prefer leading dots over trailing dots
        Fix for initial commit and remove unneeded args
        Just trust set_commit_variables to set everything!
        Prefer leading dots over trailing dots
        Merge request terms are reversed for GitOperationService
        I think I am really confused, should be @tree_edit_project
        Remove tag with git hooks
        Introduce Repository#with_repo_branch_commit
        ...
      9c4f82ab
  17. 01 Feb, 2017 2 commits
    • Sean McGivern's avatar
      Allow squashing MR into a single commit · 43f9f083
      Sean McGivern authored
      1. Clone the repo to a temp directory.
      2. Apply the MR as a patch.
      3. Use `git commit -C` to copy the commit metadata from the HEAD commit
         of the source branch, and manually add the merging user as the
         committer.
      4. Push back to a randomly-generated branch name.
      5. Immediately delete that branch, so that it does not appear in the
         branch list, trigger CI builds, etc.
      6. Return the SHA of the squashed commit we've just pushed to the
         MergeService.
      7. In the MergeService, allow an arbitrary source to be used, and set
         that to either the source branch (if there is no squashing) or the
         squashed SHA.
      43f9f083
    • Sean McGivern's avatar
      Change Repository#merge interface for squashing · 28b462c7
      Sean McGivern authored
      When squashing, we may want to merge a different commit than the MR's
      HEAD commit into the target branch. This interface matches the existing
      `Repository#ff_merge` method, and allows us to pick an arbitrary commit
      to merge.
      28b462c7
  18. 25 Jan, 2017 2 commits
  19. 06 Jan, 2017 1 commit
  20. 18 Jul, 2016 2 commits
  21. 13 Jul, 2016 2 commits
  22. 06 Jul, 2016 1 commit