- 03 Dec, 2017 10 commits
-
-
Kamil Trzcinski authored
-
Kamil Trzcinski authored
-
Kamil Trzcinski authored
-
Kamil Trzcinski authored
-
Kamil Trzcinski authored
-
Kamil Trzcinski authored
-
Kamil Trzcinski authored
-
Shinya Maeda authored
-
Kamil Trzcinski authored
-
Kamil Trzcinski authored
-
- 01 Dec, 2017 1 commit
-
-
Matija Čupić authored
-
- 30 Nov, 2017 1 commit
-
-
Matija Čupić authored
-
- 29 Nov, 2017 2 commits
-
-
Matija Čupić authored
-
Valery Sizov authored
-
- 28 Nov, 2017 8 commits
-
-
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.
-
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.
-
Matija Čupić authored
-
Matija Čupić authored
-
Filipa Lacerda authored
- Moves toggle button to a shared location - Adds tests for toggle button - Transforms Clusters class into function - Improves UX
-
Shinya Maeda authored
- 27 Nov, 2017 7 commits
-
-
Filipa Lacerda authored
Finishes tabs & table Updates e2e tests
-
Matija Čupić authored
-
Matija Čupić authored
-
haseeb authored
-
Matija Čupić authored
-
Matija Čupić authored
-
Matija Čupić authored
-
- 25 Nov, 2017 2 commits
-
-
George Andrinopoulos authored
-
Vitaliy @blackst0ne Klachkov authored
-
- 24 Nov, 2017 3 commits
-
-
Filipa Lacerda authored
Add tests Update empty state [ci skip]
-
Filipa Lacerda authored
-
James Edwards-Jones authored
Previously these were duplicated so they could be different for push/merge, but this was no longer necessary after https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11232
-
- 23 Nov, 2017 4 commits
-
-
Markus Koller authored
-
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.
-
Filipa Lacerda authored
-
Jarka Kadlecova authored
-
- 22 Nov, 2017 1 commit
-
-
Nick Thomas authored
-
- 21 Nov, 2017 1 commit
-
-
Zeger-Jan van de Weg authored
After installing a new gem, batch-loader, a construct can be used to queue data to be fetched in bulk. The gem was also introduced in both gitlab-org/gitlab-ce!14680 and gitlab-org/gitlab-ce!14846, but those mrs are not merged yet. For the generation of diffs, both the old blob and the new blob need to be loaded. This for every file in the diff, too. Now we collect all these so we do 1 fetch. Three `.allow_n_plus_1_calls` have been removed, which I expect to be valid, but this needs to be confirmed by a full CI run. Possibly closes: - https://gitlab.com/gitlab-org/gitlab-ce/issues/37445 - https://gitlab.com/gitlab-org/gitlab-ce/issues/37599 - https://gitlab.com/gitlab-org/gitlab-ce/issues/37431
-