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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix race condition with polling when saving notesfix-comment-race-condition	Heinrich Lee Yu	2019-07-15	2	-2/+7
\| \| \| \| \|	eTagPoll may not be initialized yet when we save a note. Polling is initialized only after discussions are loaded
*	Merge branch 'remove-obsolete-chaos-routes' into 'master'	Lin Jen-Shin	2019-07-15	1	-7/+0
\|\ \| \| \| \| \| \| \| \|	Remove obsolete chaos routes See merge request gitlab-org/gitlab-ce!30706
\| *	Remove obsolete chaos routesremove-obsolete-chaos-routes	Luke Bennett	2019-07-13	1	-7/+0
\| \|
* \|	Merge branch 'docs-markdown-lint-update' into 'master'	Evan Read	2019-07-15	2	-4/+21
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update markdown lint style and option files See merge request gitlab-org/gitlab-ce!30595
\| * \|	Update markdown lint style and option files	Marcel Amirault	2019-07-15	2	-4/+21
\|/ / \| \| \| \| \| \| \| \| \| \|	Add commented lines explaining the file, and including rules that should pass already, and commented out rules that can be added in the future, for reference.
* \|	Merge branch 'docs-blank-lines' into 'master'	Evan Read	2019-07-15	27	-203/+44
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Remove extra blank lines from docs See merge request gitlab-org/gitlab-ce!30650
\| * \|	Remove extra blank lines from docs	Marcel Amirault	2019-07-15	27	-203/+44
\|/ / \| \| \| \| \| \| \| \| \| \|	Removing extra blank lines in docs that serve no purpose, as well as some --- lines that also are not needed.
* \|	Merge branch 'docs/secure-rm-deprecated-jobs' into 'master'	Evan Read	2019-07-15	5	-523/+75
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove deprecated docs sections of Secure jobs Closes #63739 See merge request gitlab-org/gitlab-ce!30527
\| * \|	Remove deprecated docs sections of Secure jobsdocs/secure-rm-deprecated-jobs	Achilleas Pipinellis	2019-07-09	5	-523/+75
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The manual job definitions are deprecated and are not guaranteed to work as expected. We should not confuse our users with including them in the docs. This deletes all the deprecated sections and cleans up the configuration section significantly.
* \| \|	Merge branch 'docs-trailing-spaces-2' into 'master'	Evan Read	2019-07-15	15	-96/+95
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove trailing whitespace in docs (part 2) See merge request gitlab-org/gitlab-ce!30649
\| * \| \|	Remove trailing whitespace in docs	Marcel Amirault	2019-07-15	15	-96/+95
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Remove unneeded trailing whitespace in lines in /security /workflow /user docs
* \| \|	Merge branch 'ce-port-ee-10565' into 'master'	Grzegorz Bizon	2019-07-14	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Single codebase: Remove an extra whitespace in test files See merge request gitlab-org/gitlab-ce!30710
\| * \| \|	Remove an extra whitespace in test files	Takuya Noguchi	2019-07-14	1	-1/+1
\| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Partial CE backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10565 Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* \| \|	Merge branch 'typo-fix' into 'master'	Stan Hu	2019-07-13	48	-48/+48
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \|	Fix typo "beetween" in timeout validation message See merge request gitlab-org/gitlab-ce!30705
\| * \|	Fix typo "beetween" in timeout validation message	Daniel Danner	2019-07-13	48	-48/+48
\|/ /
* \|	Merge branch 'qa-unquarantine-autodevops-spec' into 'master'	Dan Davison	2019-07-12	1	-2/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unquarantine previously failing autodevops spec Closes gitlab-org/quality/nightly#108 See merge request gitlab-org/gitlab-ce!30691
\| * \|	Unquarantine previously failing autodevops spec	ddavison	2019-07-12	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	create_project_with_auto_devops_spec.rb # runs autodevops was previous failing This previously failing test has passed consecutively
* \| \|	Merge branch '11470-snowplow-tracking-for-notes-does-not-work-in-firefox' ↵	Clement Ho	2019-07-12	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' CE backport of reply button tracker refactor See merge request gitlab-org/gitlab-ce!28298
\| * \|	CE backport of reply button tracker refactor11470-snowplow-tracking-for-notes-does-not-work-in-firefox	Constance Okoghenun	2019-05-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	EE MR https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/12578
* \| \|	Merge branch 'winh-multiple-boards-service' into 'master'	Mike Greiling	2019-07-12	3	-0/+209
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move functions for multiple boards in BoardService to core (CE-backport) See merge request gitlab-org/gitlab-ce!30624
\| * \| \|	Add functions for multiple boards to BoardService	Winnie Hellmann	2019-07-12	3	-0/+209
\|/ / / \| \| \| \| \| \| \| \| \|	(cherry picked from commit 9dbefac95a8b60b93ba7b05fd7bf69b80b395f54)
* \| \|	Merge branch 'qa-nightly-115-fix-retry-until' into 'master'	Dan Davison	2019-07-12	3	-5/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE port of "Fix page refresh in retry_until" See merge request gitlab-org/gitlab-ce!30656
\| * \| \|	Fix page refresh in retry_untilqa-nightly-115-fix-retry-until	Sanad Liaquat	2019-07-12	3	-5/+5
\| \| \| \|
* \| \| \|	Merge branch '64416-lodash-4.6.2-for-prototype-pollution' into 'master'	Mike Greiling	2019-07-12	2	-6/+11
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update lodash to 4.7.14 and lodash.mergewith to 4.6.2 Closes #64416 See merge request gitlab-org/gitlab-ce!30602
\| * \| \| \|	Update lodash to 4.7.14 and lodash.mergewith to 4.6.2	Takuya Noguchi	2019-07-11	2	-6/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* \| \| \| \|	Merge branch 'button-bug-fixes' into 'master'	Annabel Dunstone Gray	2019-07-12	2	-1/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Project Badge Buttons See merge request gitlab-org/gitlab-ce!30678
\| * \| \| \| \|	Fix Project Buttons	Andrew Fontaine	2019-07-12	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correct the border colour of the count badge buttons.
* \| \| \| \| \|	Merge branch 'z-index-fix-for-diff-file-dropdown' into 'master'	Fatih Acet	2019-07-12	2	-1/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	z-index fixed for diff file dropdown See merge request gitlab-org/gitlab-ce!30657
\| * \| \| \| \| \|	z-index fixed for diff file dropdown	Faruk Can	2019-07-12	2	-1/+6
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'docs/fix-link-on-e2e-quick-start-guide' into 'master'	Walmyr	2019-07-12	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix link on end-to-end quick start guide doc See merge request gitlab-org/gitlab-ce!30680
\| * \| \| \| \| \|	Fix link on end-to-end quick start guide doc	Walmyr Lima	2019-07-12	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'remove-auto-ssl-ff' into 'master'	Nick Thomas	2019-07-12	11	-102/+46
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove auto ssl feature flags See merge request gitlab-org/gitlab-ce!30628
\| * \| \| \| \| \| \|	Remove auto ssl feature flags	Vladimir Shushlin	2019-07-12	11	-102/+46
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remove feature flag for admin settings * remove feature flag for domain settings
* \| \| \| \| \| \|	Merge branch 'fix-only-https-pages-domains' into 'master'	Nick Thomas	2019-07-12	2	-12/+27
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix saving domain without certificate for auto_ssl See merge request gitlab-org/gitlab-ce!30673
\| * \| \| \| \| \| \|	Fix saving domain without certificate for auto_sslfix-only-https-pages-domains	Vladimir Shushlin	2019-07-12	2	-12/+27
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '51952-redirect-to-webide-in-fork' into 'master'	Sean McGivern	2019-07-12	4	-8/+47
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Open WebIDE in fork when user doesn't have access See merge request gitlab-org/gitlab-ce!30642
\| * \| \| \| \| \| \|	Open WebIDE in fork when user doesn't have access51952-redirect-to-webide-in-fork	Markus Koller	2019-07-12	4	-8/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When opening the IDE on a project where the user doesn't have push access, we create a fork and then redirect back to the IDE. To make sure the user can actually commit, we need to open the IDE in the forked project rather than the upstream project.
* \| \| \| \| \| \| \|	Merge branch '64356-pin-external-dns-version' into 'master'	Grzegorz Bizon	2019-07-12	1	-3/+4
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ReviewApps: CI pin external-dns to 2.x version Closes #64356 See merge request gitlab-org/gitlab-ce!30577
\| * \| \| \| \| \| \|	ReviewApps: CI pin external-dns to 2.x version64356-pin-external-dns-version	Jason Plum	2019-07-12	1	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pin the version of deployed external-dns to `2.y.z`, using SemVer matching. (`^2.2.1`) Update the properties for the service account keys per Upgrading to 2.0.0 of the `stable/external-dns` README. Add `aws.batchChangeSize=400` to combat messages about RDATA being too large. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64356
* \| \| \| \| \| \| \|	Merge branch 'id-clean-up-mr-assignees' into 'master'	Douwe Maan	2019-07-12	1	-4/+0
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backports of "Remove feature flag behind MR's multiple assignees" See merge request gitlab-org/gitlab-ce!30261
\| * \| \| \| \| \| \|	Backports of "Remove feature flag behind MR's multiple assignees"	Igor	2019-07-12	1	-4/+0
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'update-pages-to-1.7.0' into 'master'	Nick Thomas	2019-07-12	2	-1/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update GitLab Pages to v1.7.0 See merge request gitlab-org/gitlab-ce!30664
\| * \| \| \| \| \| \|	Update GitLab Pages to v1.7.0	Vladimir Shushlin	2019-07-12	2	-1/+6
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'js-specs-transactions' into 'master'	Andreas Brandl	2019-07-12	8	-29/+85
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use transactions in JS feature specs Closes #60207 See merge request gitlab-org/gitlab-ce!27496
\| * \| \| \| \| \|	Use transactions in JS feature specsjs-specs-transactions	Heinrich Lee Yu	2019-07-12	8	-29/+85
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Uses Rails transactional tests instead of DatabaseCleaner transaction strategy because that doesn't work with JS tests
* \| \| \| \| \| \|	Merge branch 'id-clean-up-mr-assignees-migration' into 'master'	Andreas Brandl	2019-07-12	4	-6/+53
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add cleanup migration for MR's multiple assignees See merge request gitlab-org/gitlab-ce!30269
\| * \| \| \| \| \| \|	Add cleanup migration for MR's mutliple assigneesid-clean-up-mr-assignees-migration	Igor Drozdov	2019-07-09	4	-6/+53
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The migration steals the remaining background jobs of populating MRs with assignees, executes them synchronously and then makes sure that all the assignees are migrated
* \| \| \| \| \| \| \|	Merge branch 'bvl-rename-routes-after-user-rename' into 'master'	Jan Provaznik	2019-07-12	19	-60/+431
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set the name of a user-namespace to the user name See merge request gitlab-org/gitlab-ce!23272
\| * \| \| \| \| \| \| \|	Fix incorrect namespaces & route for user-routes	Bob Van Landuyt	2019-07-09	5	-0/+356
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes the `Namespace#name` and `Route#name` for all user namespaces and their personal projects in case they don't match the user name anymore. More info info in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23272
\| * \| \| \| \| \| \| \|	Lesser Namespace#name validations	Bob Van Landuyt	2019-07-09	3	-22/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since we use `Namespace#path` to build routes and URLs we can lessen the restrictions on `Namespace#name` so it can accomodate a user's name.