1. 16 Mar, 2018 1 commit
  2. 15 Mar, 2018 1 commit
  3. 07 Mar, 2018 2 commits
  4. 06 Mar, 2018 1 commit
  5. 08 Feb, 2018 1 commit
  6. 30 Jan, 2018 1 commit
  7. 29 Jan, 2018 1 commit
  8. 25 Jan, 2018 1 commit
    • Nick Thomas's avatar
      Look at notes created just before merge when deciding if an MR can be reverted · d5a7ab226edf
      Nick Thomas authored
      On MySQL, at least, `Note#created_at` doesn't seem to store fractional seconds,
      while `MergeRequest::Metrics#merged_at` does. This breaks the optimization
      assumption that we only need to search for notes created *after* the MR has
      been merged.
      
      Unsynchronized system clocks also make this a dangerous assumption to make.
      
      Adding a minute of leeway still optimizes away most notes, but allows both
      cases to be handled more gracefully. If the system clocks are more than a
      minute out, we'll still be broken, of course.
      d5a7ab226edf
  9. 24 Jan, 2018 1 commit
  10. 23 Jan, 2018 1 commit
  11. 12 Jan, 2018 2 commits
  12. 11 Jan, 2018 1 commit
  13. 08 Jan, 2018 1 commit
  14. 05 Jan, 2018 1 commit
    • Jan Provaznik's avatar
      Backport 'Rebase' feature from EE to CE · 3b76393647fc
      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
      3b76393647fc
  15. 14 Dec, 2017 1 commit
    • Zeger-Jan van de Weg's avatar
      Clear caches before updating MR diffs · 484622e80519
      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.
      484622e80519
  16. 13 Dec, 2017 2 commits
  17. 12 Dec, 2017 1 commit
    • Zeger-Jan van de Weg's avatar
      Use memoization for commits on diffs · 72ad6dff79a5
      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, 806a68a81f1baee, needed 435 requests
      After this commit, 154 requests
      72ad6dff79a5
  18. 07 Dec, 2017 5 commits
  19. 06 Dec, 2017 1 commit
    • Yorick Peterse's avatar
      Throttle the number of UPDATEs triggered by touch · 4e971949a7d4
      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.
      4e971949a7d4
  20. 05 Dec, 2017 4 commits
  21. 30 Nov, 2017 1 commit
  22. 28 Nov, 2017 2 commits
    • Sean McGivern's avatar
      Ensure MRs always use branch refs for comparison · 0abebd33c0b3
      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.
      0abebd33c0b3
    • Sean McGivern's avatar
      Remove serialised diff and commit columns · 701b9ccc8a4b
      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.
      701b9ccc8a4b
  23. 25 Nov, 2017 1 commit
  24. 23 Nov, 2017 2 commits
    • Felipe Artur's avatar
      Fix WIP system note not being created · c16c0d35a416
      Felipe Artur authored
      c16c0d35a416
    • Sean McGivern's avatar
      Use latest_merge_request_diff association · 8f7f03910539
      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.
      8f7f03910539
  25. 13 Nov, 2017 1 commit
  26. 11 Nov, 2017 1 commit
  27. 10 Nov, 2017 1 commit
    • Sean McGivern's avatar
      Fix another timeout when searching for pipelines · fa263c7e4298
      Sean McGivern authored
      When we consider 'all' pipelines for MRs, we now mean:
      
      1. The last 10,000 commits (unordered).
      2. From the last 100 MR versions (newest first).
      
      This seems to fix the MRs that time out on GitLab.com.
      fa263c7e4298
  28. 08 Nov, 2017 1 commit