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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch ↵	Douwe Maan	2017-11-15	1	-11/+26
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'40122-only-one-note-webhook-is-triggered-when-a-comment-with-time-spent-is-added' into 'master' Resolve "Only one note webhook is triggered when a comment with time spent is added" Closes #40122 See merge request gitlab-org/gitlab-ce!15381
\| *	Add total_time_spent to the `changes` hash in issuable Webhook payloads40122-only-one-note-webhook-is-triggered-when-a-comment-with-time-spent-is-added	Rémy Coutable	2017-11-15	1	-11/+26
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Fix dumping hashed storage based repository	Gabriel Mazetto	2017-11-15	1	-0/+4
\|/
*	Include child projects a user can manage in namespace dropdowns	Bob Van Landuyt	2017-11-14	1	-7/+31
\| \| \| \|	These dropdown options are used for creating and transfering projects.
*	Merge branch 'issue_40058' into 'master'	Sean McGivern	2017-11-14	1	-0/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Prevent position update for image diff notes Closes #40058 See merge request gitlab-org/gitlab-ce!15357
\| *	Prevents position update for image diff notesissue_40058	Felipe Artur	2017-11-13	1	-0/+6
\| \|
* \|	Merge branch 'fix/sm/31771-do-not-allow-jobs-to-be-erased-new' into 'master'	Kamil Trzciński	2017-11-14	1	-0/+17
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not allow jobs to be erased Closes #31771 See merge request gitlab-org/gitlab-ce!15216
\| * \	Merge branch 'master' into fix/sm/31771-do-not-allow-jobs-to-be-erased-new	Shinya Maeda	2017-11-07	14	-304/+630
\| \|\ \
\| * \| \|	Add doc. Fix spec. Add erase_build in protected_ref rule	Shinya Maeda	2017-11-07	1	-2/+2
\| \| \| \|
\| * \| \|	Fix spec. Revert update check.	Shinya Maeda	2017-11-06	1	-0/+17
\| \| \| \|
* \| \| \|	Merge branch 'jej/fix-lfs-integrity-with-forks' into 'master'	Douwe Maan	2017-11-14	1	-0/+18
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle forks in Gitlab::Checks::LfsIntegrity Closes #39902 See merge request gitlab-org/gitlab-ce!15279
\| * \| \|	Handle forks in Gitlab::Checks::LfsIntegrityjej/fix-lfs-integrity-with-forks	James Edwards-Jones	2017-11-09	1	-0/+18
\| \| \| \|
* \| \| \|	Merge branch ↵	Rémy Coutable	2017-11-13	2	-30/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'39602-move-update-project-counter-caches-out-of-issues-merge-requests' into 'master' Move update_project_counter_caches? out of issue and merge request Closes #39602 See merge request gitlab-org/gitlab-ce!15300
\| * \| \| \|	Move update_project_counter_caches? out of issue and merge request	George Andrinopoulos	2017-11-11	2	-30/+0
\| \| \| \| \|
* \| \| \| \|	Add feature test to milestone	George Andrinopoulos	2017-11-11	1	-0/+6
\| \| \| \| \|
* \| \| \| \|	Move total time spend calculation to milestoneish	George Andrinopoulos	2017-11-11	3	-56/+11
\| \| \| \| \|
* \| \| \| \|	Add total time spent to milestones	George Andrinopoulos	2017-11-11	2	-0/+56
\|/ / / /
* \| \| \|	Always return full avatar URL for private/internal groups/projects when ↵	Douwe Maan	2017-11-09	4	-26/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	asset host is set
* \| \| \|	Merge branch 'github-importer-refactor' into 'master'	Douwe Maan	2017-11-08	2	-0/+86
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-0/+73
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
\| * \| \| \|	Refactor User.find_by_any_email	Yorick Peterse	2017-11-07	1	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By using SQL::Union we can return a proper ActiveRecord::Relation, making it possible to select the columns we're interested in (instead of all of them).
* \| \| \| \|	Merge branch 'bvl-free-paths' into 'master'	Douwe Maan	2017-11-08	1	-6/+0
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Free some reserved group routes See merge request gitlab-org/gitlab-ce!15052
\| * \| \| \|	Free up some group reserved words	Bob Van Landuyt	2017-11-07	1	-6/+0
\| \| \| \| \|
* \| \| \| \|	Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce ↵	Kamil Trzcinski	2017-11-07	2	-3/+72
\|\ \ \ \ \ \| \|/ / / / \| \| \| \| \| \| \| \| \| \|	into add-ingress-to-cluster-applications
\| * \| \| \|	Merge branch 'master' into 38464-k8s-apps	Shinya Maeda	2017-11-08	2	-3/+72
\| \|\ \ \ \
\| \| * \ \ \	Merge branch 'fix/gb/ensure-that-job-belongs-to-stage' into 'master'	Kamil Trzciński	2017-11-07	1	-2/+71
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure that every job has a stage assigned Closes #37979 See merge request gitlab-org/gitlab-ce!14724
\| \| \| * \| \| \|	Use existing pipeline stage if stage already exists	Grzegorz Bizon	2017-11-06	1	-0/+23
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Make sure that every job has a stage assigned	Grzegorz Bizon	2017-11-06	1	-2/+48
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch '39649-change-default-size-for-gke-cluster-creation' into 'master'	Kamil Trzciński	2017-11-07	1	-1/+1
\| \| \|\ \ \ \ \ \| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Change default size for GKE cluster creation" Closes #39649 See merge request gitlab-org/gitlab-ce!15220
\| \| \| * \| \| \|	Change new occurrencies of n1-default-439649-change-default-size-for-gke-cluster-creation	bikebilly	2017-11-07	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Make ingress to use install_command	Kamil Trzcinski	2017-11-07	1	-2/+18
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge remote-tracking branch 'origin/38464-k8s-apps' into ↵	Kamil Trzcinski	2017-11-07	1	-0/+6
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add-ingress-to-cluster-applications
\| * \| \| \| \| \|	Add Helm InstallCommand	Alessio Caiazza	2017-11-07	1	-0/+6
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Add specs for ingress	Kamil Trzcinski	2017-11-07	2	-0/+113
\|/ / / / / /
* \| \| \| \| \|	Fix tests for initial status	Kamil Trzcinski	2017-11-07	1	-2/+14
\| \| \| \| \| \|
* \| \| \| \| \|	Do not use RSpec.describe	Alessio Caiazza	2017-11-07	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'master' into 38464-k8s-apps	Shinya Maeda	2017-11-07	5	-0/+47
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge branch ↵	Rémy Coutable	2017-11-07	1	-0/+13
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'39791-when-reopening-an-issue-the-mattermost-notification-has-no-context-to-the-issue' into 'master' Resolve "When reopening an issue the Mattermost Notification has no context to the issue" Closes #39791 See merge request gitlab-org/gitlab-ce!15218
\| \| * \| \| \| \|	Fix issue reopen Mattermost / Slack message39791-when-reopening-an-issue-the-mattermost-notification-has-no-context-to-the-issue	Sean McGivern	2017-11-06	1	-0/+13
\| \| \| \|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When an issue is reopened, the action is 'reopen', but the state is 'opened' (as we don't have a separate 'reopened' state any more). Because we checked the action in one method and the state in another, this lead to a weird case where the mesage neither linked to the issue, nor contained an attachment with its details. Just checking the action is fine, as it's the most granular.
\| * \| \| \| \|	Merge branch 'feature/custom-attributes-on-projects-and-groups' into 'master'	Rémy Coutable	2017-11-07	4	-0/+34
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support custom attributes on groups and projects See merge request gitlab-org/gitlab-ce!14593
\| \| * \| \| \|	Support custom attributes on groups	Markus Koller	2017-11-06	2	-0/+17
\| \| \| \| \| \|
\| \| * \| \| \|	Support custom attributes on projects	Markus Koller	2017-11-06	2	-0/+17
\| \| \| \|/ / \| \| \|/\| \|
* \| \| \| \|	Rename application_helm factory to cluster_application_helm	Alessio Caiazza	2017-11-07	1	-5/+5
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' into 38464-k8s-apps	Shinya Maeda	2017-11-07	12	-61/+168
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge branch 'refactor-clusters' into 'master'	Grzegorz Bizon	2017-11-06	6	-266/+560
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor Clusters to be consisted from GcpProvider and KubernetesPlatform See merge request gitlab-org/gitlab-ce!14879
\| \| * \| \| \|	Remove 10.3 comments (Tracked by a tech debts issue). Refactor spec factory ↵refactor-clusters	Shinya Maeda	2017-11-06	2	-22/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	name. Use ArgumentError
\| \| * \| \| \|	Merge branch 'master' into refactor-clusters	Shinya Maeda	2017-11-06	2	-1/+20
\| \| \|\ \ \ \ \| \| \| \| \|/ / \| \| \| \|/\| \|
\| \| * \| \| \|	Merge branch 'master' into refactor-clusters	Shinya Maeda	2017-11-05	6	-0/+103
\| \| \|\ \ \ \
\| * \| \ \ \ \	Merge branch 'remove-ensure-ref-fetched-from-controllers' into 'master'	Sean McGivern	2017-11-06	2	-36/+13
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	removed the #ensure_ref_fetched from all controllers Closes #36061 See merge request gitlab-org/gitlab-ce!15129
\| \| * \| \| \| \|	updated the ignore_column concern to support multiple columns	micael.bergeron	2017-11-06	1	-4/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This method is an ActiveRecord extension and it should behave like one. I expected this to work.