delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'fix-filter-by-my-reaction' into 'master'	Sean McGivern	2017-11-14	1	-1/+54
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix filter by my reaction is not working Closes #39930 See merge request gitlab-org/gitlab-ce!15345
\| *	Fix filter by my reaction is not working	Hiroyuki Sato	2017-11-13	1	-1/+54
\| \|
* \|	Merge branch 'fix/sm/31771-do-not-allow-jobs-to-be-erased-new' into 'master'	Kamil Trzciński	2017-11-14	1	-1/+24
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Do not allow jobs to be erased Closes #31771 See merge request gitlab-org/gitlab-ce!15216
\| *	Reduce changesfix/sm/31771-do-not-allow-jobs-to-be-erased-new	Shinya Maeda	2017-11-07	1	-2/+2
\| \|
\| *	Improve spec	Shinya Maeda	2017-11-07	1	-1/+1
\| \|
\| *	Merge branch 'master' into fix/sm/31771-do-not-allow-jobs-to-be-erased-new	Shinya Maeda	2017-11-07	5	-182/+324
\| \|\
\| * \|	Add doc. Fix spec. Add erase_build in protected_ref rule	Shinya Maeda	2017-11-07	1	-1/+24
\| \| \|
* \| \|	Fix access to the final page of todos	Sean McGivern	2017-11-09	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The todos page limit is 20, and both that and a user's pending todo count are integers. Using integer division means that the result's floor will be taken, defeating the point of the later call to `#ceil`. So we need to convert one side of the division to a float first, otherwise the last page won't be treated as available.
* \| \|	Merge branch 'github-importer-refactor' into 'master'	Douwe Maan	2017-11-08	1	-2/+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 scratch	Yorick Peterse	2017-11-07	1	-2/+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 '37824-many-branches-lock-server' into 'master'	Annabel Dunstone Gray	2017-11-07	1	-4/+22
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Project with many branches can lock server running "git branch --contains XXX" Closes #37824 See merge request gitlab-org/gitlab-ce!14812
\| * \| \|	implemented using an ivar, and added specs	Brett Walker	2017-10-13	1	-4/+22
\| \| \| \|
* \| \| \|	Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce ↵	Shinya Maeda	2017-11-08	1	-3/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 38464-k8s-apps
\| * \| \| \|	Fix Projects::Clusters::ApplicationsController failures	Alessio Caiazza	2017-11-07	1	-3/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' into 38464-k8s-apps	Shinya Maeda	2017-11-08	2	-56/+12
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Refactor issuables index actions	Jarka Kadlecova	2017-11-07	1	-54/+0
\| \| \| \| \|
\| * \| \| \|	Merge branch 'multi-file-editor-separate-commits-call' into 'master'	Filipa Lacerda	2017-11-07	1	-2/+12
\| \|\ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Multi-file editor fetch log data from a different endpoint Closes #38360 See merge request gitlab-org/gitlab-ce!15132
\| \| * \| \|	fixed specs	Phil Hughes	2017-11-06	1	-5/+3
\| \| \| \| \|
\| \| * \| \|	added refs_controller_spec	Phil Hughes	2017-11-06	1	-3/+15
\| \| \| \|/ \| \| \|/\|
* \| \| \|	Merge branch 'master' into 38464-k8s-apps	Shinya Maeda	2017-11-07	2	-8/+9
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge branch '35616-move-gke-form-1st-iteration' into 'master'	Grzegorz Bizon	2017-11-07	1	-3/+3
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 Trzcinski	2017-11-06	4	-84/+4
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	35616-move-gke-form-1st-iteration
\| \| * \ \ \	Merge branch 'refactor-clusters' into ↵move-kubernetes-from-service-to-clusters-page-10-2-ver	Shinya Maeda	2017-11-06	1	-0/+5
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	move-kubernetes-from-service-to-clusters-page-10-2-ver
\| \| * \ \ \ \	Merge branch 'refactor-clusters' into ↵	Shinya Maeda	2017-11-05	2	-0/+63
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	move-kubernetes-from-service-to-clusters-page-10-2-ver
\| \| * \| \| \| \| \|	Fixed controller spec	Shinya Maeda	2017-11-04	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch '35616-move-gke-form-1st-iteration' into ↵	Shinya Maeda	2017-11-04	1	-2/+2
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	move-kubernetes-from-service-to-clusters-page-10-2-ver
\| \| \| * \| \| \| \| \|	Fix static anlysys	Shinya Maeda	2017-11-02	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Fix pipeline. Fix routing when validation failed.	Shinya Maeda	2017-11-01	1	-3/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Change tags order in refs dropdownfeature_change_sort_refs	Vitaliy @blackst0ne Klachkov	2017-11-07	1	-5/+6
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'master' into 38464-k8s-apps	Eric Eastwood	2017-11-06	3	-3/+4
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: db/schema.rb
\| * \| \| \| \| \| \|	Merge branch 'refactor-clusters' into 'master'	Grzegorz Bizon	2017-11-06	1	-173/+313
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor Clusters to be consisted from GcpProvider and KubernetesPlatform See merge request gitlab-org/gitlab-ce!14879
\| * \ \ \ \ \ \ \	Merge branch ↵	Sean McGivern	2017-11-06	1	-1/+2
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'pawel/show_empty_page_when_prometheus_metrics_are_disabled-35639' into 'master' Make Prometheus metrics endpoint return empty response when metrics are disabled Closes #35639 See merge request gitlab-org/gitlab-ce!14490
\| \| * \| \| \| \| \| \| \|	Make Prometheus metrics endpoint return empty response when metrics are disabledpawel/show_empty_page_when_prometheus_metrics_are_disabled-35639	Pawel Chojnacki	2017-09-25	1	-1/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'jk-delete-epic-backport' into 'master'	Sean McGivern	2017-11-06	2	-2/+2
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor issuable destroy action See merge request gitlab-org/gitlab-ce!15203
\| \| * \| \| \| \| \| \| \|	Refactor issuable destroy action	Jarka Kadlecova	2017-11-06	2	-2/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Add more tests to Projects::Clusters::ApplicationsController38464-k8s-apps	Alessio Caiazza	2017-11-06	1	-0/+13
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'refactor-clusters' into 38464-k8s-apps	Alessio Caiazza	2017-11-06	2	-81/+5
\|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Remove 10.3 comments (Tracked by a tech debts issue). Refactor spec factory ↵refactor-clusters	Shinya Maeda	2017-11-06	1	-81/+0
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	name. Use ArgumentError
\| * \| \| \| \| \| \| \|	Merge branch 'master' into refactor-clusters	Shinya Maeda	2017-11-06	1	-0/+5
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \| \| \| \| \| \| / / \| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch '38677-render-new-discussions-on-diff-tab' into 'master'36248-repo-editor-double-border-under-repo-file-buttons	Filipa Lacerda	2017-11-06	1	-0/+5
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added discussion_line_code value to note response and use it to query the right… Closes #38677 See merge request gitlab-org/gitlab-ce!14981
\| \| \| * \| \| \| \| \|	Improve discussion_line_code set and update notes_controller_spec	Luke "Jared" Bennett	2017-10-21	1	-0/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'refactor-clusters' into 38464-k8s-apps	Alessio Caiazza	2017-11-06	2	-0/+63
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Merge branch 'master' into refactor-clusters	Shinya Maeda	2017-11-05	2	-0/+63
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \| \| \| \| \| / / / \| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch 'issue_39176' into 'master'	Douwe Maan	2017-11-03	1	-0/+13
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Render 404 when polling commit notes without having permissions Closes #39176 See merge request gitlab-org/gitlab-ce!15140
\| \| \| * \| \| \| \| \|	Render 404 when polling commit notes without having permissionsissue_39176	Felipe Artur	2017-11-03	1	-0/+13
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch 'bvl-unlink-fixes' into 'master'	Douwe Maan	2017-11-03	1	-0/+50
\| \| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes some bugs related to forked projects of which the source was deleted. Closes #39667 See merge request gitlab-org/gitlab-ce!15150
\| \| \| * \| \| \| \| \|	Find the LFS-objects for a fork within a the fork network	Bob Van Landuyt	2017-11-03	1	-0/+50
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Add Projects::Clusters::ApplicationsController tests	Alessio Caiazza	2017-11-03	1	-0/+73
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'master' into refactor-clusters	Shinya Maeda	2017-11-03	4	-96/+96
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / /
\| * \| \| \| \| \| \|	Merge branch 'pawel/disable_nfs_metrics_checks_39730' into 'master'	Stan Hu	2017-11-02	1	-11/+0
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Filesystem check metrics that use too much CPU to handle requests See merge request gitlab-org/gitlab-ce!15158