Skip to content
Snippets Groups Projects
  1. Jan 24, 2018
  2. Jan 23, 2018
  3. Jan 12, 2018
  4. Jan 11, 2018
  5. Jan 08, 2018
  6. 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
  7. Dec 14, 2017
  8. Dec 13, 2017
  9. Dec 12, 2017
    • Zeger-Jan van de Weg's avatar
      Use memoization for commits on diffs · 3ab026b7
      Zeger-Jan van de Weg authored
      The Gitaly CommitService is being hammered by n + 1 calls, mostly when
      finding commits. This leads to this gRPC being turned of on production:
      https://gitlab.com/gitlab-org/gitaly/issues/514#note_48991378
      
      Hunting down where it came from, most of them were due to
      MergeRequest#show. To prove this, I set a script to request the
      MergeRequest#show page 50 times. The GDK was being scraped by
      Prometheus, where we have metrics on controller#action and their Gitaly
      calls performed. On both occations I've restarted the full GDK so all
      caches had to be rebuild.
      
      Current master, 806a68a8, needed 435 requests
      After this commit, 154 requests
      Unverified
      3ab026b7
  10. Dec 07, 2017
  11. Dec 06, 2017
    • Yorick Peterse's avatar
      Throttle the number of UPDATEs triggered by touch · 856447cc
      Yorick Peterse authored
      This throttles the number of UPDATE queries that can be triggered by
      calling "touch" on a Note, Issue, or MergeRequest. For Note objects we
      also take care of updating the associated "noteable" relation in a
      smarter way than Rails does by default.
      Verified
      856447cc
  12. Dec 05, 2017
  13. Nov 30, 2017
  14. 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
    • Sean McGivern's avatar
      Remove serialised diff and commit columns · 4ebbfe5d
      Sean McGivern authored
      The st_commits and st_diffs columns on merge_request_diffs historically held the
      YAML-serialised data for a merge request diff, in a variety of formats.
      
      Since 9.5, these have been migrated in the background to two new tables:
      merge_request_diff_commits and merge_request_diff_files. That has the advantage
      that we can actually query the data (for instance, to find out how many commits
      we've stored), and that it can't be in a variety of formats, but must match the
      new schema.
      
      This is the final step of that journey, where we drop those columns and remove
      all references to them. This is a breaking change to the importer, because we
      can no longer import diffs created in the old format, and we cannot guarantee
      the export will be in the new format unless it was generated after this commit.
      4ebbfe5d
  15. Nov 25, 2017
  16. 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
  17. Nov 13, 2017
  18. Nov 11, 2017
  19. Nov 10, 2017
  20. Nov 08, 2017
  21. Nov 07, 2017
  22. Nov 06, 2017
  23. Nov 03, 2017
  24. Nov 02, 2017
  25. Oct 30, 2017
  26. Oct 27, 2017
    • Oswaldo Ferreir's avatar
    • Sean McGivern's avatar
      Avoid hitting statement timeout finding MR pipelines · ba9b4c4d
      Sean McGivern authored
      For MRs with many thousands of commits, `SELECT DISTINCT(sha)` will be very
      slow.
      
      What we can't do to fix this:
      
      1. Add an index. Postgres won't use it for DISTINCT without a lot of ceremony.
      2. Do the `uniq` in Ruby. That can still be very slow with hundreds of
         thousands of commits.
      3. Use a subquery. We haven't removed the `st_commits` column yet, but we will
         soon.
      
      Until 3 is available to us, we can just do 2, but also add a limit clause. There
      is no ordering, so this may return different results, but our goal with these
      MRs is just to get them to load, so it's not a huge deal.
      ba9b4c4d
  27. Oct 13, 2017
  28. Oct 11, 2017
Loading