summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Resolve "Include asset_sync gem"Ian Baum2017-12-081-0/+31
|
* Move the circuitbreaker check out in a separate processbvl-circuitbreaker-processBob Van Landuyt2017-12-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Moving the check out of the general requests, makes sure we don't have any slowdown in the regular requests. To keep the process performing this checks small, the check is still performed inside a unicorn. But that is called from a process running on the same server. Because the checks are now done outside normal request, we can have a simpler failure strategy: The check is now performed in the background every `circuitbreaker_check_interval`. Failures are logged in redis. The failures are reset when the check succeeds. Per check we will try `circuitbreaker_access_retries` times within `circuitbreaker_storage_timeout` seconds. When the number of failures exceeds `circuitbreaker_failure_count_threshold`, we will block access to the storage. After `failure_reset_time` of no checks, we will clear the stored failures. This could happen when the process that performs the checks is not running.
* Merge branch 'pawel/update-prometheus_gem_to_highly_optimized_version' into ↵Stan Hu2017-12-071-8/+1
|\ | | | | | | | | | | | | 'master' Update prometheus-client-mmap gem to highly optimized version See merge request gitlab-org/gitlab-ce!15796
| * Update prometheus-client-mmap gem to highly optimized versionPawel Chojnacki2017-12-071-8/+1
| | | | | | | | | | + change string concatenation to help with GC pressure. + fix metric producing incompatible label sets
* | Support uploads for groupsJarka Kadlecova2017-12-071-0/+6
|/
* Merge branch 'feature/custom-text-for-new-projects' into 'master'Rémy Coutable2017-12-051-1/+1
|\ | | | | | | | | | | | | Add custom brand text on new project pages Closes #15265 See merge request gitlab-org/gitlab-ce!15541
| * Add custom brand text on new project pagesMarkus Koller2017-12-041-1/+1
| |
* | Merge branch 'zj-multiple-artifacts' into 'master'Grzegorz Bizon2017-12-051-0/+2
|\ \ | | | | | | | | | | | | Multiple artifacts See merge request gitlab-org/gitlab-ce!14367
| * | Use tmp/test/artifacts for filesKamil Trzcinski2017-12-031-0/+2
| | |
* | | Merge branch 'dm-application-worker' into 'master'Sean McGivern2017-12-052-14/+13
|\ \ \ | | | | | | | | | | | | | | | | Add ApplicationWorker and make every worker include it See merge request gitlab-org/gitlab-ce!15632
| * | | Consistently schedule Sidekiq jobsdm-application-workerDouwe Maan2017-12-051-10/+9
| | | |
| * | | Add ApplicationWorker and make every worker include itDouwe Maan2017-12-051-4/+4
| | |/ | |/|
* | | Merge branch '32878-merge-request-from-email' into 'master'Sean McGivern2017-12-051-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Create merge request from email Closes #32878 See merge request gitlab-org/gitlab-ce!13817
| * | | Create merge request from emailJan Provaznik2017-12-051-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | Second iteration of Move Kubernetes from service to Cluster pageFilipa Lacerda2017-12-051-3/+9
|/ /
* | Merge branch 'gollum-initializer-warning' into 'master'Rémy Coutable2017-12-041-0/+4
|\ \ | |/ |/| | | | | Add notice to Gollum initializer See merge request gitlab-org/gitlab-ce!15713
| * Add notice to gollum initializergollum-initializer-warningJacob Vosmaer2017-12-041-0/+4
| |
* | Merge branch 'master' into multi-file-editor-dirty-diff-indicatorPhil Hughes2017-11-301-0/+1
|\ \ | |/
| * BE for automatic pipeline when enabling Auto DevOpsMatija Čupić2017-11-281-0/+1
| | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38962
* | fixed web worker performancePhil Hughes2017-11-281-0/+4
|/ | | | [ci skip]
* Update svg external dependencyfl-upgrade-svgFilipa Lacerda2017-11-241-2/+2
|
* Merge branch 'pawel/update_prometheus_gem_to_well_tested_version' into 'master'Douwe Maan2017-11-242-9/+8
|\ | | | | | | | | | | | | Update Prometheus Gem version and disable Prometheus method call instrumentation by default. Closes gitlab-ee#4139 and #40457 See merge request gitlab-org/gitlab-ce!15558
| * Rename wip to worker_idPawel Chojnacki2017-11-231-3/+3
| |
| * Move prometheus middle ware to prometheus initialized.Pawel Chojnacki2017-11-232-6/+5
| |
* | Allow password authentication to be disabled entirelyMarkus Koller2017-11-231-1/+1
|/
* Speed up Unicorn specs by using a dummy Rack application instead of GitLabNick Thomas2017-11-222-4/+0
|
* Merge branch 'feature_add_mermaid' into 'master'Phil Hughes2017-11-222-4/+0
|\ | | | | | | | | | | | | Add support of Mermaid Closes #3711 See merge request gitlab-org/gitlab-ce!15107
| * Add support of MermaidVitaliy @blackst0ne Klachkov2017-11-222-4/+0
| |
* | Set the default gitlab-shell timeout to 3 hoursNick Thomas2017-11-212-3/+3
| |
* | Batchload blobs for diff generationZeger-Jan van de Weg2017-11-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Fix offense to the LineBreakAfterGuardClauses cop40335-master-is-broken-due-to-static-analysisRémy Coutable2017-11-201-0/+2
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master'Rémy Coutable2017-11-204-0/+5
|\ \ | |/ |/| | | | | | | | | Adds Rubocop rule for line break after guard clause Closes #18040 See merge request gitlab-org/gitlab-ce!15188
| * Adds Rubocop rule for line break after guard clauseJacopo2017-11-164-0/+5
| | | | | | | | Adds a rubocop rule (with autocorrect) to ensure line break after guard clauses.
* | Merge branch 'mk-add-user-rate-limits' into 'master'Douwe Maan2017-11-172-1/+62
|\ \ | | | | | | | | | | | | | | | | | | Add request rate limits Closes #30053 See merge request gitlab-org/gitlab-ce!14708
| * | Don't add methods to Rack::AttackMichael Kozono2017-11-171-10/+12
| | |
| * | Fix OAuth API and RSS rate limitingMichael Kozono2017-11-171-11/+1
| | |
| * | Allow throttling code in test environmentMichael Kozono2017-11-171-18/+14
| | | | | | | | | | | | This code should not break other tests because the rate limits are off by default.
| * | Add request throttlesMichael Kozono2017-11-172-1/+74
| | |
* | | Resolve "Performance issues when loading large number of wiki pages"Francisco Javier López2017-11-171-0/+26
|/ /
* | Update license_finder to 3.1.1Winnie Hellmann2017-11-161-0/+32
| |
* | Resolve "npm list errors for gitlab-svgs and node-pre-gyp"Tim Zallmann2017-11-151-2/+2
|/
* Change label to be more consistent, not a series.Joshua Lambert2017-11-121-4/+2
|
* Fix CPU metricJoshua Lambert2017-11-121-2/+2
|
* Fix to use variableJoshua Lambert2017-11-121-1/+1
|
* Adjust metrics to ignore Job tag to support k8s 1.7+Joshua Lambert2017-11-121-2/+2
|
* Revert "Merge branch 'add-typescript' into 'master'"Jacob Schatz2017-11-101-5/+1
| | | This reverts merge request !15264
* Merge branch '32059-fix-oauth-phishing' into 'security-10-1'Douwe Maan2017-11-101-1/+9
| | | | | | Prevent OAuth phishing attack by presenting detailed wording about app to user during authorization See merge request gitlab/gitlabhq!2205
* Merge branch 'github-importer-refactor' into 'master'Douwe Maan2017-11-081-0/+2
|\ | | | | | | | | | | | | Rewrite the GitHub importer to perform work in parallel and greatly improve performance Closes #33135, #38621, and #39361 See merge request gitlab-org/gitlab-ce!14731
| * Rewrite the GitHub importer from scratchYorick Peterse2017-11-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge branch 'feature-change-signout-route' into 'master'Douwe Maan2017-11-081-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Change Sign Out route from a DELETE to a GET Closes #39708 See merge request gitlab-org/gitlab-ce!15231
View Lorry Controller Status