Previously, this used `Array#-`, which would remove all queries that matches the
query text in the original set.
However, sometimes we have a problem with parameterised queries, where the query
text is identical both times, so we'd run a query N times instead of once, and
it would be hidden from the output.
Replace the logic to only remove a given query N times from the actual log,
where N is the number of times it appears in the expected log.
Include X-Content-Type-Options (XCTO) header into API responses
See merge request gitlab/gitlabhq!2211
(cherry picked from commit 6c818e77f2)
e087e075 Include X-Content-Type-Options (XCTO) header into API responses
Prior to this MR there were two GitHub related importers:
* Github::Import: the main importer used for GitHub projects
* Gitlab::GithubImport: importer that's somewhat confusingly used for
importing Gitea projects (apparently they have a compatible API)
This MR renames the Gitea importer to Gitlab::LegacyGithubImport and
introduces a new GitHub importer in the Gitlab::GithubImport namespace.
This new GitHub importer uses Sidekiq for importing multiple resources
in parallel, though it also has the ability to import data sequentially
should this be necessary.
The new code is spread across the following directories:
* lib/gitlab/github_import: this directory contains most of the importer
code such as the classes used for importing resources.
* app/workers/gitlab/github_import: this directory contains the Sidekiq
workers, most of which simply use the code from the directory above.
* app/workers/concerns/gitlab/github_import: this directory provides a
few modules that are included in every GitHub importer worker.
== Stages
The import work is divided into separate stages, with each stage
importing a specific set of data. Stages will schedule the work that
needs to be performed, followed by scheduling a job for the
"AdvanceStageWorker" worker. This worker will periodically check if all
work is completed and schedule the next stage if this is the case. If
work is not yet completed this worker will reschedule itself.
Using this approach we don't have to block threads by calling `sleep()`,
as doing so for large projects could block the thread from doing any
work for many hours.
== Retrying Work
Workers will reschedule themselves whenever necessary. For example,
hitting the GitHub API's rate limit will result in jobs rescheduling
themselves. These jobs are not processed until the rate limit has been
reset.
== User Lookups
Part of the importing process involves looking up user details in the
GitHub API so we can map them to GitLab users. The old importer used
an in-memory cache, but this obviously doesn't work when the work is
spread across different threads.
The new importer uses a Redis cache and makes sure we only perform
API/database calls if absolutely necessary. Frequently used keys are
refreshed, and lookup misses are also cached; removing the need for
performing API/database calls if we know we don't have the data we're
looking for.
== Performance & Models
The new importer in various places uses raw INSERT statements (as
generated by `Gitlab::Database.bulk_insert`) instead of using Rails
models. This allows us to bypass any validations and callbacks,
drastically reducing the number of SQL queries and Gitaly RPC calls
necessary to import projects.
To ensure the code produces valid data the corresponding tests check if
the produced rows are valid according to the model validation rules.
* master: (33 commits)
Ignore SQL CACHE hits in Sherlock
Fix SQL timings for the performance bar
Find the LFS-objects for a fork within a the fork network
Remove bottom-border from last responsive table row
Add system hooks user_rename and group_rename
Unlink a project from a fork network when it's source was deleted.
Make sure the settings page renders when root of a fork is deleted
Remove Peek's original keyboard shortcut (numpad 0, keycode 96)
Add application setting to Auto DevOps docs
Enable MergeableSelector in scss-lint (for !14567)
Enable MergeableSelector in scss-lint (for !14055)
Enable MergeableSelector in scss-lint (for !14062)
Enable MergeableSelector in scss-lint (for !14398)
Enable MergeableSelector in scss-lint (for !13480)
Enable MergeableSelector in scss-lint (for !13473)
Enable MergeableSelector in scss-lint (for !13600)
Enable MergeableSelector in scss-lint
Resolve ""To do" should be "Todos" on Todos list page"
Avoid regenerating the ref path for the environment
Remove white space at bottom of issue boards
...
* master: (109 commits)
Remove Filesystem check metrics that use too much CPU to handle requests
Set merge_request_diff_id on MR when creating
Add a column linking an MR to its diff
Remove useless closeReopenReport specs
Clarify external artifacts only working when GitLab pages is enabled
Send SIGSTP before SIGTERM to actually give Sidekiq jobs 30s to finish when the memory killer kicks in
Remove an exception from the git user default SSH config check
Geo route whitelisting is too optimistic
Update .nvmrc to current stable (v9.0.0)
Update documentation
Address Douwe's feedback
Refactor responsive table styles to support nested error block
Add changelog items
Update specs for sudo behavior
Move RSS and incoming email tokens from User Settings > Accounts to User Settings > Access Tokens
Remove user authentication_token column
Migrate user private tokens to personal access tokens
Add sudo API scope
Consistently use PersonalAccessToken instead of PersonalToken
Remove User#private_token
...
Rémy Coutable
James Edwards-Jones
Markus Koller
Jacob Vosmaer (GitLab)
Clement Ho
Sean McGivern
Stan Hu
Eric Eastwood
Jacopo
Kim "BKC" Carlbäcker
Douwe Maan
Yorick Peterse
Bob Van Landuyt
Annabel Dunstone Gray
Shinya Maeda
Kamil Trzciński
Grzegorz Bizon
Mike Greiling
Alessio Caiazza
Sean McGivern
Douwe Maan
Ahmad Sherif