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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update VERSION to 12.2.0v12.2.0	GitLab Release Tools Bot	2019-08-21	1	-1/+1
\|
*	Update CHANGELOG.md for 12.2.0	GitLab Release Tools Bot	2019-08-21	217	-1088/+240
\| \| \|	[ci skip]
*	Update VERSION to 12.2.0-rc32v12.2.0-rc32	GitLab Release Tools Bot	2019-08-21	1	-1/+1
\|
*	Merge branch 'qa-backport-fix-remaining-prepend-lines' into 'master'	Rémy Coutable	2019-08-21	8	-13/+97
\| \| \| \| \| \| \| \| \| \| \|	Update qa/Dockerfile to be built from the project root context See merge request gitlab-org/gitlab-ce!31533 (cherry picked from commit 4d4e88df01554336daf245a68653b80ca00989a5) 6aa215aa Support X_if_ee methods for QA tests b601cfcf Update qa/Dockerfile to be built from the project root context 9a4dcd8d Update the 'build-qa-image' job to be built from project root context
*	Update VERSION to 12.2.0-rc31v12.2.0-rc31 12-2-stable-prepare-rc32	GitLab Release Tools Bot	2019-08-20	1	-1/+1
\|
*	Merge commit 'cb60449102dbc129794a8fb3d9535b1ea70d739b' into ↵12-2-stable-prepare-rc31	Marin Jankovski	2019-08-19	35	-363/+327
\|\ \| \| \| \| \| \|	12-2-auto-deploy-20190818
\| *	Merge branch 'docs/migrate-cycle-analytics' into 'master'	Achilleas Pipinellis	2019-08-19	5	-187/+218
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Migrate cycle analytics topic to new section See merge request gitlab-org/gitlab-ce!31827
\| \| *	Migrate cycle analytics topic to new section	Evan Read	2019-08-19	5	-187/+218
\| \|/ \| \| \| \| \| \| \| \|	Also fixes links to new section and refactors some existing content for the GitLab 12.2 changes.
\| *	Merge branch 'sh-fix-pipelines-not-being-created' into 'master'	Nick Thomas	2019-08-19	4	-9/+33
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix pipelines not always being created after a push Closes #66196 See merge request gitlab-org/gitlab-ce!31927
\| \| *	Fix pipelines not always being created after a pushsh-fix-pipelines-not-being-created	Stan Hu	2019-08-17	4	-9/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/31741 introduced a regression where not all the right parameters would be passed into `Ci::CreatePipelineService`. We fix this by breaking out the pipeline parameters and reusing a method from `Gitlab::DataBuilder::Push`. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66196
\| * \|	Merge branch 'docs-update-jira-service-page-screenshot' into 'master'64749-usage-quota-button-for-subgroup-leads-to-404	Evan Read	2019-08-19	3	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update docs jira service page screenshot Closes #64778 See merge request gitlab-org/gitlab-ce!31911
\| \| * \|	Update doc/user/project/integrations/jira.md, ↵	Kemais Ehlers	2019-08-19	3	-1/+1
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	doc/user/project/integrations/img/jira_service_page_v12_2.png files Deleted doc/user/project/integrations/img/jira_service_page.png
\| * \|	Merge branch 'docs-quick-actions-formatting-issue-2019-08' into 'master'	Evan Read	2019-08-19	1	-8/+10
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Escape vertical bars inside code blocks in quick_actions.md See merge request gitlab-org/gitlab-ce!31556
\| \| * \|	Escape vertical bars inside code blocks in quick_actions.md - Markdown ↵	Jonathan Love	2019-08-19	1	-8/+10
\| \|/ / \| \| \| \| \| \| \| \| \|	parsing in previews and Gitlab.com appear to parse these as table delimiters even when inside a code block.
\| * \|	Merge branch 'docs-discussions-image-tweak' into 'master'	Evan Read	2019-08-19	2	-0/+0
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update screenshot to fix bad html Closes #63920 See merge request gitlab-org/gitlab-ce!31889
\| \| * \|	Update screenshot to fix bad html	Marcel Amirault	2019-08-19	2	-0/+0
\| \|/ /
\| * \|	Merge branch 'docs-runner-needs-owner' into 'master'	Evan Read	2019-08-19	1	-4/+4
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix required runner permissions Closes #52513 See merge request gitlab-org/gitlab-ce!31598
\| \| * \|	Fix required runner permissionsdocs-runner-needs-owner	Elliot Rushton	2019-08-08	1	-4/+4
\| \| \| \|
\| * \| \|	Merge branch 'docs-resolve-65097' into 'master'	Evan Read	2019-08-19	1	-8/+7
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Improve clarity of SCIM workflow Closes #65097 See merge request gitlab-org/gitlab-ce!31881
\| \| * \| \|	Docs: Improve clarity of SCIM workflow	Tristan Williams	2019-08-19	1	-8/+7
\| \|/ / /
\| * \| \|	Merge branch 'qa-quarantine-templates-test' into 'master'	Mark Lapierre	2019-08-19	1	-1/+2
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Quarantine failing test See merge request gitlab-org/gitlab-ce!31943
\| \| * \| \|	Quarantine failing testqa-quarantine-templates-test	Mark Lapierre	2019-08-19	1	-1/+2
\| \| \| \|/ \| \| \|/\|
\| * \| \|	Merge branch 'ee-12980-address-blocking-mr-docs-review' into 'master'	Evan Read	2019-08-19	4	-15/+15
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve docs for cross-project MR dependencies Closes gitlab-ee#12980 See merge request gitlab-org/gitlab-ce!31904
\| \| * \| \|	Improve docs for cross-project MR dependencies	Nick Thomas	2019-08-19	4	-15/+15
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Addressing a documentation review by Marcia!
\| * \| \|	Merge branch 'docs-update-ci-quick-start' into 'master'	Evan Read	2019-08-19	4	-0/+0
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Refresh CI quick start screenshots See merge request gitlab-org/gitlab-ce!31877
\| \| * \| \|	Docs: Refresh CI quick start screenshots	Tristan Williams	2019-08-19	4	-0/+0
\| \|/ / /
\| * \| \|	Merge branch 'remove-mysql-from-dev-docs' into 'master'	Evan Read	2019-08-19	10	-72/+34
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove MySQL references from development docs See merge request gitlab-org/gitlab-ce!31712
\| \| * \| \|	Remove MySQL references from development docs	Nick Thomas	2019-08-16	10	-72/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I noticed the doc/development/testing_guide/best_practices.md still referenced the `[run mysql]` tags, etc. They no longer work, so I removed them, then realised I had better clean up the rest of doc/development !
\| * \| \| \|	Merge branch 'updates-rate-limit-docs' into 'master'	Evan Read	2019-08-18	2	-3/+9
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mentions `auth.log` on Rate limit docs See merge request gitlab-org/gitlab-ce!31906
\| \| * \| \| \|	Mentions related log on Rate limit docs	Mayra Cabrera	2019-08-18	2	-3/+9
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Requests over the rate limit are logged into `auth.log`
\| * \| \| \|	Merge branch 'docs/update-srm-settings' into 'master'	Evan Read	2019-08-18	1	-64/+19
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update srmX configuration description See merge request gitlab-org/gitlab-ce!31142
\| \| * \| \| \|	Update srmX configurationdocs/update-srm-settings	Steve Azzopardi	2019-08-16	1	-64/+19
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'docs-api-ci-auth' into 'master'	Evan Read	2019-08-18	1	-1/+10
\| \|\ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add GitLab CI job token API authentication section See merge request gitlab-org/gitlab-ce!30698
\| \| * \| \| \|	add GitLab CI job token API authentication section	Ben Bodenmiller	2019-08-18	1	-1/+10
\| \|/ / / /
* \| \| \| \|	Merge branch 'sh-fix-pipelines-not-being-created' into 'master'	Nick Thomas	2019-08-19	4	-9/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix pipelines not always being created after a push Closes #66196 See merge request gitlab-org/gitlab-ce!31927 (cherry picked from commit c7d12e602120bc0ec801b9696c7ac344dda10fc4) b46b9d5e Fix pipelines not always being created after a push
* \| \| \| \|	Merge branch 'qa-quarantine-templates-test' into 'master'	Mark Lapierre	2019-08-19	1	-1/+2
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Quarantine failing test See merge request gitlab-org/gitlab-ce!31943 (cherry picked from commit 15085d0327e6472ff749b45b83bbc90ce37333f4) 56dcd45a Quarantine failing test
* \| \| \|	Merge branch ↵	Paul Slaughter	2019-08-17	27	-23/+278
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'50020-fe-allow-email-notifications-to-be-disabled-for-all-users-of-a-group' into 'master' UI for disabling group/project email notifications Closes #50020 See merge request gitlab-org/gitlab-ce!30961
\| * \| \| \|	UI for disabling group/project email notification	Brett Walker	2019-08-17	27	-23/+278
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Adds UI to configure in group and project settings - Removes notification configuration for users when disabled at group or project level
* \| \| \|	Merge branch 'legacy-attachments-migrate-fix' into 'master'	Michael Kozono	2019-08-16	11	-4/+584
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate legacy uploads rake tasks See merge request gitlab-org/gitlab-ce!29409
\| * \| \| \|	Add rake tasks for migrating leacy uploadslegacy-attachments-migrate-fix	Jarka Košanová	2019-08-16	11	-4/+584
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- move uploads created by AttachmentUploader - handle also files created for legacy_diff_notes
* \| \| \| \|	Merge branch ↵	Paul Slaughter	2019-08-16	5	-0/+69
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'10972-be-allow-restricting-group-members-by-a-domain-whitelist-ce' into 'master' Add new table to store email domain per group See merge request gitlab-org/gitlab-ce!31071
\| * \| \| \| \|	Add new table to store email domain	Gosia Ksionek	2019-08-16	5	-0/+69
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In order to save user preferences regarding user emails allowed to be invited to group Add foreign_key and down method Change adding foreign key Add partial call to view Add changelog entry Fix schema
* \| \| \| \|	Merge branch '62971-embed-specific-metrics-chart-in-issue' into 'master'	Clement Ho	2019-08-16	3	-14/+29
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Embed specific metrics chart in issue Closes #62971 See merge request gitlab-org/gitlab-ce!31644
\| * \| \| \| \|	Adds specific metric styles and prop	Laura Montemayor	2019-08-16	3	-14/+29
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This MR adds the styles for displaying a single chart next to another one when embedding them in an issue.
* \| \| \| \|	Merge branch '66023-starrers-count-do-not-match-after-searching' into 'master'	Stan Hu	2019-08-16	3	-56/+119
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix starrers counts after searching See merge request gitlab-org/gitlab-ce!31823
\| * \| \| \| \|	Add CHANGELOG entry66023-starrers-count-do-not-match-after-searching	Douglas Barbosa Alexandre	2019-08-15	1	-0/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Fix starrers counters after searching	Douglas Barbosa Alexandre	2019-08-15	2	-56/+114
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'dm-process-commit-worker-n+1' into 'master'	Stan Hu	2019-08-16	5	-67/+90
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Look up upstream commits once before queuing ProcessCommitWorkers Closes #65464 See merge request gitlab-org/gitlab-ce!31871
\| * \| \| \| \| \|	Look up upstream commits once before queuing ProcessCommitWorkers	Douwe Maan	2019-08-16	5	-67/+90
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of checking if a commit already exists in the upstream project in its ProcessCommitWorker and bailing out if it does, we check the existence of all commits in bulk in Git::BranchHooksService, so that we can skip scheduling ProcessCommitWorker jobs for those commits that already exist upstream entirely.
* \| \| \| \| \| \|	Merge branch 'optimize-note-indexes' into 'master'	Mayra Cabrera	2019-08-16	4	-2/+66
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Optimize DB indexes for ES indexing of notes See merge request gitlab-org/gitlab-ce!31846