Skip to content
Snippets Groups Projects
  1. Feb 14, 2018
  2. Feb 13, 2018
  3. Feb 07, 2018
  4. Feb 02, 2018
  5. Feb 01, 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 07, 2017
  14. 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
  15. 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
  16. Nov 25, 2017
  17. Nov 24, 2017
  18. Nov 23, 2017
    • Felipe Artur's avatar
      Fix WIP system note not being created · 5c2c471a
      Felipe Artur authored
      5c2c471a
    • Sean McGivern's avatar
      Use latest_merge_request_diff association · 991bf24e
      Sean McGivern authored
      Compared to the merge_request_diff association:
      
      1. It's simpler to query. The query uses a foreign key to the
         merge_request_diffs table, so no ordering is necessary.
      2. It's faster for preloading. The merge_request_diff association has to load
         every diff for the MRs in the set, then discard all but the most recent for
         each. This association means that Rails can just query for N diffs from N
         MRs.
      3. It's more complicated to update. This is a bidirectional foreign key, so we
         need to update two tables when adding a diff record. This also means we need
         to handle this as a special case when importing a GitLab project.
      
      There is some juggling with this association in the merge request model:
      
      * `MergeRequest#latest_merge_request_diff` is _always_ the latest diff.
      * `MergeRequest#merge_request_diff` reuses
        `MergeRequest#latest_merge_request_diff` unless:
          * Arguments are passed. These are typically to force-reload the association.
          * It doesn't exist. That means we might be trying to implicitly create a
            diff. This only seems to happen in specs.
          * The association is already loaded. This is important for the reasons
            explained in the comment, which I'll reiterate here: if we a) load a
            non-latest diff, then b) get its `merge_request`, then c) get that MR's
            `merge_request_diff`, we should get the diff we loaded in c), even though
            that's not the latest diff.
      
      Basically, `MergeRequest#merge_request_diff` is the latest diff in most cases,
      but not quite all.
      991bf24e
  19. Nov 20, 2017
  20. Nov 16, 2017
  21. Nov 15, 2017
  22. Nov 10, 2017
  23. Nov 02, 2017
  24. Oct 30, 2017
  25. Oct 27, 2017
  26. Oct 16, 2017
    • Sean McGivern's avatar
      Don't create build failed todo when build is retried · 62478864
      Sean McGivern authored
      When a build is retried automatically, we close any open todos. However, we do
      that _before_ creating a new build failed todo.
      
      To solve this, we check if the build is retried before creating the todo. We
      also ensure that the build _instance_ has the correct attribute set, without
      needing to reload it from the database.
      62478864
  27. Oct 13, 2017
  28. Oct 12, 2017
  29. Oct 11, 2017
  30. Oct 09, 2017
  31. Sep 28, 2017
Loading