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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Revert trace change	Shinya Maeda	2018-05-28	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Ignore writing traces if it's already been archived	Shinya Maeda	2018-05-28	1	-1/+3
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-admin-page-counts-take-2' into 'master'	Yorick Peterse	2018-05-28	1	-17/+55
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix fast admin counters not working when PostgreSQL has secondaries Closes #46742 See merge request gitlab-org/gitlab-ce!19154
\| * \| \| \| \| \| \| \| \| \|	Fix fast admin counters not working when PostgreSQL has secondariessh-fix-admin-page-counts-take-2	Stan Hu	2018-05-25	1	-17/+55
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit does a number of things: 1. Reduces the number of queries needed by perform a single query to get all the tuples for the relevant rows. 2. Uses a transaction to query the tuple counts to ensure that the data is retrieved from the primary. Closes #46742
* \| \| \| \| \| \| \| \| \|	Use Gitaly's DeleteAllRepositories RPC during backup restore	Jacob Vosmaer (GitLab)	2018-05-28	2	-20/+51
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'bvl-add-username-to-terms-message' into 'master'	Douwe Maan	2018-05-28	1	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add username to terms message in git and API calls Closes #46649 See merge request gitlab-org/gitlab-ce!19126
\| * \| \| \| \| \| \| \| \| \|	Add username to terms message in git and API callsbvl-add-username-to-terms-message	Bob Van Landuyt	2018-05-24	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will make it clearer to users which account is being used to make the API/git call. So they know which account needs to be used to accept the terms. Closes #46649
* \| \| \| \| \| \| \| \| \| \|	Merge branch '45190-create-notes-diff-files' into 'master'	Douwe Maan	2018-05-28	1	-0/+7
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Persist and use truncated note diffs instead requesting Gitaly in a N+1 manner on MR page Closes #45190 See merge request gitlab-org/gitlab-ce!18991
\| * \| \| \| \| \| \| \| \| \| \|	Persist truncated note diffs on a new table45190-create-notes-diff-files	Oswaldo Ferreira	2018-05-24	1	-0/+7
\| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We request Gitaly in a N+1 manner to build discussion diffs. Once the diffs are from different revisions, it's hard to make a single request to the service in order to build the whole response. With this change we solve this problem and simplify a lot fetching this piece of info.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'zj-internal-repo-path' into 'master'	Grzegorz Bizon	2018-05-28	2	-7/+5
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't pass the repository path to Gitlab Shell See merge request gitlab-org/gitlab-ce!19011
\| * \| \| \| \| \| \| \| \| \|	Return '/' as a bogus repo path to gitlab-shellzj-internal-repo-path	Jacob Vosmaer	2018-05-25	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Don't pass the repository path to Gitlab Shell	Zeger-Jan van de Weg	2018-05-17	2	-7/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This isn't a requirement, and removes deprecated method calls
* \| \| \| \| \| \| \| \| \| \|	Merge branch ↵	Rémy Coutable	2018-05-25	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'46740-projectmilestones-setting-start_date-via-the-api-requires-a-second-parameter' into 'master' Resolve "ProjectMilestones: Setting start_date via the API requires a second parameter" Closes #46740 See merge request gitlab-org/gitlab-ce!19133
\| * \| \| \| \| \| \| \| \| \| \|	Allow start_date as only parameter when updating Milestone via API	Mark Fletcher	2018-05-24	1	-1/+1
\| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '46600-fix-gitlab-revision-when-not-in-git-repo' into 'master'	Rémy Coutable	2018-05-25	5	-5/+20
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "gitlab 10.8 assumes that installation is a git working copy." Closes #46600 See merge request gitlab-org/gitlab-ce!19125
\| * \| \| \| \| \| \| \| \| \|	Replace Gitlab::REVISION with Gitlab.revision and handle installations ↵46600-fix-gitlab-revision-when-not-in-git-repo	Rémy Coutable	2018-05-24	5	-5/+20
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	without a .git directory Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \|	Merge branch 'migrate-restore-repo-to-gitaly' into 'master'	Douwe Maan	2018-05-24	1	-45/+43
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use gitaly repository_service.CreateRepositoryFromBundle to restore (rake task) Closes charts/gitlab#390 See merge request gitlab-org/gitlab-ce!18644