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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Removed security fixtures as they are ee onlyremove-unused-security-fixtures	Cameron Swords	2019-08-20	19	-5364/+1
\| \| \| \|	These will be moved to the EE codebase.
*	Merge branch 'patch-74' into 'master'	Ray Paik	2019-08-20	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Fix typo in doc/ci/yaml/README.md See merge request gitlab-org/gitlab-ce!31923
\| *	Update README.md	Alex Harford	2019-08-16	1	-1/+1
\| \|
\| *	Fix typo in doc/ci/yaml/README.md	Alex Harford	2019-08-16	0	-0/+0
\| \|
* \|	Merge branch 'winh-combine-frontend-testing-docs' into 'master'64171-remove-is_ee-flag-from-app-assets-javascripts-monitoring-components-dashboard-vue	Evan Read	2019-08-20	2	-359/+363
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Combine old and new frontend testing guide (docs) See merge request gitlab-org/gitlab-ce!31852
\| * \|	Combine old and new frontend testing guide (docs)	Winnie Hellmann	2019-08-20	2	-359/+363
\|/ /
* \|	Merge branch 'username_suggests' into 'master'	Ash McKenzie	2019-08-20	1	-0/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Back porting Username suggestion API changes See merge request gitlab-org/gitlab-ce!31986
\| * \|	Back porting Username suggestion API changes	Aishwarya Subramanian	2019-08-20	1	-0/+1
\|/ /
* \|	Merge branch 'initial-docs-for-auto-devops-sidekiq' into 'master'	Evan Read	2019-08-20	1	-0/+46
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Initial docs for sidekiq worker with Auto DevOps Closes gitlab-org/charts/auto-deploy-app#1 See merge request gitlab-org/gitlab-ce!31949
\| * \|	Initial docs for sidekiq worker with Auto DevOpsinitial-docs-for-auto-devops-sidekiq	Dylan Griffith	2019-08-20	1	-0/+46
\| \| \|
* \| \|	Merge branch 'docs-66076-expansion-options' into 'master'	Evan Read	2019-08-20	2	-0/+9
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation for incrementally expand mr diffs See merge request gitlab-org/gitlab-ce!31878
\| * \| \|	Add documentation for incrementally expand mr diffs	Samantha Ming	2019-08-20	2	-0/+9
\|/ / /
* \| \|	Merge branch '66161-replace-expand-icons' into 'master'	Mike Greiling	2019-08-19	2	-4/+7
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Use new "Expand up" and "Expand down" icons for diff expansion icons" Closes #66161 See merge request gitlab-org/gitlab-ce!31907
\| * \| \|	Add expand up and expand down icons66161-replace-expand-icons	Jarek Ostrowski	2019-08-16	2	-4/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add changelog Add MR to changelog Remove stray file
* \| \| \|	Merge branch 'docs-lists-cleanup-4' into 'master'	Evan Read	2019-08-19	13	-328/+331
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Standardize markdown in /development and /workflow See merge request gitlab-org/gitlab-ce!31705
\| * \| \| \|	Standardize markdown in dev and workflow	Marcel Amirault	2019-08-19	13	-328/+331
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Delete trailing whitespace, fix blockquotes, fix note boxes, with indentation, clean up tables, etc.
* \| \| \|	Merge branch 'sentry-extra-data' into 'master'	Thong Kuah	2019-08-19	2	-3/+43
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add support for sentry_extra_data in exceptions See merge request gitlab-org/gitlab-ce!31899
\| * \| \| \|	Add support for sentry_extra_data in exceptions	Alex Kalderimis	2019-08-19	2	-3/+43
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows exceptions to advertise their support for sentry and provide structured data.
* \| \| \|	Merge branch 'fix-file-row-styling' into 'master'	Paul Slaughter	2019-08-19	2	-6/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update file row styling See merge request gitlab-org/gitlab-ce!31884
\| * \| \| \|	Update file row stylingfix-file-row-styling	Illya Klymov	2019-08-19	2	-6/+7
\| \| \| \| \|
* \| \| \| \|	Merge branch 'mc/bug/nplusone-pipelines-show' into 'master'	Stan Hu	2019-08-19	1	-7/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve nplusone spec for PipelinesController#show See merge request gitlab-org/gitlab-ce!31976
\| * \| \| \| \|	Improve nplusone spec for PipelinesController#show	Matija Čupić	2019-08-19	1	-7/+11
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'da-fix-n-plus-1-query-on-starrers-list' into 'master'	Stan Hu	2019-08-19	3	-2/+17
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix N+1s queries while loading users on the project starrers list See merge request gitlab-org/gitlab-ce!31984
\| * \| \| \| \|	Fix N+1s queries while loading users	Douglas Barbosa Alexandre	2019-08-19	3	-2/+17
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'clean-obsolete-css' into 'master'	Paul Slaughter	2019-08-19	2	-5/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove obsolete CSS and fix icon alignment See merge request gitlab-org/gitlab-ce!31897
\| * \| \| \| \| \|	Remove obsolete CSS and fix icon alignmentclean-obsolete-css	Illya Klymov	2019-08-19	2	-5/+5
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch '64251-branch-name-set-cache' into 'master'	Robert Speicher	2019-08-19	7	-17/+252
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cache branch and tag names as Redis sets See merge request gitlab-org/gitlab-ce!30476
\| * \| \| \| \| \|	Cache branch and tag names as Redis sets	Nick Thomas	2019-08-16	7	-17/+252
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows us to check inclusion for the *_exists? methods without downloading the full list of branch names, which is over 100KiB in size for gitlab-ce at the moment.
* \| \| \| \| \|	Merge branch '66061-update-tooltip-of-detached-label-state' into 'master'	Clement Ho	2019-08-19	4	-5/+10
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Update tooltip of "detached" label/state" Closes #66061 See merge request gitlab-org/gitlab-ce!31917
\| * \| \| \| \|	Mark detached tooltip for translation	jakeburden	2019-08-19	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Update tooltip of "detached" label/state66061-update-tooltip-of-detached-label-state	jakeburden	2019-08-19	4	-5/+10
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '9643-hooks-to-sync-to-jira-connect-ce' into 'master'	Mayra Cabrera	2019-08-19	1	-0/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE] Add hooks to sync dev info to Jira using Connect App See merge request gitlab-org/gitlab-ce!31398
\| * \| \| \| \| \|	[CE] Add hooks to sync dev info to Jira using Connect App	Heinrich Lee Yu	2019-08-19	1	-0/+1
\|/ / / / / /
* \| \| \| \| \|	Merge branch '11877-public-approval-api-ee-docs' into 'master'	Douwe Maan	2019-08-19	1	-56/+238
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Doc: add project approval rule endpoints See merge request gitlab-org/gitlab-ce!31455
\| * \| \| \| \| \|	Doc: add project approval rule endpoints	Mark Chao	2019-08-19	1	-56/+238
\|/ / / / / /
* \| \| \| \| \|	Merge branch '10197-multiple-assignees-avatars-scrolling-bug' into 'master'	Paul Slaughter	2019-08-19	1	-0/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport: Fixed sidebar assignees scrolling bug See merge request gitlab-org/gitlab-ce!31932
\| * \| \| \| \| \|	Backport: Fixed sidebar assignees scrolling bug10197-multiple-assignees-avatars-scrolling-bug	Donald Cook	2019-08-17	1	-0/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'add-js-prevent-default-on-click' into 'master'	Clement Ho	2019-08-19	6	-13/+15
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace inline scripts in links to prevent default See merge request gitlab-org/gitlab-ce!31838
\| * \| \| \| \| \| \|	Replace inline scripts in links to prevent defaultadd-js-prevent-default-on-click	Heinrich Lee Yu	2019-08-19	6	-13/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use buttons instead of links with javascript:void(0)
* \| \| \| \| \| \| \|	Merge branch '64677-delete-directory-webide' into 'master'	Paul Slaughter	2019-08-19	3	-1/+41
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed deletion of directories in Web IDE Closes #64677 See merge request gitlab-org/gitlab-ce!31727
\| * \| \| \| \| \| \| \|	Fixed deletion of directories in Web IDE64677-delete-directory-webide	Denys Mishunov	2019-08-12	3	-1/+41
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '39-count-unique-users-for-more-accurate-smau-reporting' into ↵	Nick Thomas	2019-08-19	5	-16/+36
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Allow UsageData.count to use count_by: See merge request gitlab-org/gitlab-ce!30770
\| * \| \| \| \| \| \| \| \|	New GroupMember.of_ldap_type scope39-count-unique-users-for-more-accurate-smau-reporting	Ash McKenzie	2019-07-18	3	-14/+28
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Allow UsageData.count to use count_by:	Ash McKenzie	2019-07-18	2	-2/+8
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'qa-backport-fix-remaining-prepend-lines' into 'master'	Rémy Coutable	2019-08-19	8	-13/+97
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update qa/Dockerfile to be built from the project root context See merge request gitlab-org/gitlab-ce!31533
\| * \| \| \| \| \| \| \| \| \|	Update the 'build-qa-image' job to be built from project root contextqa-backport-fix-remaining-prepend-lines	Rémy Coutable	2019-08-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \| \| \|	Update qa/Dockerfile to be built from the project root context	Rémy Coutable	2019-08-19	5	-12/+91
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \| \| \|	Support X_if_ee methods for QA tests	Yorick Peterse	2019-08-19	2	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For the QA tests to use the new injection methods, we must require the initializer and ensure that the "constantize" method is available.
* \| \| \| \| \| \| \| \| \| \|	Merge branch ↵	Annabel Dunstone Gray	2019-08-19	3	-3/+7
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'63905-discussion-expand-collapse-button-is-only-clickable-on-one-side' into 'master' Resolve "Discussion "expand"/"collapse" button is only clickable on one side" Closes #63905 See merge request gitlab-org/gitlab-ce!31730
\| * \| \| \| \| \| \| \| \| \| \|	Make all of the discussion toggle clickable63905-discussion-expand-collapse-button-is-only-clickable-on-one-side	Thomas Randolph	2019-08-16	3	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \|