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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Removed API endpoint and specsfj-36819-remove-v3-api	Francisco Javier López	2018-05-30	42	-5369/+12
\|
*	Merge branch 'dm-api-projects-members-preload' into 'master'	Robert Speicher	2018-05-30	2	-16/+20
\|\ \| \| \| \| \| \| \| \|	Only preload member records for the relevant projects/groups/user in projects API See merge request gitlab-org/gitlab-ce!18945
\| *	Only preload member records for the relevant projects/groups/user in ↵dm-api-projects-members-preload	Douwe Maan	2018-05-30	2	-16/+20
\| \| \| \| \| \| \| \|	projects API
* \|	Merge branch 'sh-use-grape-path-helpers' into 'master'	Sean McGivern	2018-05-30	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace grape-route-helpers with our own grape-path-helpers Closes #45718 See merge request gitlab-org/gitlab-ce!19240
\| * \|	Replace grape-route-helpers with our own grape-path-helpers	Stan Hu	2018-05-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This gem (https://gitlab.com/gitlab-org/grape-path-helpers) makes a number of changes: 1. Brings in @mdelaossa's changes in https://github.com/reprah/grape-route-helpers/pull/21 2. Fixes some broken specs and code for Grape 1.0+ 3. Optimizes the generation of paths by bringing in @dblessing's HashWithIndifferentAccess changes in https://gitlab.com/gitlab-org/gitlab-ce/issues/45718#note_70123793 Closes #45718
* \| \|	Merge branch 'brodock-refactor-hashed-storage-task' into 'master'	Douwe Maan	2018-05-30	2	-86/+90
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \|	Extracted auxiliary methods from storage.rake into specific RakeHelper See merge request gitlab-org/gitlab-ce!18962
\| * \|	Specs covering listing all gitlab:storage:* typesbrodock-refactor-hashed-storage-task	Gabriel Mazetto	2018-05-29	1	-1/+1
\| \| \|
\| * \|	refactor to remove duplication	Gabriel Mazetto	2018-05-28	1	-14/+12
\| \| \|
\| * \|	assign helper full name to variable to reduce code length	Gabriel Mazetto	2018-05-28	1	-10/+19
\| \| \|
\| * \|	Refactor RakeHelper to reduce complexity	Gabriel Mazetto	2018-05-28	1	-26/+18
\| \| \|
\| * \|	Extracted auxiliary methods from storage.rake into specific RakeHelper	Gabriel Mazetto	2018-05-28	2	-86/+91
\| \| \|
* \| \|	Merge branch 'fix/bitbucket_import_anonymous' into 'master'	Douwe Maan	2018-05-30	2	-1/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Import bitbucket issues that are reported by an anonymous user Closes #44381 See merge request gitlab-org/gitlab-ce!18199
\| * \| \|	Import bitbucket issues that are reported by an anonymous user	Bart Libert	2018-05-24	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For these kind of issues, the "reporter" field is present but zero. In such a case, "fetch" will not return the default value, but it will return nil. Hence, importing fails, because the "username" field of nil is referenced Fixes issue #44381
* \| \| \|	Merge branch 'mattermost-api-v4' into 'master'	Sean McGivern	2018-05-30	3	-6/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated Mattermost integration to use Mattermost API v4 Closes #41631 See merge request gitlab-org/gitlab-ce!19043
\| * \| \| \|	Updated Mattermost integration to use Mattermost API v4	Harrison Healey	2018-05-28	3	-6/+6
\| \| \| \| \|
* \| \| \| \|	Merge branch 'blackst0ne-squash-and-merge-in-gitlab-core-ce' into 'master'	Phil Hughes	2018-05-30	4	-10/+13
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Squash and merge in GitLab Core (CE)" Closes #34591 See merge request gitlab-org/gitlab-ce!18956
\| * \| \| \|	Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ce	blackst0ne	2018-05-29	4	-10/+13
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch '6045-extract-ee-specific-specs-lines' into 'master'	Robert Speicher	2018-05-29	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE] Resolve "Extract EE specific files/lines for some controller specs" Closes #6045 See merge request gitlab-org/gitlab-ce!19089
\| * \| \| \|	Try to fetch the CE branch in EE because sometimes it has the same name6045-extract-ee-specific-specs-lines	Rémy Coutable	2018-05-24	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge remote-tracking branch 'dev/master'	Mayra Cabrera	2018-05-29	7	-17/+41
\|\ \ \ \ \
\| * \ \ \ \	Merge branch 'security-fj-import-export-assignment' into 'master'	Mayra Cabrera	2018-05-29	6	-14/+38
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[master] Arbitrary assignment of Project fields using "Import project" from a Gitlab tar.gz Closes #2678 See merge request gitlab/gitlabhq!2378
\| \| * \| \| \| \|	Blacklisting attributes in the project import process	Francisco Javier López	2018-05-14	6	-14/+38
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'security-dm-delete-deploy-key' into 'master'	Mayra Cabrera	2018-05-29	1	-3/+3
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[master] Fix API to remove deploy key from project instead of deleting it entirely See merge request gitlab/gitlabhq!2379
\| \| * \| \| \| \| \|	Fix API to remove deploy key from project instead of deleting it entirely	Douwe Maan	2018-05-04	1	-3/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '46758-fallout-of-cacheable-attribute' into 'master'	Douwe Maan	2018-05-29	2	-4/+28
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure ApplicationSetting#performance_bar_allowed_group_id is properly set when retrieved from cache Closes #46758 See merge request gitlab-org/gitlab-ce!19144
\| * \| \| \| \| \| \| \|	Ensure ApplicationSetting#performance_bar_allowed_group_id is properly set ↵	Rémy Coutable	2018-05-29	2	-4/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	when retrieved from cache Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \|	Merge branch '44602-clarify-update-docs-text-about-restrictions' into 'master'	Achilleas Pipinellis	2018-05-29	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Clarify/Update docs/text about restrictions." See merge request gitlab-org/gitlab-ce!17970
\| * \| \| \| \| \| \| \| \|	include groups in description	Davin Walker	2018-05-28	1	-1/+1
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch ↵	Kamil Trzciński	2018-05-29	1	-16/+1
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'38759-fetch-available-parameters-directly-from-gke-when-creating-a-cluster' into 'master' Resolve "Fetch available parameters directly from GKE when creating a cluster" Closes #38759 See merge request gitlab-org/gitlab-ce!17806
\| * \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into ↵	Dennis Tang	2018-05-25	79	-569/+1099
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	38759-fetch-available-parameters-directly-from-gke-when-creating-a-cluster
\| * \| \| \| \| \| \| \| \|	Remove redundant GoogleApi::CloudPlatform::Client methods	Matija Čupić	2018-05-11	1	-34/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The methods removed are #projects_list #get_project_billing_info as well as #project_zones_list and #project_zone_machine_types_list
\| * \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into ↵	Dennis Tang	2018-05-11	37	-84/+600
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	38759-fetch-available-parameters-directly-from-gke-when-creating-a-cluster
\| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into ↵	Matija Čupić	2018-05-02	53	-183/+685
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	38759-fetch-available-parameters-directly-from-gke-when-creating-a-cluster
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into ↵	Matija Čupić	2018-04-20	249	-1089/+3614
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	38759-fetch-available-parameters-directly-from-gke-when-creating-a-cluster
\| * \| \| \| \| \| \| \| \| \| \| \|	Add zones_list and machine_types_list to Google Cloud API client	Matija Čupić	2018-03-16	1	-0/+19
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'add-artifacts_expire_at-to-api' into 'master'	Grzegorz Bizon	2018-05-29	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose artifacts_expire_at field for job entity in api See merge request gitlab-org/gitlab-ce!18872
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Expose artifacts_expire_at field for job entity in api	Semyon Pupkov	2018-05-26	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/45798
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'sh-tag-queue-duration-api-calls' into 'master'	Sean McGivern	2018-05-29	2	-1/+28
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Log queue duration for Grape API calls Closes #46601 See merge request gitlab-org/gitlab-ce!19159
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Log queue duration for Grape API callssh-tag-queue-duration-api-calls	Stan Hu	2018-05-28	2	-1/+28
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This mimics the same thing the RailsQueueDuration does for Rails controller requests and will help diagnose issues with API delays. Closes #46601
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'groups-controller-show-performance' into 'master'	Douwe Maan	2018-05-29	1	-1/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve performance of GroupsController#show See merge request gitlab-org/gitlab-ce!18973
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Eager load project routes for issue references	Yorick Peterse	2018-05-28	1	-1/+2
\| \| \|_\|_\|_\|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reduces the number of queries necessary when displaying the activity page of a group.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'add-background-migration-to-fill-file-store' into 'master'	Kamil Trzciński	2018-05-28	3	-0/+61
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add background migration to fill file stores from `NULL` to `1` Closes #45337 and #45476 See merge request gitlab-org/gitlab-ce!18557
\| * \| \| \| \| \| \| \| \| \| \| \|	Remove Gitlab::BackgroundMigration exxxplicit namespaces from migration classes	Shinya Maeda	2018-05-28	3	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Rename FillFileStoreUpload to FillStoreUpload	Shinya Maeda	2018-05-28	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Add spec for fill_file_store migration	Shinya Maeda	2018-05-28	3	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Remove legacy artifacts file_store migration	Shinya Maeda	2018-05-28	2	-42/+0
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Add background migration to fill file stores	Shinya Maeda	2018-05-28	5	-0/+103
\| \| \|_\|_\|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'ignore-writing-trace-if-it-already-archived' into 'master'	Kamil Trzciński	2018-05-28	1	-2/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disallow updating job status if the job is not running Closes #46383 See merge request gitlab-org/gitlab-ce!19101
\| * \| \| \| \| \| \| \| \| \| \|	Revert correctly	Shinya Maeda	2018-05-28	2	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Disallow updating job stauts if it's not running	Shinya Maeda	2018-05-28	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|