summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | Change Sign Out route from a DELETE to a GETJoe Marty2017-11-061-1/+1
| | | | | | | | | | | | Closes #39708
* | | Merge branch 'bvl-free-paths' into 'master'Douwe Maan2017-11-081-21/+31
|\ \ \ | | | | | | | | | | | | | | | | Free some reserved group routes See merge request gitlab-org/gitlab-ce!15052
| * | | Free up some group reserved wordsBob Van Landuyt2017-11-071-27/+30
| | | |
| * | | Free up `avatar`, `group_members` and `milestones` as pathsBob Van Landuyt2017-11-071-15/+16
| | | |
| * | | Free up `labels` as a group nameBob Van Landuyt2017-11-071-4/+10
| | |/ | |/|
* | | Merge branch 'jivl-fix-karma-config-file' into 'master'Mike Greiling2017-11-081-9/+0
|\ \ \ | | | | | | | | | | | | | | | | fix karma config file See merge request gitlab-org/gitlab-ce!15263
| * | | fix karma config filejivl-fix-karma-config-fileJose Ivan Vargas2017-11-071-9/+0
| |/ /
* | | Adds typescript support in webpack. With Mike G.Jacob Schatz2017-11-071-1/+5
|/ /
* | Fix wildcard route and use param styleShinya Maeda2017-11-071-1/+1
| |
* | Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-072-2/+3
|\ \
| * \ Merge branch '35616-move-gke-form-1st-iteration' into 'master'Grzegorz Bizon2017-11-071-0/+1
| |\ \ | | | | | | | | | | | | | | | | First iteration of Move Kubernetes from service to Cluster page See merge request gitlab-org/gitlab-ce!15061
| | * \ Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2017-11-063-11/+19
| | |\ \ | | | | | | | | | | | | | | | 35616-move-gke-form-1st-iteration
| | * \ \ Merge branch 'refactor-clusters' into ↵Shinya Maeda2017-11-051-0/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | move-kubernetes-from-service-to-clusters-page-10-2-ver
| | * \ \ \ Merge branch '35616-move-gke-form-1st-iteration' into ↵Shinya Maeda2017-11-041-0/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | move-kubernetes-from-service-to-clusters-page-10-2-ver
| | | * | | | Fix pipeline. Fix routing when validation failed.Shinya Maeda2017-11-011-1/+1
| | | | | | |
| | | * | | | Fix paths to the first pageKamil Trzcinski2017-11-011-0/+1
| | | | | | |
| * | | | | | Merge branch 'remove-per-cpu-metrics' into 'master'Tim Zallmann2017-11-071-2/+2
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Updates CE metrics with updated versions from EE See merge request gitlab-org/gitlab-ce!15229
| | * | | | | Updates CE metrics with updated versions from EE for supported metrics (EE ↵remove-per-cpu-metricsJoshua Lambert2017-11-061-2/+2
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | version includes additional items for EE specific features)
* | | | | | Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-074-11/+20
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'pawel/metrics-to-prometheus-33643' into 'master'Grzegorz Bizon2017-11-063-6/+19
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | Add all InfluxDB metrics to prometheus See merge request gitlab-org/gitlab-ce!13891
| | * | | | Only enable unicorn metrics when not in sidekiq mode.Pawel Chojnacki2017-11-021-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | + remove rebased test case
| | * | | | Cleanup transaction metricsPawel Chojnacki2017-11-023-8/+14
| | | | | |
| | * | | | Finished Ruby SamplerPawel Chojnacki2017-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | + Cleanup sampler, use latest Prometheus gem
| | * | | | Add GC sampler and small refactor of samplersPawel Chojnacki2017-11-022-3/+7
| | | | | |
| * | | | | Merge branch 'remove-ensure-ref-fetched-from-controllers' into 'master'Sean McGivern2017-11-061-4/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed the #ensure_ref_fetched from all controllers Closes #36061 See merge request gitlab-org/gitlab-ce!15129
| | * | | | | align with the commentsmicael.bergeron2017-11-061-3/+0
| | | | | | |
| | * | | | | removed the #ensure_ref_fetched from all controllersmicael.bergeron2017-11-031-2/+1
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also, I refactored the MergeRequest#fetch_ref method to express the side-effect that this method has. MergeRequest#fetch_ref -> MergeRequest#fetch_ref! Repository#fetch_source_branch -> Repository#fetch_source_branch!
| * | | | | Resolve "DashboardController#activity.json is slow due to SQL"Francisco Javier López2017-11-061-1/+0
| | |_|_|/ | |/| | |
| * | | | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-11-031-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * | | | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-11-023-4/+6
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * | | | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-314-9/+10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (84 commits) Migrate Gitlab::Git::Wiki#page to Gitaly Load participants async Normalize LDAP DN when looking up identity Improve the maintenance policy page add changelog fix spec failure Allow promoting project milestones to group milestones fix specs Be able to bundle gems with newer rubies Upgrade Ruby to 2.3.5 fixed up upload feature after master merge fix missing issue assignees Migrate Gitlab::Git::Wiki#delete_page to Gitaly Enable eslint Make `#hashed_storage?` require feature argument Adds callback function to inital cluster request Fix example typo. Upload files through the multi-file editor get branch name from the DOM Resolve "Convert autosize.js library to be a Yarn managed library" ...
| * \ \ \ \ Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-293-39/+41
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (96 commits) Fetch the merged branches at once Merging EE doc into CE Avoid using Rugged in Gitlab::Git::Wiki#preview_slug Cache commits on the repository model Remove groups_select from global namespace & simplifies the code Change default disabled merge request widget message to "Merge is not allowed yet" Semi-linear history merge is now available in CE. Remove repetitive karma spec Improve spec to check hidden component Rename to shouldShowUsername Add KubernetesService#default_namespace tests Revert "Merge branch '36670-remove-edit-form' into 'master'" Fix bitbucket login Remove duped tests Add path attribute to WikiFile class Make local_branches OPT_OUT Clarify the language around External Group membership with SAML SSO to clarify that this will NOT add users to GitLab Groups. Added ssh fingerprint, gitlab ci and pages information in an instance configuration page Fix the incorrect value being used to set GL_USERNAME on hooks Resolve "Remove overzealous tooltips in projects page tabs" ...
| * | | | | implement basic request inspector for use in Capybara testsMike Greiling2017-10-231-0/+1
| | | | | |
* | | | | | Add Projects::Clusters::ApplicationsController testsAlessio Caiazza2017-11-031-1/+1
| | | | | |
* | | | | | Fix typosAlessio Caiazza2017-11-031-1/+1
| | | | | |
* | | | | | Merge branch 'master' into 38464-k8s-appsEric Eastwood2017-11-031-1/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'gitaly-client-path-fix' into 'master'Douwe Maan2017-11-031-1/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Fix invalid Gitaly ClientPath config See merge request gitlab-org/gitlab-ce!15159
| | * | | | Fix invalid Gitaly ClientPath configgitaly-client-path-fixKim "BKC" Carlbäcker2017-11-021-1/+1
| | | |_|/ | | |/| |
* | | | | Merge remote-tracking branch 'origin/master' into 38464-k8s-appsKamil Trzcinski2017-11-033-4/+6
|\ \ \ \ \ | |/ / / /
| * | | | Add sudo API scopeDouwe Maan2017-11-021-2/+3
| | | | |
| * | | | Remove Private Token from User Settings > AccountDouwe Maan2017-11-021-1/+0
| | | | |