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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add timeouts for Gitaly calls	Andrew Newdigate	2017-11-29	5	-23/+65
\|
*	Merge branch 'dm-search-pattern' into 'master'	Sean McGivern	2017-11-29	1	-6/+19
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Use fuzzy search with minimum length of 3 characters where appropriate Closes #40512 See merge request gitlab-org/gitlab-ce!15592
\| *	Use fuzzy search with minimum length of 3 characters where appropriatedm-search-pattern	Douwe Maan	2017-11-27	1	-0/+6
\| \|
\| *	Modify fuzzy_arel_match to search for equality when a term shorter than 3 ↵	Douwe Maan	2017-11-27	1	-5/+12
\| \| \| \| \| \| \| \|	characters is provided
\| *	Rename to_fuzzy_arel to fuzzy_arel_match	Douwe Maan	2017-11-24	1	-1/+1
\| \|
* \|	Merge branch ↵	Rémy Coutable	2017-11-28	1	-1/+7
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'40530-merge-request-generates-wrong-diff-when-branch-and-tag-have-the-same-name' into 'master' Resolve "Merge request generates wrong diff when branch and tag have the same name" Closes #40530 See merge request gitlab-org/gitlab-ce!15591
\| * \|	Ensure MRs always use branch refs for comparison	Sean McGivern	2017-11-28	1	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If a merge request was created with a branch name that also matched a tag name, we'd generate a comparison to or from the tag respectively, rather than the branch. Merging would still use the branch, of course. To avoid this, ensure that when we get the branch heads, we prepend the reference prefix for branches, which will ensure that we generate the correct comparison.
* \| \|	Merge branch 'zj-controller-action-gitaly-metrics' into 'master'	Rémy Coutable	2017-11-28	1	-7/+42
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add controller#action metrics on Gitaly See merge request gitlab-org/gitlab-ce!15244
\| * \| \|	Add controller#action metrics on Gitaly	Zeger-Jan van de Weg	2017-11-28	1	-7/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	At this time we had good metrics on what number or requests each GRPC received, but were in the dark what controller#action combination was responsable. Or if Sidekiq was responsable. Now added are call counts per service and rpc matched with controller#action combinations.
* \| \| \|	Merge branch 'hashed-storage-attachments-migration-path' into 'master'	Nick Thomas	2017-11-28	1	-15/+70
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hashed storage attachments migration path See merge request gitlab-org/gitlab-ce!15352
\| * \| \| \|	Improve storage migration rake task	Gabriel Mazetto	2017-11-23	1	-15/+70
\| \| \| \| \|
* \| \| \| \|	Merge branch 'tm/feature/list-runners-jobs-api' into 'master'	Kamil Trzciński	2017-11-28	2	-7/+42
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add new API endpoint - list jobs of a specified runner Closes #39699 See merge request gitlab-org/gitlab-ce!15432
\| * \| \| \| \|	Refactorize jobs finding logic	Tomasz Maczukin	2017-11-28	1	-6/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Modify output	Tomasz Maczukin	2017-11-28	2	-6/+9
\| \| \| \| \| \|
\| * \| \| \| \|	Allow filtering by 'status'	Tomasz Maczukin	2017-11-28	1	-1/+8
\| \| \| \| \| \|
\| * \| \| \| \|	Add information about project	Tomasz Maczukin	2017-11-28	2	-6/+17
\| \| \| \| \| \|
\| * \| \| \| \|	Add new API endpoint - list jobs of a specified runner	Tomasz Maczukin	2017-11-28	1	-0/+18
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'tm/feature/namespace-by-id-api' into 'master'	Kamil Trzciński	2017-11-28	2	-0/+32
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add new API endpoint - get a namespace by ID Closes #40254 See merge request gitlab-org/gitlab-ce!15442
\| * \| \| \|	Introduce :read_namespace access policy for namespace and group	Tomasz Maczukin	2017-11-23	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Allow request namespace by ID or path	Tomasz Maczukin	2017-11-23	2	-16/+24
\| \| \| \| \|
\| * \| \| \|	Add new API endpoint - get a namespace by ID	Tomasz Maczukin	2017-11-23	1	-0/+24
\| \| \| \| \|
* \| \| \| \|	Merge branch '39601-create-issuable-destroy-service' into 'master'	Rémy Coutable	2017-11-27	2	-2/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create issue and merge request destroy services Closes #39601 See merge request gitlab-org/gitlab-ce!15604
\| * \| \| \| \|	Create issue and merge request destroy services	George Andrinopoulos	2017-11-25	2	-2/+6
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	static-analysis fix40352-ignore-hashed-repos-cleanup-dirs	digitalMoksha	2017-11-25	1	-2/+1
\| \| \| \| \|
* \| \| \| \|	refactored the hashed repository name	digitalMoksha	2017-11-25	1	-2/+5
\| \| \| \| \|
* \| \| \| \|	ignore hashed repositories when doing rake gitlab:cleanup:dirs	digitalMoksha	2017-11-24	1	-1/+2
\|/ / / /
* \| \| \|	Merge branch 'jej/fix-protected-branch-validations-ce' into 'master'	Rémy Coutable	2017-11-24	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix ProtectedBranch access level validations See merge request gitlab-org/gitlab-ce!15586
\| * \| \| \|	Fix ProtectedBranch access level validations	James Edwards-Jones	2017-11-24	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before an access_level was required in EE even when an it had been set for a user/group.
* \| \| \| \|	Drastically improve project search performance by no longer searching ↵dm-project-search-performance	Douwe Maan	2017-11-24	1	-1/+1
\| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	namespace name
* \| \| \|	Merge branch 'dm-fix-registry-with-sudo-token' into 'master'	Sean McGivern	2017-11-24	1	-15/+10
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix pulling and pushing using a personal access token with the sudo scope Closes #40466 See merge request gitlab-org/gitlab-ce!15571
\| * \| \| \|	Fix pulling and pushing using a personal access token with the sudo scopedm-fix-registry-with-sudo-token	Douwe Maan	2017-11-23	1	-15/+10
\| \| \| \| \|
* \| \| \| \|	Merge branch 'pawel/update_prometheus_gem_to_well_tested_version' into 'master'	Douwe Maan	2017-11-24	2	-24/+15
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Prometheus Gem version and disable Prometheus method call instrumentation by default. Closes gitlab-ee#4139 and #40457 See merge request gitlab-org/gitlab-ce!15558
\| * \| \| \| \|	Use feature flag instead of application settigns to control if method calls ↵pawel/update_prometheus_gem_to_well_tested_version	Pawel Chojnacki	2017-11-23	2	-6/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	should be instrumented
\| * \| \| \| \|	Use only real duration to measure method call performance via Prometheus	Pawel Chojnacki	2017-11-23	1	-21/+6
\| \| \| \| \| \|
\| * \| \| \| \|	check method timing threshold when observing method performance	Pawel Chojnacki	2017-11-23	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Reenable prometheus metrics	Pawel Chojnacki	2017-11-23	1	-3/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Move prometheus middle ware to prometheus initialized.	Pawel Chojnacki	2017-11-23	2	-2/+11
\| \| \| \| \| \|
* \| \| \| \| \|	Fix hashed storage for attachments bugs	James Lopez	2017-11-23	1	-2/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'dm-cleanup-fetch-and-mirror-methods' into 'master'	Sean McGivern	2017-11-23	5	-41/+47
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean up repository fetch and mirror methods See merge request gitlab-org/gitlab-ce!15424
\| * \| \| \| \| \|	Rename fetch_refs to refmap	Douwe Maan	2017-11-23	4	-22/+23
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Clean up repository fetch and mirror methods	Douwe Maan	2017-11-23	5	-38/+43
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'jej-rename-legacy-protected-branches-api-service' into 'master'	Rémy Coutable	2017-11-23	1	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Renamed ProtectedBranches::ApiUpdateService to LegacyApiUpdateService See merge request gitlab-org/gitlab-ce!15575
\| * \| \| \| \| \|	Renamed ProtectedBranches::ApiUpdateService to LegacyApiUpdateServicejej-rename-legacy-protected-branches-api-service	James Edwards-Jones	2017-11-23	1	-2/+2
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch '39887-move-identical-check-to-merged-branches' into 'master'	Douwe Maan	2017-11-23	2	-4/+18
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move identical merged branch check to merged_branch_names Closes #39887 See merge request gitlab-org/gitlab-ce!15464
\| * \| \| \| \| \|	Move identical merged branch check to merged_branch_names	Lin Jen-Shin	2017-11-23	2	-4/+18
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'reviewing-db-changes' into 'master'	Rémy Coutable	2017-11-23	13	-0/+104
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added Rubocop config for background migrations See merge request gitlab-org/gitlab-ce!15576
\| * \| \| \| \| \|	Added Rubocop config for background migrationsreviewing-db-changes	Yorick Peterse	2017-11-23	13	-0/+104
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds a Rubocop configuration file specific to lib/gitlab/background_migrations. This configuration will be used to (hopefully) make reviewing background migrations easier by enforcing stricter rules compared to the rest of GitLab. Because this configuration is directory specific it will only affect background migrations.
* \| \| \| \| \| \|	Merge branch 'use-merge-requests-diff-id-column' into 'master'	Douwe Maan	2017-11-23	2	-1/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use foreign key to get latest MR diff Closes #37631 See merge request gitlab-org/gitlab-ce!15126
\| * \| \| \| \| \| \|	Use latest_merge_request_diff association	Sean McGivern	2017-11-23	2	-1/+3
\| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Compared to the merge_request_diff association: 1. It's simpler to query. The query uses a foreign key to the merge_request_diffs table, so no ordering is necessary. 2. It's faster for preloading. The merge_request_diff association has to load every diff for the MRs in the set, then discard all but the most recent for each. This association means that Rails can just query for N diffs from N MRs. 3. It's more complicated to update. This is a bidirectional foreign key, so we need to update two tables when adding a diff record. This also means we need to handle this as a special case when importing a GitLab project. There is some juggling with this association in the merge request model: * `MergeRequest#latest_merge_request_diff` is _always_ the latest diff. * `MergeRequest#merge_request_diff` reuses `MergeRequest#latest_merge_request_diff` unless: * Arguments are passed. These are typically to force-reload the association. * It doesn't exist. That means we might be trying to implicitly create a diff. This only seems to happen in specs. * The association is already loaded. This is important for the reasons explained in the comment, which I'll reiterate here: if we a) load a non-latest diff, then b) get its `merge_request`, then c) get that MR's `merge_request_diff`, we should get the diff we loaded in c), even though that's not the latest diff. Basically, `MergeRequest#merge_request_diff` is the latest diff in most cases, but not quite all.
* \| \| \| \| \| \|	Merge branch 'jk-group-mentions-fix' into 'master'	Sean McGivern	2017-11-23	1	-1/+2
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix link text from group context Closes gitlab-ee#4100 See merge request gitlab-org/gitlab-ce!15565