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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Make the architecture table displayed in a blockdocs/architecture-table-hack	Achilleas Pipinellis	2019-06-11	1	-0/+4
\| \| \| \| \| \| \|	By default, all tables have a width of 100% on docs.gitlab.com. In a few cases, the table will overlap the table of contents (ToC). For these cases, we need to add an entry to the document’s frontmatter to render them as a display block.
*	Merge branch 'docs/ssot-university-topics' into 'master'	Achilleas Pipinellis	2019-06-11	42	-775/+266
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	SSoT audit fixes for some topics in GitLab U section Closes #61513 See merge request gitlab-org/gitlab-ce!29033
\| *	SSoT audit fixes for GitLab U topics	Evan Read	2019-06-11	42	-775/+266
\|/ \| \| \|	Also improves the markdown in that section.
*	Merge branch 'dz-cleanup-deprecated-code' into 'master'	Kamil Trzciński	2019-06-11	9	-61/+5
\|\ \| \| \| \| \| \| \| \|	Remove some deprecated code See merge request gitlab-org/gitlab-ce!29222
\| *	Remove some deprecated codedz-cleanup-deprecated-code	Dmitriy Zaporozhets	2019-06-07	9	-61/+5
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch 'process-when-auto-merge-is-enabled' into 'master'	Kamil Trzciński	2019-06-11	2	-0/+13
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Notify events when auto merge is enabled or merge param is updated See merge request gitlab-org/gitlab-ce!29415
\| * \|	Notify when auto merge is enabledprocess-when-auto-merge-is-enabled	Shinya Maeda	2019-06-10	2	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There are bunch of auto merge related notifications, and when auto merge is enabled, it should be evaluated immediately.
* \| \|	Merge branch 'sh-fix-utf-8-encoding-resolve-conflicts' into 'master'	Dmitriy Zaporozhets	2019-06-11	3	-4/+28
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix UTF-8 conversion issues when resolving conflicts Closes #63062 See merge request gitlab-org/gitlab-ce!29453
\| * \| \|	Force source and target branch to binary modesh-fix-utf-8-encoding-resolve-conflicts	Stan Hu	2019-06-10	2	-10/+17
\| \| \| \|
\| * \| \|	Fix UTF-8 conversion issues when resolving conflicts	Stan Hu	2019-06-10	3	-2/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Similar to https://gitlab.com/gitlab-org/gitlab-ce/issues/63030, when the commit message in the /resolve_conflicts endpoint contains a UTF-8 character, the conversion to the Gitaly ASCII-8BIT value may flag an error. To fix this, we run `force_encoding` on the commit message. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63062
* \| \| \|	Merge branch 'qa-ml-dry-retry-on-exception' into 'master'	Sanad Liaquat	2019-06-11	1	-9/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE] use `retry_on_exception` instead of duplicating code See merge request gitlab-org/gitlab-ce!29452
\| * \| \| \|	DRY exception handlingqa-ml-dry-retry-on-exception	Mark Lapierre	2019-06-11	1	-9/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use `retry_on_exception` instead of duplicating code
* \| \| \| \|	Merge branch 'patch-70' into 'master'	Ray Paik	2019-06-11	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove extra word on Health Check page See merge request gitlab-org/gitlab-ce!29390
\| * \| \| \| \|	Remove extra word on Health Check page	Ben Bodenmiller	2019-06-11	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge branch 'patch-55' into 'master'	Evan Read	2019-06-11	1	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve details about acceptable number of unicorn workers See merge request gitlab-org/gitlab-ce!28262
\| * \| \| \| \|	Improve details about acceptable number of unicorn workerspatch-55	Ben Bodenmiller	2019-06-09	1	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'docs/ssot_scim_setup' into 'master'	Evan Read	2019-06-11	1	-0/+20
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Edit "SCIM Setup" for SSOT See merge request gitlab-org/gitlab-ce!29313
\| * \| \| \| \| \|	Edit "SCIM Setup" for SSOT	Russell Dickenson	2019-06-11	1	-0/+20
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'allow-emoji-in-references' into 'master'	Robert Speicher	2019-06-10	3	-1/+29
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow references to labels and milestones to contain emoji Closes #37762, #53756, and #40728 See merge request gitlab-org/gitlab-ce!29284
\| * \| \| \| \|	Allow emoji in label and milestone referencesallow-emoji-in-references	Sean McGivern	2019-06-07	3	-1/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If we put the emoji filter before the reference filters, each emoji will have a wrapper element that prevents the reference filter from detecting the presence of the emoji. As the emoji filter now runs after the reference filters, references must contain a literal emoji, not the GitLab Flavored Markdown versions (:100`, for example). A weird side-effect is that if you have a label with the 100 emoji, and a label named :100:, then trying to reference the latter will work (link to the correct label), but will render with the 100 emoji. I'm comfortable with that edge case, I think.
* \| \| \| \| \|	Merge branch ↵	Mike Lewis	2019-06-10	12	-53/+250
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'61510-review-and-update-the-security-doc-pages-to-adhere-to-ssot-standards-docs' into 'master' SSoT - Security doc pages Closes #61510 See merge request gitlab-org/gitlab-ce!29357
\| * \| \| \| \| \|	Update links in information_exclusivity.md61510-review-and-update-the-security-doc-pages-to-adhere-to-ssot-standards-docs	Mike Lewis	2019-06-09	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Corrected links to use absolute path names	Matt Penna	2019-06-07	1	-2/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Added links to pertinent GitLab docs	Matt Penna	2019-06-07	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarified who can push to a protected branch
\| * \| \| \| \| \|	Apply suggestion to doc/security/webhooks.md	Matt Penna	2019-06-07	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Apply suggestion to doc/security/rack_attack.md	Matt Penna	2019-06-07	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Updated security docs	Matt Penna	2019-06-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes include: - Added front matter - Added Troubleshooting header - Shorted long lines - Corrected typos and improved clarity throughout
\| * \| \| \| \| \|	Various edits to security documentation	Matt Penna	2019-06-07	11	-51/+233
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Edits to conform with CE epic 1280 SSOT standards, other improvements
\| * \| \| \| \| \|	Add type to frontmatter	Achilleas Pipinellis	2019-06-07	4	-4/+17
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'osw-avoid-encoding-errors-on-merge-to-ref-service' into 'master'62183-update-response-code-for-bulk-delete-api-for-container-registry-2	Robert Speicher	2019-06-10	3	-1/+24
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle encoding errors for MergeToRefService See merge request gitlab-org/gitlab-ce!29440
\| * \| \| \| \| \| \|	Avoid encoding errors for MergeToRefServiceosw-avoid-encoding-errors-on-merge-to-ref-service	Oswaldo Ferreira	2019-06-10	3	-1/+24
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '62154-fe-create-fix-long-branch-name-in-dropdown' into 'master'	Phil Hughes	2019-06-10	2	-0/+7
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add word break style to branch name in dropdown Closes #62154 See merge request gitlab-org/gitlab-ce!29069
\| * \| \| \| \| \| \|	Add word break style to branch name in dropdown	Samantha Ming	2019-06-10	2	-0/+7
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add change log
* \| \| \| \| \| \|	Merge branch ↵	Phil Hughes	2019-06-10	4	-2/+15
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'61072-link-to-user-profile-not-distinguishable-on-latest-commit-widget' into 'master' User link styling for commits Closes #61072 See merge request gitlab-org/gitlab-ce!29150
\| * \| \| \| \| \| \|	User link styling for commits	Marcel van Remmerden	2019-06-10	4	-2/+15
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'add-ff-for-project-git-depth' into 'master'	Kamil Trzciński	2019-06-10	4	-1/+25
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move project default git depth behind feature flags Closes #62906 See merge request gitlab-org/gitlab-ce!29346
\| * \| \| \| \| \| \|	Move project default git depth behind feature flags	Fabio Pitino	2019-06-10	4	-1/+25
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'osw-fix-post-dep-migration-with-timeout' into 'master'	Stan Hu	2019-06-10	3	-12/+15
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid DB timeouts when scheduling migrations Closes #63036 See merge request gitlab-org/gitlab-ce!29437
\| * \| \| \| \| \| \|	Avoid DB timeouts when scheduling migrations	Oswaldo Ferreira	2019-06-10	3	-12/+15
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'puma-mem-counter' into 'master'	Kamil Trzciński	2019-06-10	6	-2/+56
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add puma killer observer Closes #63037 See merge request gitlab-org/gitlab-ce!28992
\| * \| \| \| \| \| \|	Add metric for measuring PumaWorkerKiller activity	Jan Provaznik	2019-06-10	6	-2/+56
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PumaWorkerKiller is used for periodically checking and killing workers (the biggest one) if overall memory reaches specified limit. This metric allows us to watch number of killed workers.
* \| \| \| \| \| \|	Merge branch 'ac-63020-typeerror-nil-can-t-be-coerced-into-integer' into ↵	Mayra Cabrera	2019-06-10	3	-1/+18
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fix nil coercion updating storage size on project statistics See merge request gitlab-org/gitlab-ce!29425
\| * \| \| \| \| \| \|	Fix nil coercion updating storage size on project statistics	Alessio Caiazza	2019-06-10	3	-1/+18
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'cancel-auto-merge-when-branch-is-changed' into 'master'	Kamil Trzciński	2019-06-10	6	-7/+26
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cancel Auto Merge when target branch is changed See merge request gitlab-org/gitlab-ce!29416
\| * \| \| \| \| \| \|	Cancel Auto Merge when target branch is changedcancel-auto-merge-when-branch-is-changed	Shinya Maeda	2019-06-10	6	-7/+26
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When target branch is updated, Auto Merge should be canceled.
* \| \| \| \| \| \|	Merge branch 'fix-issue-mr-badge' into 'master'	Phil Hughes	2019-06-10	3	-4/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use grid and correct border radius for status badge See merge request gitlab-org/gitlab-ce!29420
\| * \| \| \| \| \| \|	Use grid and correct border radius for status badge	Annabel Dunstone Gray	2019-06-10	3	-4/+8
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '57171-docs' into 'master'	Clement Ho	2019-06-10	5	-0/+24
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add docs for linking to external dashboard Closes #57171 See merge request gitlab-org/gitlab-ce!27950
\| * \| \| \| \| \| \| \|	Move external dashboard docs	Reuben Pereira	2019-06-10	5	-0/+24
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- To user/project/operations - And cross-link in ci/environments
* \| \| \| \| \| \| \|	Merge branch 'avatar-mixin' into 'master'	Kushal Pandya	2019-06-10	3	-9/+13
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix border radius of collapse discussion btn See merge request gitlab-org/gitlab-ce!29217