Skip to content
Snippets Groups Projects
  1. Feb 14, 2018
  2. Feb 13, 2018
  3. Feb 02, 2018
  4. Feb 01, 2018
  5. Jan 31, 2018
  6. Jan 29, 2018
  7. Jan 17, 2018
  8. Jan 10, 2018
  9. Jan 09, 2018
  10. Jan 05, 2018
    • Jan Provaznik's avatar
      Backport 'Rebase' feature from EE to CE · 27a75ea1
      Jan Provaznik authored
      When a project uses fast-forward merging strategy user has
      to rebase MRs to target branch before it can be merged.
      Now user can do rebase in UI by clicking 'Rebase' button
      instead of doing rebase locally.
      
      This feature was already present in EE, this is only backport
      of the feature to CE. Couple of changes:
      * removed rebase license check
      * renamed migration (changed timestamp)
      
      Closes #40301
      27a75ea1
  11. Jan 02, 2018
  12. Dec 27, 2017
  13. Dec 22, 2017
  14. Dec 14, 2017
    • Alejandro Rodríguez's avatar
      Simplify conflict resolver interface · 240945f8
      Alejandro Rodríguez authored
      This does two things:
      - Pass commit oids instead of `Gitlab::Git::Commit`s. We only need the
      former.
      - Depend on only the target repository for conflict listing. For
      conflict resolution, treat one repository as a remote one so that we can
      implement it as such in Gitaly.
      240945f8
    • Zeger-Jan van de Weg's avatar
      Clear caches before updating MR diffs · 8ad41255
      Zeger-Jan van de Weg authored
      The hook ordering influenced the diffs being generated as these used
      values from before the update due to the memoization still being in
      place. This commit reorders them and tests against this behaviour.
      Unverified
      8ad41255
  15. Dec 13, 2017
    • Sean McGivern's avatar
      Execute quick actions when creating MR from issue · b1e3cb24
      Sean McGivern authored
      In CE, this does nothing - the `MergeRequests::BuildService` will, at the time
      of writing, never return a description for this case.
      
      In EE, a project can have a default MR template, which will be returned by the
      service. Previously we were only using the description passed in the params,
      ignoring any already set on the object. Now we fall back to the one set on the
      object if there was none in the params, allowing quick actions to be executed
      from default MR templates when creating an MR from an issue.
      b1e3cb24
  16. Dec 05, 2017
    • Jarka Kadlecova's avatar
      fe673b49
    • Jan Provaznik's avatar
      Create merge request from email · 8cce7073
      Jan Provaznik authored
      * new merge request can be created by sending an email to the specific
      email address (similar to creating issues by email)
      * for the first iteration, source branch must be specified in the mail
      subject, other merge request parameters can not be set yet
      * user should enable "Receive notifications about your own activity" in
      user settings to receive a notification about created merge request
      
      Part of #32878
      8cce7073
  17. Nov 28, 2017
    • 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
  18. Nov 25, 2017
  19. Nov 24, 2017
  20. Nov 15, 2017
  21. Nov 10, 2017
  22. Oct 27, 2017
  23. Oct 13, 2017
  24. Oct 11, 2017
  25. Oct 10, 2017
  26. Oct 09, 2017
  27. Oct 07, 2017
  28. Sep 28, 2017
Loading