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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Apply suggestion to spec/support/helpers/email_helpers.rbfix-notes-emails-with-group-settings	Douwe Maan	2019-06-21	1	-2/+2
\|
*	Fix notes email with group-level notification email	Sean McGivern	2019-06-20	6	-26/+44
\| \| \| \| \|	A Noteable doesn't have a group directly, unless it's an epic - we need to look for the project's group to find the right email address.
*	Merge branch 'ce-12014-incremental-es-wiki-updates' into 'master'	Nick Thomas	2019-06-19	4	-8/+38
\|\ \| \| \| \| \| \| \| \|	Backport of 12014-incremental-es-wiki-updates See merge request gitlab-org/gitlab-ce!29531
\| *	Backport of 12014-incremental-es-wiki-updatesce-12014-incremental-es-wiki-updates	Mario de la Ossa	2019-06-18	4	-8/+38
\| \| \| \| \| \| \| \|	Bringing in the DB migration and some light changes for CE classes
* \|	Merge branch 'docs/12-0-upgrade-correction' into 'master'	Marin Jankovski	2019-06-19	1	-8/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Correct upgrade guides for 12.0 See merge request gitlab-org/gitlab-ce!29846
\| * \|	Correct upgrade guides for 12.0	Yorick Peterse	2019-06-19	1	-8/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It's fine to upgrade from 11.11.x to 12.x, so we remove the requirement to first upgrade to 12.0.x.
* \| \|	Merge branch ↵	Nick Thomas	2019-06-19	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'63399-intermittent-spec-failure-in-spec-models-ci-pipeline_schedule_spec-rb-131' into 'master' Resolve "Intermittent spec failure in spec/models/ci/pipeline_schedule_spec.rb:131" Closes #63399 See merge request gitlab-org/gitlab-ce!29838
\| * \| \|	Set a fixed date in pipeline shedule spec	Heinrich Lee Yu	2019-06-19	1	-1/+1
\| \|/ / \| \| \| \| \| \| \| \| \|	Fixes flaky master
* \| \|	Merge branch 'docs/file-lock-update' into 'master'	Marcia Ramos	2019-06-19	6	-42/+41
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \|	Refactor file locking docs See merge request gitlab-org/gitlab-ce!29686
\| * \|	Update file locking docs	Achilleas Pipinellis	2019-06-19	6	-42/+41
\|/ / \| \| \| \| \| \| \| \|	- Remove outdated 'introduced in' section - Update/remove images
* \|	Merge branch 'qa-ml-unquarantine-branches-test' into 'master'	Sanad Liaquat	2019-06-19	1	-2/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unquarantine the branches E2E test Closes gitlab-org/quality/nightly#62 See merge request gitlab-org/gitlab-ce!29828
\| * \|	Unquarantine the branches E2E testqa-ml-unquarantine-branches-test	Mark Lapierre	2019-06-19	1	-2/+1
\| \| \|
* \| \|	Merge branch 'docs/12-0-upgrade' into 'master'	Achilleas Pipinellis	2019-06-19	1	-0/+21
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Added source upgrade guides for 12.0.0 See merge request gitlab-org/gitlab-ce!29795
\| * \| \|	Added source upgrade guides for 12.0.0docs/12-0-upgrade	Yorick Peterse	2019-06-18	1	-0/+21
\| \| \| \|
* \| \| \|	Merge branch 'ac-usage-quotas-docs' into 'master'	Achilleas Pipinellis	2019-06-19	4	-4/+10
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document Usage Quotas group settings page Closes #63022 See merge request gitlab-org/gitlab-ce!29599
\| * \| \| \|	Document Usage Quotas group settings page	Alessio Caiazza	2019-06-19	4	-4/+10
\|/ / / /
* \| \| \|	Merge branch 'link_zoom_call_issue-docs' into 'master'	Achilleas Pipinellis	2019-06-19	2	-0/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add zoom call section in issue data page See merge request gitlab-org/gitlab-ce!29815
\| * \| \| \|	Add zoom call section in issue data pagelink_zoom_call_issue-docs	Seth Engelhard	2019-06-18	2	-0/+6
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch '57918-encrypt-feature-flags-tokens-changelog' into 'master'	Kamil Trzciński	2019-06-19	1	-0/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add changelog entry for the new operations_feature_flags_clients.token_encrypted column See merge request gitlab-org/gitlab-ce!29820
\| * \| \| \|	Add changelog for feature flags encrypted tokens	Krasimir Angelov	2019-06-19	1	-0/+5
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We missed to add this in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/29320. Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/57918
* \| \| \|	Merge branch 'qa-ml-unquarantine-merge-fork-test' into 'master'	Ramya Authappan	2019-06-19	2	-4/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unquarantine merge tests Closes gitlab-org/quality/nightly#93 and gitlab-org/quality/nightly#94 See merge request gitlab-org/gitlab-ce!29833
\| * \| \| \|	Unquarantine e2e tests	Mark Lapierre	2019-06-19	2	-4/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch 'jl-simplify-mattermost-docs' into 'master'	Achilleas Pipinellis	2019-06-19	3	-1/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Crosslink Mattermost integrations, simplify components list See merge request gitlab-org/gitlab-ce!29317
\| * \| \| \| \|	Crosslink Mattermost integrations, simplify components list	Joshua Lambert	2019-06-19	3	-1/+8
\|/ / / / /
* \| \| \| \|	Merge branch '52954-allow-developers-to-delete-tags' into 'master'	James Lopez	2019-06-19	20	-33/+44
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow developers to delete tags Closes #52954 See merge request gitlab-org/gitlab-ce!29668
\| * \| \| \| \|	Add documentation and tests	Manoj MJ	2019-06-19	20	-33/+44
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit adds - feature specs - to test the ability of a user with "developer" permission to delete tags in repositories. - documentation
* \| \| \| \|	Merge branch '11448-fix-cs-with-k8s-runners' into 'master'	James Lopez	2019-06-19	2	-1/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Container Scanning job with K8S runners Closes gitlab-ee#11448 See merge request gitlab-org/gitlab-ce!29706
\| * \| \| \| \|	Fix Container Scanning job with K8S runners	Philippe Lafoucrière	2019-06-19	2	-1/+6
\|/ / / / /
* \| \| \| \|	Merge branch 'bvl-dont-translate-api-docs' into 'master'	Achilleas Pipinellis	2019-06-19	1	-0/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add note about not translating API messages. See merge request gitlab-org/gitlab-ce!29748
\| * \| \| \| \|	Add note about not translating API messages.	Bob Van Landuyt	2019-06-19	1	-0/+3
\|/ / / / /
* \| \| \| \|	Merge branch '61201-pass-identities-to-external-authorization' into 'master'	Jan Provaznik	2019-06-19	4	-4/+41
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add identity information to external authorization requests See merge request gitlab-org/gitlab-ce!29461
\| * \| \| \| \|	Adds identity information while making external authorization requests	Manoj MJ	2019-06-19	4	-4/+41
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/61201#
* \| \| \| \|	Merge branch 'fix-microsoft-teams-notification-flags' into 'master'	Stan Hu	2019-06-19	4	-2/+22
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix missing API notification flags for Microsoft Teams See merge request gitlab-org/gitlab-ce!29824
\| * \| \| \|	Add missing test for Microsoft Teams notify_only_default_branch flag	Seiji Suenaga	2019-06-18	1	-0/+12
\| \| \| \| \|
\| * \| \| \|	59702 Add changelog entry	Seiji Suenaga	2019-06-18	1	-0/+5
\| \| \| \| \|
\| * \| \| \|	59702 Fix API notification flags for MS Teams	Seiji Suenaga	2019-06-18	2	-2/+5
\| \| \| \| \|
* \| \| \| \|	Merge branch 'docs/indent-new-section' into 'master'	Achilleas Pipinellis	2019-06-19	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Demote new section See merge request gitlab-org/gitlab-ce!29829
\| * \| \| \| \|	Demote new section	Evan Read	2019-06-19	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge branch 'qa-nightly-100-un-quarantine-oauth-spec' into 'master'	Sanad Liaquat	2019-06-19	1	-2/+1
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Un-quarantine OAuth spec Closes gitlab-org/quality/nightly#100 See merge request gitlab-org/gitlab-ce!29764
\| * \| \| \|	Unquarantine OAuth specqa-nightly-100-un-quarantine-oauth-spec	Sanad Liaquat	2019-06-17	1	-2/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'remove-support-for-app-label-matching' into 'master'	Ash McKenzie	2019-06-19	3	-18/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove support for app label matching See merge request gitlab-org/gitlab-ce!29460
\| * \| \| \| \|	Docs: note removal of app label supportremove-support-for-app-label-matching	Thong Kuah	2019-06-19	1	-2/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Stop matching on legacy app label	Thong Kuah	2019-06-19	2	-16/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	From now on, only match on the annotations, instead of falling back to legacy app label. This enables users to use the app label for other purposes such as helm charts.
* \| \| \| \| \|	Merge branch 'removes-database-yml-example' into 'master'	Ash McKenzie	2019-06-19	1	-0/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes database.yml.example See merge request gitlab-org/gitlab-ce!29822
\| * \| \| \| \| \|	Removes database.yml.example file from config/removes-database-yml-example	Mayra Cabrera	2019-06-18	1	-0/+0
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It's an empty file that was committed by accident on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/28565
* \| \| \| \| \|	Merge branch 'sh-cache-feature-flag-names' into 'master'	Thong Kuah	2019-06-18	3	-2/+19
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cache feature flag names in Redis for a minute Closes #63435 See merge request gitlab-org/gitlab-ce!29816
\| * \| \| \| \|	Cache feature flag names in Redis for a minute	Stan Hu	2019-06-18	3	-2/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We saw on GitLab.com, the SQL query, `SELECT "features"."key" FROM "features"` peaked at 2300 times per second. We can quiet this down a bit by caching it in Redis for a minute. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63435
* \| \| \| \| \|	Merge branch 'docs-14664-collapsible-job-log' into 'master'	Evan Read	2019-06-18	2	-0/+14
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds docs for job collapsible sections See merge request gitlab-org/gitlab-ce!29792
\| * \| \| \| \| \|	Adds docs for job collapsible sections	Filipa Lacerda	2019-06-18	2	-0/+14
\|/ / / / / /
* \| \| \| \| \|	Merge branch ↵	Mayra Cabrera	2019-06-18	5	-34/+39
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'62183-update-response-code-for-bulk-delete-api-for-container-registry' into 'master' Update response code for container registry api bulk delete Closes #62183 See merge request gitlab-org/gitlab-ce!29448