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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Refactor the upgrading from source docsdocs/refactor-update-guides	Yorick Peterse	2019-02-11	85	-17380/+572
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of requiring one separate document for every version (which is created by release managers), we now use a single document for both Community Edition and Enterprise Edition. This allows developers to add guidelines right away, instead of release managers having to determine what to add. Version specific upgrading instructions are placed in a separate section. This prevents instructions from lingering around for many versions should a developer forget to remove them. This also ensures that all instructions are kept in a single place, instead of being spread across different documents. A minor downside is that CE and EE guidelines now live in the same document, which could cause merge conflicts. Since we are working towards a single codebase, this should only be an issue until we merge the codebases together; something we expect to do in the coming months. This commit also removes all old upgrading instructions, but these can still be accessed using Git branch specific URLs (included in the updating README).
*	Merge branch 'fix_deployment_service_predefined_variables' into 'master'	Nick Thomas	2019-02-11	4	-1/+19
\|\ \| \| \| \| \| \| \| \|	Add missing argument to DeploymentService#predefined_variables See merge request gitlab-org/gitlab-ce!24989
\| *	Add missing argument to DeploymentService#predefined_variablesfix_deployment_service_predefined_variables	James Fargher	2019-02-08	4	-1/+19
\| \|
* \|	Merge branch 'deprecated-migration-inheritance' into 'master'	Rémy Coutable	2019-02-11	3	-2/+7
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Directly inheriting from ActiveRecord::Migration is deprecated See merge request gitlab-org/gitlab-ce!25066
\| * \|	Directly inheriting from ActiveRecord::Migration is deprecated	Jasper Maes	2019-02-09	3	-2/+7
\| \| \|
* \| \|	Merge branch 'patch-22' into 'master'	Rémy Coutable	2019-02-11	1	-1/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use timeout as it appears in logs See merge request gitlab-org/gitlab-ce!21264
\| * \| \|	use timeout as it appears in logs	Ben Bodenmiller	2019-02-11	1	-1/+2
\|/ / /
* \| \|	Merge branch '55447-validate-k8s-ca-cert' into 'master'	Dmitriy Zaporozhets	2019-02-11	5	-3/+39
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Validate k8s CA certificate at cluster creation See merge request gitlab-org/gitlab-ce!24990
\| * \| \|	Validate kubernetes cluster CA certificate55447-validate-k8s-ca-cert	Tiger	2019-02-08	5	-3/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	No certificate is still accepted, but if one is provided it must be valid. Only run validation if the certificate has changed to avoid making existing records invalid.
* \| \| \|	Merge branch '57431-sprockets-caches-files-independent-of-content' into 'master'	Lin Jen-Shin	2019-02-11	2	-5/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use correct integrity hash for sprockets caching Closes #57431 See merge request gitlab-org/gitlab-ce!25033
\| * \| \| \|	Use correct integrity hash for sprockets caching57431-sprockets-caches-files-independent-of-content	Lukas Eipert	2019-02-08	2	-5/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use self.integrity_uri over self.hexdigest_integrity_uri(digest), as the latter always returned nil leading to improper cache invalidation. We are alos enabling caching of `tmp/cache/assets/sprockets` again, to get those performance gains.
* \| \| \| \|	Merge branch 'qa-improve-wait-for-push' into 'master'	Ramya Authappan	2019-02-11	42	-106/+348
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE] Improve `wait_for_push` Closes #53308 See merge request gitlab-org/gitlab-ce!24085
\| * \| \| \| \|	[CE] Improve `wait_for_push`	Mark Lapierre	2019-02-11	42	-106/+348
\|/ / / / /
* \| \| \| \|	Merge branch 'an-peek-jaeger' into 'master'	Grzegorz Bizon	2019-02-11	6	-0/+111
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Provide a performance bar link to the Jaeger UI See merge request gitlab-org/gitlab-ce!24902
\| * \| \| \| \|	Provide a performance bar link to the Jaeger UIan-peek-jaeger	Andrew Newdigate	2019-02-08	6	-0/+111
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Jaeger is a distributed tracing tool. This change adds a "Tracing" link to the performance bar to directly link to a current request in Jaeger. This is useful for two reasons: 1 - it provides affordance to developers that the distributed tracing tool is available, so that it can quickly be discovered. 2 - it allows developers to quickly find a specific trace without having to manually navigate to a second user-interface.
* \| \| \| \| \|	Merge branch 'i18n-externalize-date-picker-string' into 'master'	Phil Hughes	2019-02-11	3	-2/+7
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Externalize date picker string See merge request gitlab-org/gitlab-ce!25068
\| * \| \| \| \| \|	Externalize date picker string	Katrin Leinweber	2019-02-10	3	-2/+7
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'docs-correct-word' into 'master'	Evan Read	2019-02-11	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: correct word See merge request gitlab-org/gitlab-ce!25065
\| * \| \| \| \| \|	Docs: correct word	Merve	2019-02-09	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'qa-staging-32-fix-create-project-spec' into 'master'	Ramya Authappan	2019-02-11	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix create_project_spec Closes gitlab-org/quality/staging#32 See merge request gitlab-org/gitlab-ce!25029
\| * \| \| \| \| \| \|	Use search_and_select instead of select_itemqa-staging-32-fix-create-project-spec	Sanad Liaquat	2019-02-08	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'removes-milestone-from-cluster-base-domain-docs' into 'master'	Evan Read	2019-02-11	1	-4/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes milestone from cluster base domain documentation See merge request gitlab-org/gitlab-ce!25045
\| * \| \| \| \| \| \| \|	Removes milestone from cluster base domainremoves-milestone-from-cluster-base-domain-docs	Mayra Cabrera	2019-02-08	1	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	12.0 milestone was removed from cluster base domain on AutoDevOps documentation to avoid making fake promises.
* \| \| \| \| \| \| \| \|	Merge branch 'pl-copy-still-active' into 'master'	Stan Hu	2019-02-10	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix error when reloading code in Sidekiq Closes #54320 See merge request gitlab-org/gitlab-ce!25069
\| * \| \| \| \| \| \| \|	Fix error when reloading code in Sidekiqpl-copy-still-active	Peter Leitzen	2019-02-10	1	-1/+1
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit fixes the following error in development: ArgumentError: A copy of Gitlab::Metrics::Transaction has been removed from the module tree but is still active!
* \| \| \| \| \| \| \|	Merge branch ↵56965-rocket-mouseover-very-sensitive-alters-flag-positioning	Phil Hughes	2019-02-08	2	-2/+27
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'57428-actionview-template-error-undefined-method-for-nil-nilclass' into 'master' Resolve "ActionView::Template::Error: undefined method `>' for nil:NilClass" Closes #57428 See merge request gitlab-org/gitlab-ce!25028
\| * \| \| \| \| \| \| \|	Improved readability of issues related MR status spec57428-actionview-template-error-undefined-method-for-nil-nilclass	Constance Okoghenun	2019-02-08	1	-1/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Added tests for merge_request_status partial	Jan Provaznik	2019-02-08	1	-0/+21
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Checking MR status date for related MR status tooltip	Constance Okoghenun	2019-02-08	1	-2/+5
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed related MR status tooltip content when MR status date is not available.
* \| \| \| \| \| \| \|	Merge branch 'diff-fuzzy-file-finder-feature-flag' into 'master'	Filipa Lacerda	2019-02-08	3	-13/+64
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds a feature flag to the diff fuzzy file finder Closes #57403 See merge request gitlab-org/gitlab-ce!25006
\| * \| \| \| \| \| \| \|	Adds a feature flag to the diff fuzzy file finder	Phil Hughes	2019-02-08	3	-13/+64
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57403
* \| \| \| \| \| \| \| \|	Merge branch 'chart-js-updates' into 'master'	Phil Hughes	2019-02-08	8	-88/+219
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update `chart.js` to 2.7.2 See merge request gitlab-org/gitlab-ce!24771
\| * \| \| \| \| \| \| \|	Update `chart.js` to 2.7.2	Andrew Fontaine	2019-02-08	8	-88/+219
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'qa-staging-33-wait-for-viewers-to-load' into 'master'	Mark Lapierre	2019-02-08	3	-2/+16
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix push_http_private_token_spec by waiting for viewers to load Closes gitlab-org/quality/staging#33 See merge request gitlab-org/gitlab-ce!25030
\| * \| \| \| \| \| \| \|	Wait for viewers to loadqa-staging-33-wait-for-viewers-to-load	Sanad Liaquat	2019-02-08	3	-2/+16
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds qa-spinner class and wait for it to go away before making assertions.
* \| \| \| \| \| \| \|	Merge branch 'docs/container-registry-api-introduced' into 'master'	Marcia Ramos	2019-02-08	1	-1/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mention when the Registry API was introduced See merge request gitlab-org/gitlab-ce!24596
\| * \| \| \| \| \| \| \|	Mention when the Registry API was introduced	Achilleas Pipinellis	2019-02-08	1	-1/+3
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'mr-web-worker-origin' into 'master'	Filipa Lacerda	2019-02-08	3	-10/+14
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes diff web worker not loading in staging See merge request gitlab-org/gitlab-ce!25039
\| * \| \| \| \| \| \| \|	Fixes diff web worker not loading in staging	Phil Hughes	2019-02-08	3	-10/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/quality/staging/issues/34
* \| \| \| \| \| \| \| \|	Merge branch 'docs-branches-api-search' into 'master'	Achilleas Pipinellis	2019-02-08	1	-5/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify search parameter in the branches API docs See merge request gitlab-org/gitlab-ce!24703
\| * \| \| \| \| \| \| \| \|	Clarify search parameter in the branches API docsdocs-branches-api-search	Lukas Eipert	2019-01-30	1	-5/+4
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'patch-40' into 'master'	Achilleas Pipinellis	2019-02-08	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update group permission docs See merge request gitlab-org/gitlab-ce!24768
\| * \| \| \| \| \| \| \| \| \|	Add that "developer" permissions level can create projects in a group.patch-40	Caroline Wainaina	2019-01-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'patch-41' into 'master'	Achilleas Pipinellis	2019-02-08	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Add link to API for GitHub imports See merge request gitlab-org/gitlab-ce!24808
\| * \| \| \| \| \| \| \| \| \| \|	Add link to API for GitHub importspatch-41	Blair Lunceford	2019-01-30	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'winh-draft_note_spec-vue-test-utils' into 'master'	Phil Hughes	2019-02-08	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor draft_note_spec.js to Vue test utils (CE backport) See merge request gitlab-org/gitlab-ce!25016
\| * \| \| \| \| \| \| \| \| \| \| \|	Refactor draft_note_spec.js to Vue test utils (CE backport)	Winnie Hellmann	2019-02-08	1	-0/+1
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs/fix-anchor-link' into 'master'	Achilleas Pipinellis	2019-02-08	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes link to wrong section See merge request gitlab-org/gitlab-ce!24811
\| * \| \| \| \| \| \| \| \| \| \|	Fixes link to wrong sectiondocs/fix-anchor-link	Evan Read	2019-01-31	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs/uplift-broadcast-messages-api-doc' into 'master'	Achilleas Pipinellis	2019-02-08	2	-35/+68
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor broadcast message API page See merge request gitlab-org/gitlab-ce!24920