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

	Commit message (Collapse)	Author	Age	Files	Lines
*	SSoT audit fixes for GitLab U topicsdocs/ssot-university-topics	Evan Read	2019-06-10	42	-775/+266
\| \| \| \|	Also improves the markdown in that section.
*	Merge branch 'docs/ssot_admin_area_index' into 'master'	Evan Read	2019-06-09	1	-4/+8
\|\ \| \| \| \| \| \| \| \|	Edit Admin Area's index for SSOT See merge request gitlab-org/gitlab-ce!29327
\| *	Edit Admin Area's index for SSOT	Russell Dickenson	2019-06-09	1	-4/+8
\|/
*	Merge branch 'docs/ssot_visibility_controls' into 'master'	Evan Read	2019-06-09	1	-10/+36
\|\ \| \| \| \| \| \| \| \|	Edit "Visibility and access controls" to meet SSOT guidelines See merge request gitlab-org/gitlab-ce!29171
\| *	Edit "Visibility and access controls" to meet SSOT guidelines	Russell Dickenson	2019-06-09	1	-10/+36
\|/
*	Merge branch 'docs/ssot_subgroups' into 'master'	Evan Read	2019-06-09	1	-19/+38
\|\ \| \| \| \| \| \| \| \|	Edit "Subgroups" for SSOT See merge request gitlab-org/gitlab-ce!29318
\| *	Edit "Subgroups" for SSOT	Russell Dickenson	2019-06-09	1	-19/+38
\|/
*	Merge branch 'docs/ssot-merge-requests' into 'master'	Mike Lewis	2019-06-09	14	-94/+266
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Single source of truth for merge requests docs Closes #61516 See merge request gitlab-org/gitlab-ce!29269
\| *	Single source of truth for merge requests	Achilleas Pipinellis	2019-06-09	14	-94/+266
\|/ \| \| \| \| \| \| \|	- Edit pages under user/project/merge_requests and add the relevant types in the frontmatter. - Clean up descriptions. Based on https://gitlab.com/groups/gitlab-org/-/epics/1280
*	Merge branch 'sh-revert-mr-24679' into 'master'	Kamil Trzciński	2019-06-09	6	-501/+4
\|\ \| \| \| \| \| \| \| \|	Revert "Merge branch '50070-legacy-attachments' into 'master'" See merge request gitlab-org/gitlab-ce!29391
\| *	Revert "Merge branch '50070-legacy-attachments' into 'master'"sh-revert-mr-24679	Stan Hu	2019-06-09	6	-501/+4
\|/ \| \| \| \|	This reverts commit fd19f887dfeeeedb483c4a4fb32f9f768e89389c, reversing changes made to abb2d4c601d796339c8d7cb0c00946696730f198.
*	Merge branch 'sentry-raven_2.9' into 'master'	Stan Hu	2019-06-08	2	-2/+2
\|\ \| \| \| \| \| \| \| \|	Bump sentry-raven to 2.9 See merge request gitlab-org/gitlab-ce!29352
\| *	Bump sentry-raven to 2.9	Utkarsh Gupta	2019-06-07	2	-2/+2
\| \|
* \|	Merge branch 'docs/fix-example-dot-net' into 'master'	Mike Lewis	2019-06-07	2	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Remove example.net, replace with example.com See merge request gitlab-org/gitlab-ce!25535
\| * \	Merge branch 'master' into 'docs/fix-example-dot-net'	Mike Lewis	2019-06-07	6958	-130043/+325778
\| \|\ \ \| \|/ / \|/\| \| \| \| \|	# Conflicts: # doc/user/project/clusters/serverless/index.md
* \| \|	Merge branch '55033-discussion-system-note-alignment' into 'master'57953-suggesting-changes-on-a-line-that-is-not-part-of-an-mr-diff-brings-in-actual-html-code-of-the-element-instead-of-the-text-involved	Fatih Acet	2019-06-07	2	-3/+8
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Align system note within discussion with other notes Closes #55033 See merge request gitlab-org/gitlab-ce!29367
\| * \| \|	Align system note within discussion with other notes	Annabel Dunstone Gray	2019-06-07	2	-3/+8
\| \| \| \|
* \| \| \|	Merge branch 'gt-externalize-profiles-preferences' into 'master'	Phil Hughes	2019-06-07	3	-40/+46
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Externalize profiles preferences Closes #53349 See merge request gitlab-org/gitlab-ce!28470
\| * \| \| \|	Externalize profiles preferences	George Tsiolis	2019-06-07	3	-40/+46
\| \| \| \| \|
* \| \| \| \|	Merge branch '61565-merge-request-discussion-text-jumps-when-resolved' into ↵	Annabel Dunstone Gray	2019-06-07	2	-3/+10
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Merge request discussion text jumps when resolved" Closes #61565 See merge request gitlab-org/gitlab-ce!28995
\| * \| \| \| \|	Fix discusson resolve toggle making page jump	Justin Boyson	2019-06-07	2	-3/+10
\|/ / / / /
* \| \| \| \|	Merge branch 'issue/62656' into 'master'	Annabel Dunstone Gray	2019-06-07	2	-4/+10
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	changed dropdown styles in board page See merge request gitlab-org/gitlab-ce!29338
\| * \| \| \| \|	Change styles for the board `Add List` dropdown to look more like the EE version	Michel Engelen	2019-06-07	2	-4/+10
\|/ / / / /
* \| \| \| \|	Merge branch 'winh-new-list-sorting' into 'master'	Tim Zallmann	2019-06-07	1	-3/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove list sorting from NewListDropdown See merge request gitlab-org/gitlab-ce!29077
\| * \| \| \| \|	Remove list sorting from NewListDropdown	Winnie Hellmann	2019-06-07	1	-3/+0
\|/ / / / /
* \| \| \| \|	Merge branch 'bw-gettext-rake-task' into 'master'	Sean McGivern	2019-06-07	1	-0/+1
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show description of 'gettext:regenerate' task See merge request gitlab-org/gitlab-ce!29362
\| * \| \| \|	Show description of 'gettext:regenerate' taskbw-gettext-rake-task	Brett Walker	2019-06-07	1	-0/+1
\|/ / / /
* \| \| \|	Merge branch 'docs-scoped-label-key' into 'master'	Mike Lewis	2019-06-07	1	-0/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a note about nested scopes matching See merge request gitlab-org/gitlab-ce!28466
\| * \| \| \|	Apply suggestion to doc/user/project/labels.mddocs-scoped-label-key	Jan Provaznik	2019-06-05	1	-5/+7
\| \| \| \| \|
\| * \| \| \|	Add a note about nested scopes matching	Jan Provaznik	2019-05-20	1	-0/+6
\| \| \| \| \|
* \| \| \| \|	Merge branch 'ee-9688-fe-mr-merge-order' into 'master'	Clement Ho	2019-06-07	6	-15/+115
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport of EE Displaying Blocking MRs See merge request gitlab-org/gitlab-ce!29095
\| * \| \| \| \|	Backport of EE Displaying Blocking MRsee-9688-fe-mr-merge-order	Sam Bigelow	2019-06-05	6	-15/+115
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This MR is a backport of an EE merge request
* \| \| \| \| \|	Merge branch 'mh/board-models-ce' into 'master'	Kushal Pandya	2019-06-07	12	-30/+28
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move issue board models to boards directory Closes #61293 See merge request gitlab-org/gitlab-ce!29260
\| * \| \| \| \| \|	Move Vue models from vue_shared to boards	Martin Hanzel	2019-06-07	12	-30/+28
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Some classes in vue_shared were used only by boards, so they were moved to the boards directory.
* \| \| \| \| \|	Merge branch ↵	Stan Hu	2019-06-07	11	-8/+95
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'thomas-nilsson-irfu/gitlab-ce-thomas-nilsson-irfu-master-patch-13137' into 'master' Allow masking if 8 or more characters in base64 See merge request gitlab-org/gitlab-ce!29143
\| * \| \| \| \| \|	Add masked toggle click to frontend specthomas-nilsson-irfu/gitlab-ce-thomas-nilsson-irfu-master-patch-13137	mfluharty	2019-06-06	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Need to set masked to true before testing now that the default is false
\| * \| \| \| \| \|	Do not escape forward slashes in Maskable REGEX	Matija Čupić	2019-06-06	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add frontend specs	mfluharty	2019-06-06	2	-0/+67
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Test that a regex is provided Test that it is the expected regex Test length of variable Test special character set
\| * \| \| \| \| \|	Use exposed regex for frontend maskable check	mfluharty	2019-06-06	5	-5/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pass string value in through haml template data attribute Evaluate it into a regex when initiating variable list Use it to determine whether to show the maskability warning
\| * \| \| \| \| \|	Add CHANGELOG entry	Matija Čupić	2019-06-06	1	-0/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Expose javascript regex	Matija Čupić	2019-06-06	2	-2/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Allow masking if 8 or more characters in base64	Thomas Nilsson	2019-06-06	3	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This should allow for private ssh-keys to remain private. Solves https://gitlab.com/gitlab-org/gitlab-ce/issues/60790.
* \| \| \| \| \| \|	Merge branch 'fix-legacy-uploads-spec' into 'master'	Sean McGivern	2019-06-07	1	-9/+25
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix migration specs using factories Closes #62911 See merge request gitlab-org/gitlab-ce!29350
\| * \| \| \| \| \|	Fix migration specs using factories	Markus Koller	2019-06-07	1	-9/+25
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We need to stub default_git_depth and default_git_depth= because some old migrations specs try to create a record using schema before that column was introduced. The `let!` calls were executed before the `before` hook which still caused some factories to fail, so they're created in the `before` hook now as well.
* \| \| \| \| \|	Merge branch '51636-task-list-api-pderichs' into 'master'	Sean McGivern	2019-06-07	6	-21/+206
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add task count and completed count to responses of Issue and MR See merge request gitlab-org/gitlab-ce!28859
\| * \| \| \| \| \|	Add task count and completed count to responses of Issue and MR	Patrick Derichs	2019-06-07	6	-21/+206
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add spec for task_completion_status Add test cases for task_completion_status result Extracted shared samples Add new spec file for task completion status response Fix style errors Add changelog entry Changed samples to Hashes Remove test for successful request Remove not nil expectation Add task_completion_status to api documentation for issues Add task_completion_status to api documentation for merge_requests Refactor spec so it just requests one specific item Add task_completion_status to Taskable Simplified task completion status in entities Refactor spec so it separates status code check and content check Fix spec description text and field name
* \| \| \| \| \| \|	Merge branch 'improve-email-text-part' into 'master'	Dmitriy Zaporozhets	2019-06-07	4	-9/+16
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve email text part See merge request gitlab-org/gitlab-ce!29111
\| * \| \| \| \| \| \|	Add changelog entry	Haunui Saint-sevin	2019-06-04	1	-0/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Sync text part of email with the HTML part	Haunui Saint-sevin	2019-06-04	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The text part was missing the condition to change the first message. Borrow the code from the HTML part.
\| * \| \| \| \| \| \|	Remove html tag from the text part of email	Haunui Saint-sevin	2019-06-04	3	-9/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of calling single function emitting HTML tags in the HTML part of email, directly output HTML tags or raw text.