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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Apply review suggestionsdocs/mention-jest-in-testing-guide	Mark Florian	2019-08-28	1	-4/+1
\| \| \| \| \| \| \|	- Reword relationship between Jest/Karma/Jasmine - Prefer inline URLs, per the [docs] [docs]: https://docs.gitlab.com/ee/development/documentation/styleguide.html#links
*	Mention Jest in testing guide docs	Mark Florian	2019-08-28	1	-1/+2
\|
*	Merge branch 'user-tracking-settings' into 'master'	Jan Provaznik	2019-08-28	8	-105/+204
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Adjusts snowplow to use cookies for sessions Closes telemetry#77 See merge request gitlab-org/gitlab-ce!32236
\| *	Changes snowplow to use cookies for sessions	Jeremy Jackson	2019-08-28	8	-105/+204
\|/ \| \| \| \|	This also restructures how and where the configuration for Snowplow lives.
*	Merge branch 'docs/license-compliance-rename' into 'master'	Evan Read	2019-08-28	17	-254/+257
\|\ \| \| \| \| \| \| \| \|	Rename all filenames and occurrences to License Compliance See merge request gitlab-org/gitlab-ce!32148
\| *	Rename all filenames and occurrences to License Compliance	Achilleas Pipinellis	2019-08-28	17	-254/+257
\|/ \| \| \| \| \|	- New redirect doc/user/application_security/license_compliance/index.md - Renaming of images. - Some links that were pointing to the old location are fixed.
*	Merge branch 'docs/unlinking-emails' into 'master'	Evan Read	2019-08-28	1	-9/+0
\|\ \| \| \| \| \| \| \| \|	Remove a section for a now fixed bug See merge request gitlab-org/gitlab-ce!32319
\| *	Remove a section for a now fixed bug	Achilleas Pipinellis	2019-08-28	1	-9/+0
\| \| \| \| \| \| \| \| \| \| \| \|	Those guidelines where based on https://gitlab.com/gitlab-org/gitlab-docs/issues/311 which seems to be fixed.
* \|	Merge branch 'docs/edit-feature-flags' into 'master'	Achilleas Pipinellis	2019-08-28	1	-13/+18
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Edit Feature Flags topic See merge request gitlab-org/gitlab-ce!31956
\| * \|	Edit Feature Flags topic	Evan Read	2019-08-28	1	-13/+18
\|/ /
* \|	Merge branch 'docs-markdownlint-fixes-1' into 'master'	Achilleas Pipinellis	2019-08-28	29	-94/+68
\|\ \ \| \|/ \|/\| \| \| \| \|	Fix markdown in various docs (part 1) See merge request gitlab-org/gitlab-ce!32267
\| *	Fix markdown in various docs	Marcel Amirault	2019-08-28	29	-94/+68
\|/ \| \| \| \| \|	Clean up issues that may cause the docs-lint test to fail, such as trailing whitespace, no EOF newline, blockquotes, etc
*	Merge branch 'docs/fix-introduced-in-text' into 'master'	Achilleas Pipinellis	2019-08-28	8	-27/+28
\|\ \| \| \| \| \| \| \| \|	Fixes Introduced in text for our renderer See merge request gitlab-org/gitlab-ce!32308
\| *	Fixes Introduced in text for our renderer	Evan Read	2019-08-28	8	-27/+28
\|/
*	Merge branch 'mk/remove-jwt-from-rate-limit-docs' into 'master'	Evan Read	2019-08-28	2	-1/+5
\|\ \| \| \| \| \| \| \| \|	Note CI token exception to JWT requests in rate limit docs See merge request gitlab-org/gitlab-ce!32168
\| *	Note some JWT requests aren't rate limitedmk/remove-jwt-from-rate-limit-docs	Michael Kozono	2019-08-23	2	-1/+5
\| \|
* \|	Merge branch 'todos/include-issue-mr-titles' into 'master'	Stan Hu	2019-08-28	10	-60/+90
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Issue and Merge Request titles to Todo items Closes #63488 See merge request gitlab-org/gitlab-ce!30435
\| * \|	Add Issue and Merge Request titles to Todo items	Arun Kumar Mohan	2019-08-27	10	-60/+90
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only displays the todo body if the todo has a note. This is to avoid redundant Issue or Merge Request titles displayed both in the Todo title and body.
* \| \|	Merge branch 'qa-restric-access-by-ip-address-spec-ce' into 'master'	Sanad Liaquat	2019-08-28	6	-4/+26
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE Backport of EE changes See merge request gitlab-org/gitlab-ce!32203
\| * \| \|	CE Backport of EE changesqa-restric-access-by-ip-address-spec-ce	Sanad Liaquat	2019-08-27	6	-4/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add qa selector elements and files from the EE branch
* \| \| \|	Merge branch 'docs-patch-74' into 'master'	Evan Read	2019-08-28	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove eks from adding an existing cluster section See merge request gitlab-org/gitlab-ce!32125
\| * \| \| \|	Remove eks from adding an existing cluster section	Daniel Gruesso	2019-08-28	1	-1/+1
\|/ / / /
* \| \| \|	Merge branch 'ss/add-board-name-to-page-title' into 'master'	Mike Greiling	2019-08-28	2	-1/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ss/add board name to page title See merge request gitlab-org/gitlab-ce!32074
\| * \| \| \|	Ss/add board name to page title	Scott Stern	2019-08-28	2	-1/+6
\|/ / / /
* \| \| \|	Merge branch 'docs-gitlab-basics-followup' into 'master'	Evan Read	2019-08-28	3	-4/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolving minor formatting issues in gitlab-basics Closes #65307 See merge request gitlab-org/gitlab-ce!32194
\| * \| \| \|	Resolving minor formatting issues in gitlab-basics	Marcel Amirault	2019-08-28	3	-4/+2
\|/ / / /
* \| \| \|	Merge branch 'ce-refactor-dev-org-com-helper' into 'master'	Ash McKenzie	2019-08-28	2	-1/+28
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename dev, org, com helper See merge request gitlab-org/gitlab-ce!32115
\| * \| \| \|	Rename dev, org, com helper	Doug Stull	2019-08-28	2	-1/+28
\|/ / / /
* \| \| \|	Merge branch '10688-group-maintainers-edit-epic-comments-permissions-docs' ↵	Evan Read	2019-08-28	1	-18/+20
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Update group permissions table documentation See merge request gitlab-org/gitlab-ce!32020
\| * \| \| \|	Update group permissions table documentation	Eugenia Grieff	2019-08-28	1	-18/+20
\|/ / / /
* \| \| \|	Merge branch 'docs/66091-change-mattermost-version-reference' into 'master'	Evan Read	2019-08-28	1	-2/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66091 Closes #66091 See merge request gitlab-org/gitlab-ce!32188
\| * \| \| \|	Change reference to Mattermost versions.	Russell Dickenson	2019-08-28	1	-2/+7
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed reference to Mattermost versions, so that it's clear which menu navigation path applies.
* \| \| \|	Merge branch 'load-balancing-prometheus' into 'master'	Evan Read	2019-08-27	1	-1/+10
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add docs for db_load_balancing metrics See merge request gitlab-org/gitlab-ce!32044
\| * \| \| \|	Add docs for db_load_balancing metricsload-balancing-prometheus	Thong Kuah	2019-08-27	1	-1/+10
\| \| \| \| \|
* \| \| \| \|	Merge branch 'sh-rate-limits-qa' into 'master'	Mark Lapierre	2019-08-27	9	-7/+109
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add QA specs for using IP rate limits See merge request gitlab-org/gitlab-ce!32177
\| * \| \| \| \|	Add QA specs for using IP rate limitssh-rate-limits-qa	Stan Hu	2019-08-26	9	-7/+109
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will help prevent issues such as https://gitlab.com/gitlab-org/gitlab-ce/issues/66449.
* \| \| \| \| \|	Merge branch 'sh-document-qa-admin-account-docs' into 'master'	Mark Lapierre	2019-08-27	1	-0/+11
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document setting admin credentials in QA tests See merge request gitlab-org/gitlab-ce!32271
\| * \| \| \| \| \|	Document setting admin credentials in QA testssh-document-qa-admin-account-docs	Stan Hu	2019-08-27	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes it possible to test against a real instance that has different admin credentials than the default.
* \| \| \| \| \| \|	Merge branch '13353-DesignType-notes_count-ce' into 'master'	Mayra Cabrera	2019-08-27	6	-54/+84
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE backport for gitlab-org/gitlab-ee!15433 (Expose DesignType#notes_count in GraphQL) See merge request gitlab-org/gitlab-ce!32037
\| * \| \| \| \| \| \|	CE-specific changes for designs `user_notes_count`	Luke Duncalfe	2019-08-27	6	-54/+84
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Notes call `#after_note_created` and `#after_note_destroyed` on their noteable in callbacks, so the noteable can perform tasks particular to them, like cache expiry. This is in preparation of the EE-specific class `DesignManagement::Design` clearing its `user_notes_count` cache when its note are created or destroyed. Refactoring Rspec behaviour testing of a counter caching service into a shared example. https://gitlab.com/gitlab-org/gitlab-ee/issues/13353
* \| \| \| \| \| \|	Merge branch 'sh-fix-docs-lint-snippets-docs' into 'master'	Mayra Cabrera	2019-08-27	1	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove trailing whitespace from project snippets API docs Closes #66677 See merge request gitlab-org/gitlab-ce!32298
\| * \| \| \| \| \| \|	Remove trailing whitespace from project snippets API docssh-fix-docs-lint-snippets	Stan Hu	2019-08-27	1	-2/+2
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66677
* \| \| \| \| \| \|	Merge branch ↵	Clement Ho	2019-08-27	2	-0/+33
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'60141-mr-resolve-conflicts-file-headers-bad-positioning-on-scroll' into 'master' Resolve "MR resolve conflicts file headers bad positioning on scroll" Closes #60141 See merge request gitlab-org/gitlab-ce!31991
\| * \| \| \| \| \| \|	Round the file title; Add top border to conflict diffs	Thomas Randolph	2019-08-27	2	-0/+33
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The file title sometimes overflows its container, which has the same border-radius. By always rounding the file title, the overflow never happens, so the corners always look correct. Everywhere else there are file diffs, there is a top border to complete the full border around the file.
* \| \| \| \| \| \|	Merge branch 'fix-nil-error-in-gitlab-danger-teammate' into 'master'	Lin Jen-Shin	2019-08-27	2	-2/+10
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a nil error in Gitlab::Danger::Teammate See merge request gitlab-org/gitlab-ce!32284
\| * \| \| \| \| \| \|	Fix a nil error in Gitlab::Danger::Teammate	Rémy Coutable	2019-08-27	2	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch 'docs/update-api-snippets' into 'master'	Achilleas Pipinellis	2019-08-27	1	-0/+58
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add example requests for snippets API See merge request gitlab-org/gitlab-ce!31964
\| * \| \| \| \| \| \|	Add example requests for snippets API	Rainer Kern	2019-08-27	1	-0/+58
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'qa-autodevops-smoke-check' into 'master'	Dan Davison	2019-08-27	4	-12/+36
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure autodevops is enabled before running Smoke test See merge request gitlab-org/gitlab-ce!31867
\| * \| \| \| \| \| \|	Ensure autodevops is enabled before running Smoke testqa-autodevops-smoke-check	ddavison	2019-08-15	4	-12/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extract #enable_autodevops to new page object Change Smoke test naming to only running pipeline Generate AutoDevOps project with SecureRandom suffix