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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update JIRA service API docpatch-48	Blair Lunceford	2019-03-21	1	-2/+2
\|
*	Merge branch '59147-duplicate-match-line' into 'master'	Douwe Maan	2019-03-21	4	-11/+28
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix duplicated bottom match line Closes #59147 See merge request gitlab-org/gitlab-ce!26402
\| *	Fix diff bottom expand button appears twice	Mark Chao	2019-03-21	4	-11/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a quick fix by only append match line once when calling diff_lines_for_serializer multiple time. Also enable feature by default
* \|	Merge branch '10514-fix-non-existing-authorized-keys-file' into 'master'	Nick Thomas	2019-03-21	2	-45/+145
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Handle cases when authorized_keys doesn't exist See merge request gitlab-org/gitlab-ce!26347
\| * \|	Update Gitlab::AuthorizedKeys specs to be clearer	Patrick Bajao	2019-03-21	1	-4/+40
\| \| \|
\| * \|	Handle cases when authorized_keys doesn't exist	Patrick Bajao	2019-03-20	2	-46/+110
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Modify Gitlab::AuthorizedKeys#rm_key and #list_key_ids to handle cases when an `Errno::ENOENT` is raised. Also added test cases in spec to ensure each method will still work when authorized_keys doesn't exist.
* \| \|	Merge branch 'doc-feature-flag-command' into 'master'	Achilleas Pipinellis	2019-03-21	1	-0/+14
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation reference for chatops feature flag commands See merge request gitlab-org/gitlab-ce!26425
\| * \| \|	Add documentation reference for chatops feature flag commands	Jacob Vosmaer	2019-03-21	1	-0/+14
\| \| \| \|
* \| \| \|	Merge branch 'ab-db-review-issue-template' into 'master'	Douwe Maan	2019-03-21	1	-0/+32
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add issue template for database reviewer See merge request gitlab-org/gitlab-ce!25867
\| * \| \| \|	Add issue template for database reviewer	Andreas Brandl	2019-03-20	1	-0/+32
\| \| \| \| \|
* \| \| \| \|	Merge branch 'nfriend-update-merge-request-widget-pipeline-block' into 'master'	Filipa Lacerda	2019-03-21	11	-18/+328
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update merge request widget pipeline block to accommodate post-merge pipelines See merge request gitlab-org/gitlab-ce!25745
\| * \| \| \| \|	Update merge request widget pipeline block	Nathan Friend	2019-03-21	11	-18/+328
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit updates the pipeline block that appears on the merge request page to include information that will be exposed by the API as part of the post-merge pipeline feature.
* \| \| \| \|	Merge branch 'mw-i18n-admin-controllers' into 'master'	Lin Jen-Shin	2019-03-21	16	-61/+235
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Externalize strings in admin controllers See merge request gitlab-org/gitlab-ce!26357
\| * \| \| \| \|	Externalize strings in admin controllers	Martin Wortschack	2019-03-21	16	-61/+235
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Update PO file
* \| \| \| \| \|	Merge branch 'ek-clarify-creating-feature-flags' into 'master'	Stan Hu	2019-03-21	1	-0/+16
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	docs: Adds information and links to clarify how to create feature flags See merge request gitlab-org/gitlab-ce!26349
\| * \| \| \| \| \|	Adds info and links on creating feature flags	Ezekiel Kigbo	2019-03-21	1	-0/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds A short summary of the steps to create and use feature flags in development for frontend developers who might be unfamiliar with `rails` and or `flipper`. Adds links to further reading in the development guide.
* \| \| \| \| \| \|	Merge branch ↵	Kushal Pandya	2019-03-21	3	-7/+9
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'59189-long-names-in-project-path-namespace-dropdown-breaks-past-container' into 'master' Resolve "Long names in project path namespace dropdown breaks past container" Closes #59189 See merge request gitlab-org/gitlab-ce!26343
\| * \| \| \| \| \| \|	Prevent namespace dropdown in new project form from exceeding container	Dennis Tang	2019-03-20	3	-7/+9
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '59289-fix-push-to-create-protected-branches' into 'master'	Douwe Maan	2019-03-21	5	-31/+61
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow users to create protected branches via CLI Closes #59289 See merge request gitlab-org/gitlab-ce!26413
\| * \| \| \| \| \| \|	Allow users to create protected branches via CLI	Patrick Bajao	2019-03-21	5	-31/+61
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is for fixing a regression introduced by: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24969 This fix will allow users who are allowed to push to protected branches to create protected branches via CLI as well, just like before. The checks for protected branch creation won't need to run.
* \| \| \| \| \| \| \|	Merge branch '59117-inconsistent-hover-behavior-on-navbar-items' into 'master'	Kushal Pandya	2019-03-21	3	-3/+10
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Inconsistent hover behavior on navbar items" Closes #59117 See merge request gitlab-org/gitlab-ce!26345
\| * \| \| \| \| \| \|	Reset top position overridden by global button svg style	Dennis Tang	2019-03-20	1	-1/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix hover animation consistency in top navbar items	Dennis Tang	2019-03-20	2	-2/+7
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '59293-android-template-is-missing-gitlab-ci-yml' into 'master'	Nick Thomas	2019-03-21	2	-0/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Android template is missing .gitlab-ci.yml" Closes #59293 See merge request gitlab-org/gitlab-ce!26415
\| * \| \| \| \| \| \|	Resolve "Android template is missing .gitlab-ci.yml"	Jason Lenny	2019-03-21	2	-0/+5
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'revert-1efa9604' into 'master'	James Lopez	2019-03-21	6	-160/+31
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Enrich commits with full data in CommitCollection" See merge request gitlab-org/gitlab-ce!26412
\| * \| \| \| \| \| \|	Revert "Merge branch ↵	Sean McGivern	2019-03-21	6	-160/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'58805-allow-incomplete-commit-data-to-be-fetched-from-collection' into 'master'" This reverts merge request !26144
* \| \| \| \| \| \| \|	Merge branch '59288-review-build-cng-fails-if-the-last-commit-skips-ci' into ↵	Lin Jen-Shin	2019-03-21	1	-1/+0
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Use the default git clone depth for the review-build-cng job Closes #59288 See merge request gitlab-org/gitlab-ce!26410
\| * \| \| \| \| \| \|	Use the default git clone depth for the review-build-cng job59288-review-build-cng-fails-if-the-last-commit-skips-ci	Rémy Coutable	2019-03-21	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch 'nfriend-update-job-detail-view-sidebar' into 'master'	Filipa Lacerda	2019-03-21	5	-49/+316
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update job detail view sidebar to accommodate post-merge pipelines See merge request gitlab-org/gitlab-ce!25777
\| * \| \| \| \| \| \|	Update job detail sidebar for post-merge pipelines	Nathan Friend	2019-03-20	5	-49/+316
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit updates the job detail view sidebar to accommodate new states introduced as part of the post-merge pipeline feature.
* \| \| \| \| \| \|	Merge branch 'gitaly-version-v1.29.0' into 'master'	Douwe Maan	2019-03-21	2	-1/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade Gitaly to v1.29.0 See merge request gitlab-org/gitlab-ce!26406
\| * \| \| \| \| \| \|	Upgrade Gitaly to v1.29.0	GitalyBot	2019-03-21	2	-1/+6
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'osw-multi-line-suggestions-parsing' into 'master'	Grzegorz Bizon	2019-03-21	11	-9/+167
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prepare multi-line suggestions for rendering in Markdown See merge request gitlab-org/gitlab-ce!26107
\| * \| \| \| \| \| \|	Implement multi-line suggestions filtering	Oswaldo Ferreira	2019-03-20	11	-9/+167
\| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implements the filtering logic for `suggestion:-x+y` syntax.
* \| \| \| \| \| \|	Merge branch 'nfriend-update-pipeline-list-view' into 'master'	Filipa Lacerda	2019-03-21	10	-66/+302
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update pipeline list view to accommodate post-merge request pipelines See merge request gitlab-org/gitlab-ce!25690
\| * \| \| \| \| \| \|	Update pipeline list view	Nathan Friend	2019-03-20	10	-66/+302
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit updates the pipeline page and related components to include new pipeline information added by the post-merge pipeline feature.
* \| \| \| \| \| \|	Merge branch 'ce-1974-update-user-name-upon-ldap-sync' into 'master'	Douwe Maan	2019-03-21	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle nil name in Gitlab::Auth::LDAP::Person#name See merge request gitlab-org/gitlab-ce!26364
\| * \| \| \| \| \|	Handle nil name in Gitlab::Auth::LDAP::Person#name	Rémy Coutable	2019-03-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch ↵	Sean McGivern	2019-03-21	6	-31/+160
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'58805-allow-incomplete-commit-data-to-be-fetched-from-collection' into 'master' Enrich commits with full data in CommitCollection Closes #58805 See merge request gitlab-org/gitlab-ce!26144
\| * \| \| \| \| \| \|	Handle blank projects in CommitCollection#enrich!	Luke Duncalfe	2019-03-21	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A project is needed in order to fetch data from gitaly. Projects can be absent from commits in certain rare situations (like when viewing a MR of a deleted fork). In these cases, assume that the enriched data is not needed. See this comment: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/26144#note_152191106 "It's led to a dilemma about where to "fix" this in code. I'm going to fix it by allowing CommitCollection#enrich! to just return unenriched commits when a project is missing, essentially "silently failing". I hope this is the right decision. It's going with the assumption that calls in these situations in the future are not needing the full data. The alternative would be to allow CommitCollection#enrich! to still error, but handle it in the methods that call #enrich!, however that might lead to brittleness in future when working with project-less MRs."
\| * \| \| \| \| \| \|	Scope out merge commits in MergeRequest spec	Luke Duncalfe	2019-03-18	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously the code for excluding merge commits from the commit collection (CommitCollection#without_merge_commits) was not working when the commits had come from a merge request. Now that this has been fixed, these tests fails. They should always have been written to exclude merge commits when comparing.
\| * \| \| \| \| \| \|	Enrich commits with full data in CommitCollection	Luke Duncalfe	2019-03-18	6	-29/+154
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow incomplete commit records to load their full data from gitaly. Commits can be based on a Hash of data retrieved from PostgreSQL, and this data can be intentionally incomplete in order to save space. A new method #gitaly? has been added to Gitlab::Git::Commit, which returns true if the underlying data source of the Commit is a Gitaly::GitCommit. CommitCollection now has a method #enrich which replaces non-gitaly commits in place with commits from gitaly. CommitCollection#without_merge_commits has been updated to call this method, as in order to determine a merge commit we need to have parent data. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/58805
* \| \| \| \| \| \| \|	Merge branch 'k8s_new_deployment_labels' into 'master'	Rémy Coutable	2019-03-21	9	-15/+85
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update dashboards to additionally use new environment selector See merge request gitlab-org/gitlab-ce!25623
\| * \| \| \| \| \| \| \|	Update dashboards to additionally use new environment selector	James Fargher	2019-03-21	9	-15/+85
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Deploy boards now will check for app.gitlab.com/env and app.gitlab.com/app
* \| \| \| \| \| \| \|	Merge branch '57115-just-in-time-k8s-resource-creation' into 'master'	Clement Ho	2019-03-20	54	-51/+943
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create project-specific Kubernetes resources just-in-time See merge request gitlab-org/gitlab-ce!25586
\| * \| \| \| \| \| \| \|	Amend cluster and auto devops troubleshooting docs	Tiger	2019-03-20	2	-12/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update these sections to reflect Kubernetes resources now being created as a build prerequisite. Remove section about deploys not being triggered as it is no longer accurate.
\| * \| \| \| \| \| \| \|	Don't recreate Kubernetes namespaces if they exist	Tiger	2019-03-20	3	-7/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of attempting to create or update a Kubernetes namespace on every deploy, only do so when we know it doesn't exist yet.
\| * \| \| \| \| \| \| \|	Create one Kubernetes namespace for a deployment	Tiger	2019-03-20	5	-32/+61
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of creating a Kubernetes namespace on every cluster related to a project, only create one on the cluster the project is about to be deployed to.
\| * \| \| \| \| \| \| \|	Add feature flag for build preparing state	Tiger	2019-03-20	9	-1/+75
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The flag is on by default, but allows us to revert back to the old behaviour if we encounter any problems.