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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Backport ee to cesl-qa-staging-39-fix-assign-code-owners-spec-ce	Sanad Liaquat	2019-07-15	2	-1/+8
\|
*	Merge branch '63694-tls-opts-for-helm-wait' into 'master'	Sean McGivern	2019-07-15	4	-23/+30
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	GitLab Managed App ensure helm version uses tls opts Closes #63694 See merge request gitlab-org/gitlab-ce!30654
\| *	GitLab Managed App ensure helm version uses tls opts63694-tls-opts-for-helm-wait	Dylan Griffith	2019-07-15	4	-23/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The TLS opts were missing from helm version command which meant that it was just perpetually failing and hence wasting 30s of time waiting for a command to be successful that was never going to be successful. This never actually caused any errors because this loop will happily just fail 30 times without breaking the overall script but it was just a waste of installation time so now installing apps should be ~30s faster.
* \|	Merge branch 'mh/boards-filter-bar' into 'master'	Phil Hughes	2019-07-15	4	-29/+38
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display boards filter bar on mobile Closes #45864 See merge request gitlab-org/gitlab-ce!30120
\| * \|	Display boards filter bar on mobile	Martin Hanzel	2019-07-15	4	-29/+38
\|/ /
* \|	Merge branch 'pages-refactor-ssl-documentation' into 'master'	Achilleas Pipinellis	2019-07-15	29	-338/+456
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Pages - refactor "Custom domain / SSL" documentation Closes #47585, #60612, #44606, and #63753 See merge request gitlab-org/gitlab-ce!30363
\| * \|	Move document to new location, split in 3	Marcia Ramos	2019-07-15	29	-338/+456
\|/ / \| \| \| \| \| \| \| \|	- Move steps to new doc - Move all concepts to different docs
* \|	Merge branch 'rs-namespace-feature' into 'master'	Sean McGivern	2019-07-15	1	-0/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Namespace#feature_available no-op Closes #60908 See merge request gitlab-org/gitlab-ce!30641
\| * \|	Add Namespace#feature_available no-oprs-namespace-feature	Robert Speicher	2019-07-12	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This gets overridden in `EE::Namespace` and allows us to do things like always treat Epics as "disabled" in Core using the same checks we'd use elsewhere.
* \| \|	Merge branch '64499-add-size-96-to-avatar-sizes-in-avatar-scss' into 'master'	Kushal Pandya	2019-07-15	1	-0/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add size 96 to avatar sizes in avatar.scss" Closes #64499 See merge request gitlab-org/gitlab-ce!30671
\| * \| \|	Add size 96 to avatar sizes in avatar.scss64499-add-size-96-to-avatar-sizes-in-avatar-scss	Ammar Alakkad	2019-07-12	1	-0/+5
\| \| \| \|
* \| \| \|	Merge branch 'docs/gb/serverless-function-dockerfile-runtime' into 'master'	Evan Read	2019-07-15	1	-13/+22
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a note about implicit Dockerfile serverless runtime See merge request gitlab-org/gitlab-ce!30672
\| * \| \| \|	Add a note about implicit Dockerfile serverless runtime	Grzegorz Bizon	2019-07-15	1	-13/+22
\|/ / / /
* \| \| \|	Merge branch 'expand-acronym' into 'master'	Achilleas Pipinellis	2019-07-15	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	expand (CD) acronym See merge request gitlab-org/gitlab-ce!30646
\| * \| \| \|	expand (CD) acronym	mokha	2019-07-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	> Do not use acronyms when you can avoid it as you can't assume people > know what you are talking about. Example: instead of MR, write merge > request. - https://about.gitlab.com/handbook/communication/#writing-style-guidelines
* \| \| \| \|	Merge branch 'patch-46' into 'master'	Evan Read	2019-07-15	1	-0/+36
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add example of ENV variables for image and services. See merge request gitlab-org/gitlab-ce!27320
\| * \| \| \| \|	Fixed wrong placement of "variables:" statement in yml file.	Thad Guidry	2019-07-15	1	-0/+36
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Verified snippet works with 11.10.1
* \| \| \| \|	Merge branch 'issue/55953-docs' into 'master'	Achilleas Pipinellis	2019-07-15	52	-274/+273
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename "discussions" to "threads" in docs See merge request gitlab-org/gitlab-ce!30037
\| * \| \| \| \|	Rename "discussions" to "threads" in docs	Michel Engelen	2019-07-15	52	-274/+273
\|/ / / / /
* \| \| \| \|	Merge branch 'sh-filter-geo-output' into 'master'	Ash McKenzie	2019-07-15	1	-1/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Filter Geo proxied data from api_json.log See merge request gitlab-org/gitlab-ce!30687
\| * \| \| \| \|	Filter Geo proxied data from api_json.logsh-filter-geo-output	Stan Hu	2019-07-14	1	-1/+2
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently the base64-encoded value of the push-to-secondary data is saved in `api_json.log`, and this can easily be hundreds of megabytes. We should filter this from the logs.
* \| \| \| \|	Merge branch 'docs-code-block-style-7' into 'master'	Evan Read	2019-07-15	17	-920/+930
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix whitespace in user and misc docs See merge request gitlab-org/gitlab-ce!30605
\| * \| \| \| \|	Fix whitespace in user, and misc, docs	Marcel Amirault	2019-07-15	17	-920/+930
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Many code blocks are 4spaced, and they render in GitLab without coloring as a result, even though they are fenced with a language label. If in a list, other items woll render as being in a code block too, even if not meant to. This fixes all these issues, and cleans up minor whitespace issues in /user, /security, /ssh and /migrate_ci_to_ce docs.
* \| \| \| \|	Merge branch 'AddMoreFileExtentionsTo-file_type_icon_class' into 'master'	Lin Jen-Shin	2019-07-15	2	-9/+32
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add more file extentions to file type icon class See merge request gitlab-org/gitlab-ce!30316
\| * \| \| \| \|	Add more file extentions to file type icon class	Peter Dave Hello	2019-07-15	2	-9/+32
\|/ / / / /
* \| \| \| \|	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