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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix no newline in changelogrebase-conflict-message	Paul Slaughter	2019-08-21	1	-1/+1
\|
*	Improve messaging about why rebase button is missing	Ben Bodenmiller	2019-08-20	4	-3/+8
\|
*	Merge branch 'rf-remove-gl-sast-report-json' into 'master'	Yorick Peterse	2019-08-20	1	-861/+0
\|\ \| \| \| \| \| \| \| \|	Remove file that was accidentally added back See merge request gitlab-org/gitlab-ce!32014
\| *	Remove file that was accidentally added back	rossfuhrman	2019-08-20	1	-861/+0
\|/ \| \| \| \| \|	This file was moved to the EE project namespace, but https://gitlab.com/gitlab-org/gitlab-ce/commit/ce50d5c45158723925b098f7e0033963841137ff brought it back. It should not be present in this repo.
*	Merge branch 'pb-update-gitlab-shell-9-4-0' into 'master'	Nick Thomas	2019-08-20	2	-1/+6
\|\ \| \| \| \| \| \| \| \|	Update to GitLab Shell v9.4.0 See merge request gitlab-org/gitlab-ce!32009
\| *	Update to GitLab Shell v9.4.0	Patrick Bajao	2019-08-20	2	-1/+6
\| \|
* \|	Merge branch ↵	Filipa Lacerda	2019-08-20	2	-1/+7
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'62373-badge-counter-very-low-contrast-between-foreground-and-background-colors-2' into 'master' Resolve "Badge counter: Very low contrast between foreground and background colors" Closes #62373 See merge request gitlab-org/gitlab-ce!31922
\| * \|	Resolve "Badge counter: Very low contrast between foreground and background ↵	Jeremy Elder	2019-08-20	2	-1/+7
\|/ / \| \| \| \| \| \|	colors"
* \|	Merge branch 'tr-param-undefined-fix' into 'master'	Clement Ho	2019-08-20	3	-2/+27
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Embed metrics undefined param fix Closes #66177 See merge request gitlab-org/gitlab-ce!31975
\| * \|	Embed metrics undefined param fix	Tristan Read	2019-08-20	3	-2/+27
\|/ /
* \|	Merge branch 'an-fix-sidekiq-histogram-buckets' into 'master'61061-links-to-sha-commits-in-release-notes-don-t-display-in-the-new-releases-page-but-do-display-on-the-tags-page	Kamil Trzciński	2019-08-20	3	-2/+11
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Allow measurement of sidekiq jobs taking > 2.5s See merge request gitlab-org/gitlab-ce!32001
\| * \|	Allow measurement for Sidekiq jobs taking > 2.5s	Andrew Newdigate	2019-08-20	3	-2/+11
\|/ / \| \| \| \| \| \|	Fix for https://gitlab.com/gitlab-org/gitlab-ce/issues/66319.
* \|	Merge branch 'rf-move-sast-reports-to-mr-widget-backend' into 'master'	Paul Slaughter	2019-08-20	1	-86/+0
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Move SAST reports logic for MR widget to backend See merge request gitlab-org/gitlab-ce!31770
\| * \|	Move SAST reports logic for MR widget to backend	rossfuhrman	2019-08-20	1	-86/+0
\|/ / \| \| \| \| \| \|	Update spec that is changed in corresponding EE MR
* \|	Merge branch 'sh-fix-issues-api-gitaly-nplusone' into 'master'	Sean McGivern	2019-08-20	7	-5/+26
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Fix Gitaly N+1 calls with listing issues/MRs via API Closes #66202 See merge request gitlab-org/gitlab-ce!31938
\| *	Fix Gitaly N+1 calls with listing issues/MRs via APIsh-fix-issues-api-gitaly-nplusone	Stan Hu	2019-08-17	7	-5/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In GitLab 9.0, https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9661 removed the `subscribed` flag from the API when the user requested a list of issues or merge requests since calculating this value triggers extensive Markdown processing. In GitLab 12.0 via a4fbf39e, we accidentally reintroduced this performance regression by changing `IssueBasic` to `Issue` in `entities.rb`. This showed up as a Gitaly N+1 issue since the Markdown processing would attempt to extract a commit if it detected a regex that matched a commit. We restore the prior behavior by once again removing the `subscribed` flag for the bulk list of issues and merge requests and add a test to ensure they aren't reintroduced. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66202
* \|	Merge branch 'docs-testing-n-1-request-sepcs' into 'master'	Lin Jen-Shin	2019-08-20	2	-1/+8
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Require request specs when testing N+1 for controllers See merge request gitlab-org/gitlab-ce!31940
\| * \|	Require request specs when testing N+1 for controllers	Thong Kuah	2019-08-20	2	-1/+8
\| \|/
* \|	Merge branch 'pl-remove-virtus' into 'master'	Thong Kuah	2019-08-20	6	-37/+46
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Prefer ActiveModel's attributes over Virtus See merge request gitlab-org/gitlab-ce!31835
\| * \|	Use ActiveModel's type instead of virtus	Peter Leitzen	2019-08-20	6	-37/+46
\|/ / \| \| \| \| \| \| \| \| \| \|	The virtus project has been discontinued: https://github.com/solnic/virtus/commit/a6f896984
* \|	Merge branch 'kp-add-vue-input-autofocus-directive' into 'master'	Filipa Lacerda	2019-08-20	2	-0/+77
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add `autofocusonshow` directive for input elements See merge request gitlab-org/gitlab-ce!31584
\| * \|	Add `autofocus` directive for input elementskp-add-vue-input-autofocus-directive	Kushal Pandya	2019-08-19	2	-0/+77
\| \| \|
* \| \|	Merge branch 'fe-fix-merge-url-params-with-plus' into 'master'	Kushal Pandya	2019-08-20	4	-6/+43
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix `mergeUrlParams` handling of '+' Closes #66152 See merge request gitlab-org/gitlab-ce!31973
\| * \| \|	Add feature spec for search with spacefe-fix-merge-url-params-with-plus	minghuan lei	2019-08-19	1	-5/+25
\| \| \| \|
\| * \| \|	Fix mergeUrlParams handling of `+`	Paul Slaughter	2019-08-19	3	-1/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	What was the issue? If a param value had `+`, it would be encoded as a literal `+` instead of a space.
* \| \| \|	Merge branch 'update-sast-env-variables' into 'master'	Jan Provaznik	2019-08-20	1	-0/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing SAST environment variables See merge request gitlab-org/gitlab-ce!31954
\| * \| \| \|	Add missing SAST environment variables	Cameron Swords	2019-08-20	1	-0/+3
\|/ / / /
* \| \| \|	Merge branch 'chore/fix-typo' into 'master'	Marin Jankovski	2019-08-20	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix minor typo: CE -> EE See merge request gitlab-org/gitlab-ce!31952
\| * \| \| \|	Fix minor typo: CE -> EE	Arun Kumar Mohan	2019-08-19	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'docs/add-docker-auth-config-notice' into 'master'	Evan Read	2019-08-20	1	-8/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs DOCKER_AUTH_CONFIG not available for k8s See merge request gitlab-org/gitlab-ce!31961
\| * \| \| \| \|	Docs DOCKER_AUTH_CONFIG not available for k8s	Steve Azzopardi	2019-08-20	1	-8/+11
\|/ / / / /
* \| \| \| \|	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
\| \| \| \| \| \| \| \| \|