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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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 'patch-33' into 'master'	Nick Thomas	2019-06-10	2	-4/+4
\|\ \| \| \| \| \| \| \| \|	List ssh-ed25519 example See merge request gitlab-org/gitlab-ce!28090
\| *	List ssh-ed25519 example	Ben Bodenmiller	2019-06-10	2	-4/+4
\|/
*	Merge branch 'sh-fix-fogbugz-import' into 'master'	James Lopez	2019-06-10	3	-2/+49
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix Fogbugz Importer not working Closes #33530 See merge request gitlab-org/gitlab-ce!29383
\| *	Fix Fogbugz Importer not workingsh-fix-fogbugz-import	Stan Hu	2019-06-09	3	-2/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This stopped working in GitLab 11.11 when we upgraded to Rails 5.1. Rails 5 changed ActionController::Parameters to return an Object instead of a Hash. The old behavior was deprecated in Rails 5 but finally removed in Rails 5.1 Since the controller wasn't updated properly, the callback endpoint quietly failed with the message, "Could not connect to FogBugz, check your url". To fix this, we need to call `to_h` on the `import_params` to access the Hash. We also need to do this for the user map and permit specific keys. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/33530
* \|	Merge branch 'patch-56' into 'master'	Sean McGivern	2019-06-10	4	-9/+9
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Clarify that performance bar is not always on See merge request gitlab-org/gitlab-ce!28287
\| * \|	Fix broken gitlab.pot filepatch-56	Sean McGivern	2019-06-10	1	-6/+3
\| \| \|
\| * \|	Merge remote-tracking branch 'origin/master' into patch-56	Sean McGivern	2019-06-10	2573	-92923/+48568
\| \|\ \
\| * \| \|	Clarify that performance bar is not always on	Ben Bodenmiller	2019-06-09	4	-7/+10
\| \| \| \|
* \| \| \|	Merge branch 'i18n-email-of-user-profile' into 'master'	Filipa Lacerda	2019-06-10	5	-26/+82
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Externalize strings of email page in user profile See merge request gitlab-org/gitlab-ce!28587
\| * \| \| \|	Externalize strings of email page in user profile	antony liu	2019-06-10	5	-26/+82
\|/ / / /
* \| \| \|	Merge branch 'sh-add-backtrace-to-sql-queries' into 'master'	Sean McGivern	2019-06-10	2	-3/+9
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add backtraces to Peek performance bar for SQL calls See merge request gitlab-org/gitlab-ce!29394
\| * \| \| \|	Add backtraces to Peek performance bar for SQL callssh-add-backtrace-to-sql-queries	Stan Hu	2019-06-09	2	-3/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Just as we have backtraces for Gitaly, we should also have backtraces for SQL calls. This makes it much easier to find the source of the SQL call and optimize N+1 queries and other performance issues with an endpoint.
* \| \| \| \|	Merge branch '62144-fix-option-dropdown-button-size' into 'master'	Phil Hughes	2019-06-10	2	-1/+6
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make option dropdown button to match adjacent button Closes #62144 See merge request gitlab-org/gitlab-ce!29096
\| * \| \| \|	Make option dropdown button to match adjacent button	Samantha Ming	2019-06-10	2	-1/+6
\|/ / / /
* \| \| \|	Merge branch 'ce-5276-3-update-ide-diff-and-mirror-modules' into 'master'	Phil Hughes	2019-06-10	2	-7/+49
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	[CE for Part 3] Update IDE file mirror service (ce utils) See merge request gitlab-org/gitlab-ce!29360
\| * \| \|	Update IDE file mirror service (ce utils)ce-5276-3-update-ide-diff-and-mirror-modules	Paul Slaughter	2019-06-07	2	-7/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Notes: This module is a client to the webide-file-sync service. https://gitlab.com/gitlab-org/webide-file-sync
* \| \| \|	Merge branch '11396-dependency-list-connect-frontend-to-backend-ce' into ↵	Thong Kuah	2019-06-10	1	-0/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Add project Dependency List sidebar entry See merge request gitlab-org/gitlab-ce!29189
\| * \| \| \|	Add project Dependency List sidebar entry11396-dependency-list-connect-frontend-to-backend-ce	Mark Florian	2019-06-06	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13968.
* \| \| \| \|	Merge branch 'docs-update-delete-user' into 'master'	Evan Read	2019-06-10	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add more info to deleted user documentation Closes #62674 See merge request gitlab-org/gitlab-ce!29321
\| * \| \| \| \|	Add clarity and commit info to deleted usersdocs-update-delete-user	Tristan Williams	2019-06-06	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'docs/ssot_group_videos' into 'master'	Evan Read	2019-06-10	1	-0/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	SSOT - Added link to video to enhance docs See merge request gitlab-org/gitlab-ce!29398
\| * \| \| \| \| \|	SSOT - Added link to video to enhance docs	Russell Dickenson	2019-06-10	1	-0/+2
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'patch-32' into 'master'	Evan Read	2019-06-10	1	-4/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify that GitLab CI token does not have write permissions See merge request gitlab-org/gitlab-ce!28089
\| * \| \| \| \| \|	Clarify that GitLab CI token does not have write permissions	Ben Bodenmiller	2019-06-10	1	-4/+5
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'sh-troubleshooting-openid-docs' into 'master'	Evan Read	2019-06-10	1	-0/+23
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add OpenID Connect troubleshooting docs See merge request gitlab-org/gitlab-ce!29379
\| * \| \| \| \|	Add OpenID Connect troubleshooting docssh-troubleshooting-openid-docs	Stan Hu	2019-06-07	1	-0/+23
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	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