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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update VERSION to 12.0.2v12.0.2	GitLab Release Tools Bot	2019-06-25	1	-1/+1
\|
*	Update CHANGELOG.md for 12.0.2	GitLab Release Tools Bot	2019-06-25	9	-40/+17
\| \| \|	[ci skip]
*	Merge branch '12-0-stable-patch-2' into '12-0-stable'	Robert Speicher	2019-06-25	45	-95/+528
\|\ \| \| \| \| \| \| \| \|	Prepare 12.0.2 release See merge request gitlab-org/gitlab-ce!30045
\| *	Merge branch 'sh-quiet-backup-secrets-log' into 'master'12-0-stable-patch-2	Rémy Coutable	2019-06-25	2	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Silence backup warnings when CRON=1 in use Closes #63703 See merge request gitlab-org/gitlab-ce!30033 (cherry picked from commit d6c7d4c48db51fdc3eb479e53d40ce4358695218) ad3abd1d Silence backup warnings when CRON=1 in use
\| *	Merge branch 'sh-recover-ee-schema-backport-migration-failure' into 'master'	Rémy Coutable	2019-06-25	3	-0/+94
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent EE backport migrations from running if CE is not migrated Closes #63612 See merge request gitlab-org/gitlab-ce!30002 (cherry picked from commit 34df0b303eed0cee83d8c0ec6178d3c575a0b555) 1b063778 Prevent EE backport migrations from running if CE is not migrated
\| *	Merge branch 'docs/variables-doc-introduced-text' into 'master'	Achilleas Pipinellis	2019-06-25	1	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor and add version text to variable syntax See merge request gitlab-org/gitlab-ce!29964 (cherry picked from commit 4ec1720fdbf6b4fb4ae5dc91bc0f5974717e6caf) 7d93954e Refactor and add version text to variable syntax
\| *	Merge branch 'docs/deps-gemansium' into 'master'	Mike Lewis	2019-06-25	1	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Gemnasium dead link from docs See merge request gitlab-org/gitlab-ce!29942 (cherry picked from commit 76f49de4e772c4101bcb8df801ad9b7a78adcea7) a84a7233 Remove Gemnasium dead link from docs
\| *	Merge branch ↵	Stan Hu	2019-06-25	3	-23/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'63513-ensure-gitlab-jsoncache-includes-the-gitlab-version-in-the-cache-key' into 'master' Include the GitLab version in the cache key for Gitlab::JsonCache See merge request gitlab-org/gitlab-ce!29938 (cherry picked from commit c6f54ab12b5b276dadda0639ea647e9a2b4c1781) 94d9e335 Include the GitLab version in the cache key for Gitlab::JsonCache 1b7e7dde Add CHANGELOG entry
\| *	Merge branch 'sh-omit-issues-links-on-poll' into 'master'	Mayra Cabrera	2019-06-25	5	-4/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Omit issues links in merge request entity API response Closes #63546 See merge request gitlab-org/gitlab-ce!29917 (cherry picked from commit f47e4d025247509ab73e16c3db248b0f9ccb662c) 1b7ab11f Omit issues links in merge request entity API response
\| *	Merge branch 'fix-notes-emails-with-group-settings' into 'master'	Douwe Maan	2019-06-25	6	-26/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix notes email with group-level notification email Closes #63355 See merge request gitlab-org/gitlab-ce!29889 (cherry picked from commit 480eb370a477c3a230cec1ff43a71066ab5be6f9) bf73ecd7 Fix notes email with group-level notification email 8eb2d7bb Apply suggestion to spec/support/helpers/email_helpers.rb
\| *	Merge branch '63510-error-parsing-true-boolean-in-gitlab-jsoncache' into ↵	Ash McKenzie	2019-06-25	2	-1/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Gitlab::JsonCache#parse_value ensure string Closes #63510 See merge request gitlab-org/gitlab-ce!29885 (cherry picked from commit 788690304a495aa6c4d3e2fa163753f28fbdb82f) 03220c00 Gitlab::JsonCache#parse_value ensure string
\| *	Merge branch 'docs/add-to-list-of-access-control-functions' into 'master'	Achilleas Pipinellis	2019-06-25	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add to list of functionality See merge request gitlab-org/gitlab-ce!29876 (cherry picked from commit ef2bd684b0a7afd1981d9d3bcc63211a63e4eca3) 0dc21bf2 Add to list of functionality
\| *	Merge branch '12174-add-remove-child-epic-quick-actions-doc-ce' into 'master'	Achilleas Pipinellis	2019-06-25	1	-5/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation on epic add/remove child relations quick actions See merge request gitlab-org/gitlab-ce!29860 (cherry picked from commit 2b58712527ee8f47c1c1818511e4f0516c933fa4) a15e6206 Add documentation on epic add/remove child relations quick actions
\| *	Merge branch 'fix-labels-in-hooks' into 'master'	Ash McKenzie	2019-06-25	7	-10/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix label serialisation in issue and note hooks Closes #63473 See merge request gitlab-org/gitlab-ce!29850 (cherry picked from commit 88c8d177f835983a0a47796529906c69376d159d) da470249 Fix label serialisation in issue and note hooks 4189ffe2 Added labels_hook_attrs method
\| *	Merge branch 'bug/63162-duplicate_path_in_links' into 'master'	Sean McGivern	2019-06-25	4	-1/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not rewrite relative links for system notes Closes #63162 See merge request gitlab-org/gitlab-ce!29825 (cherry picked from commit 51df2ca5c5a1b18155b7bba9bdc26c165533428b) 35a39c1d Do not rewrite relative links for system notes
\| *	Merge branch 'fix-microsoft-teams-notification-flags' into 'master'	Stan Hu	2019-06-25	4	-2/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix missing API notification flags for Microsoft Teams See merge request gitlab-org/gitlab-ce!29824 (cherry picked from commit 51267258d1c39835c995eaaf29b7df678334ded1) d5d2f8fb 59702 Fix API notification flags for MS Teams f7658c0f 59702 Add changelog entry 1ce2c4dc Add missing test for Microsoft Teams notify_only_default_branch flag
\| *	Merge branch 'docs-prometheus-service-discovery' into 'master'	Achilleas Pipinellis	2019-06-25	6	-2/+192
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Documentation for Prometheus Service Discovery Closes #63110 See merge request gitlab-org/gitlab-ce!29811 (cherry picked from commit 46640168fa13e7e4b7b32adb003ff3a5b883192b) 95525a56 Adding documentation for Prometheus Service Discovery 781d05af Moved monitoring to its own step f6c0fd2e Adding monitoring to number list in Redis db2f83f3 Updates based on review 1105b8ea A couple of missed adjustments
\| *	Merge branch 'sh-update-component-list-docs' into 'master'	Evan Read	2019-06-25	1	-3/+3
\|/ \| \| \| \| \| \| \| \| \|	Update Grafana and GitLab Monitor in component list See merge request gitlab-org/gitlab-ce!29537 (cherry picked from commit 2c48cb24983314ab78963d2dfb2a74b0f9104fc8) be3b60af Update Grafana and GitLab Monitor in component list 6fd4784f Update link to gitlab-monitor-charts
*	Update VERSION to 12.0.1v12.0.1	GitLab Release Tools Bot	2019-06-24	1	-1/+1
\|
*	Update CHANGELOG.md for 12.0.1	GitLab Release Tools Bot	2019-06-24	1	-0/+4
\| \| \|	[ci skip]
*	Update VERSION to 12.0.0v12.0.0	GitLab Release Tools Bot	2019-06-22	1	-1/+1
\|
*	Update CHANGELOG.md for 12.0.0	GitLab Release Tools Bot	2019-06-22	287	-1433/+310
\| \| \|	[ci skip]
*	Merge branch '12-0-stable-prepare-rc22' into '12-0-stable'	Marin Jankovski	2019-06-20	2	-6/+23
\|\ \| \| \| \| \| \| \| \|	Prepare 12.0.0-rc22 release See merge request gitlab-org/gitlab-ce!29901
\| *	Merge branch 'docs/edit-zoom-call-link-content' into 'master'12-0-stable-prepare-rc22	Achilleas Pipinellis	2019-06-20	1	-2/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Edit new Zoom call link content See merge request gitlab-org/gitlab-ce!29878 (cherry picked from commit 265fc7bc336f061570bab5bd7483b2f86b12ce7f) 52252430 Edit new Zoom call link content
\| *	Merge branch 'docs/existing-knative-edit' into 'master'	Achilleas Pipinellis	2019-06-20	1	-4/+14
\|/ \| \| \| \| \| \| \| \|	Add version text and edit section See merge request gitlab-org/gitlab-ce!29875 (cherry picked from commit e0125d7bc006d5ccbad9db5258d403071ced674d) 5239f88d Add version text and edit section
*	Merge branch '12-0-stable-prepare-rc22' into '12-0-stable'	Robert Speicher	2019-06-19	19	-54/+136
\|\ \| \| \| \| \| \| \| \|	Prepare 12.0.0-rc22 release See merge request gitlab-org/gitlab-ce!29865
\| *	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 (cherry picked from commit 366d0eb2018c652eb03e48f6b921e705d1789455) 693e01ab Add zoom call section in issue data page
\| *	Merge branch '63417-add-missing-class' into 'master'	Kamil Trzciński	2019-06-19	3	-3/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds missing class in collapsible sections Closes #63417 See merge request gitlab-org/gitlab-ce!29804 (cherry picked from commit 22755a4aa2d2884629ef9050227ef461574d9d94) d3a1468b Adds missing class
\| *	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 (cherry picked from commit 66425a93f44d3d52add7e317e5067ad7c953010b) e2aaa602 Added source upgrade guides for 12.0.0
\| *	Merge branch '11449-qa-fixes-for-sast-ds-docs' into 'master'	Achilleas Pipinellis	2019-06-19	2	-8/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typos, grammar and wording for SAST and DS report JSON docs See merge request gitlab-org/gitlab-ce!29744 (cherry picked from commit 892b68db5c7fd92e048fbe3c7448e8cc219e4c39) 01f39725 Fix typos and bad wording for SAST and DS docs
\| *	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 (cherry picked from commit d5829bef982ee5ac6fc2c44b9bcdc5328b0866f7) a4f1263c Document Pipeline quota -> Usage Quotas rename 3a5db39b Document group storage usage quota
\| *	Merge branch 'zj-feature-flag-default-on-catfile-cache' into 'master'	Douwe Maan	2019-06-19	7	-39/+84
\|/ \| \| \| \| \| \| \| \| \| \| \|	Feature flag default on catfile cache Closes gitaly#1712 See merge request gitlab-org/gitlab-ce!29556 (cherry picked from commit 14d46afd9b3ee7482fa8be7bc6782b19e960ce45) 968674e4 Move Gitaly feature flag logic to Feature::Gitaly 4dfaaf40 Turn on Cat-File cache by default
*	Merge branch '12-1-auto-deploy-0010836' into 12-0-stable	Robert Speicher	2019-06-19	15	-13/+163
\|\
\| *	Merge branch 'sh-pipeline-typo-docs' into 'master'	Marcia Ramos	2019-06-19	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in doc/user/project/pipelines/settings.md See merge request gitlab-org/gitlab-ce!29851 (cherry picked from commit 9df475eb368d81d90022b646fe9d7c0944d854f1) 52a0750a Fix typo in doc/user/project/pipelines/settings.md 37276349 Apply suggestion to doc/user/project/pipelines/settings.md
\| *	Merge branch 'revert-concurrent-pipeline-schedule-creation' into 'master'	Kamil Trzciński	2019-06-18	3	-1/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert concurrent pipeline creation for pipeline schedules See merge request gitlab-org/gitlab-ce!29794 (cherry picked from commit ba952d53c5782e49b59ba3e5dd89c2c1eca02c80) 36b30cf1 Revert concurrent pipeline schedule creation
\| *	Merge branch '59023-fix-web-ide-creating-branches-off-new-commits' into 'master'	Phil Hughes	2019-06-18	7	-10/+92
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix IDE commit to use start_ref See merge request gitlab-org/gitlab-ce!29769 (cherry picked from commit c4efc7b53aad3be5109c4256f3438f908e180c20) 894ad6f6 Fix IDE commit to use start_ref
\| *	Merge branch 'backport-report_approver-migration-to-ce' into 'master'	Yorick Peterse	2019-06-18	2	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport approval MR rules report_type migration to CE See merge request gitlab-org/gitlab-ce!29766 (cherry picked from commit 53036a5bc6dcdc120ce828e3366be8b4486f9a6a) 5d76e091 Backport approval MR rules report_type migration to CE
\| *	Merge branch 'gitaly-version-v1.47.0' into 'master'	Yorick Peterse	2019-06-18	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade Gitaly to v1.47.0 See merge request gitlab-org/gitlab-ce!29789 (cherry picked from commit 1de4ebc7eed1b6fe25feb5a5306b83b15ced6ab2) 7144f715 Update Gitaly version to v1.47.0 3efb1520 Add changelog entry
\| *	Restore Jira tables in db/schema.rb	Yorick Peterse	2019-06-17	1	-0/+20
\| \| \| \| \| \| \| \| \| \|	Cherry-picking the schema backport commits led to these changes being thrown away, without this being clear.
\| *	Merge branch 'merge-schema-backport-to-auto-deploy' into ↵	Yorick Peterse	2019-06-17	108	-3455/+4696
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'12-1-auto-deploy-0010836' Merge database schema backport into the auto deploy branch See merge request gitlab-org/gitlab-ce!29773
\| \| *	Run CI migrations since 11.11.0	Yorick Peterse	2019-06-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	One can not upgrade straigt from 9.3 to 12.0, due to the schema changes being backported. Instead, one must first upgrade to 11.11.X. Omnibus already enforces this, and our online upgrade guidelines also cover this. By changing the CI config we don't have to adjust the backport migration to handle a migration path that one can not take.
\| \| *	Backport the EE schema and migrations to CE	Yorick Peterse	2019-06-17	105	-3449/+4659
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This backports all EE schema changes to CE, including EE migrations, ensuring both use the same schema. == Updated tests A spec related to ghost and support bot users had to be modified to make it pass. The spec in question assumes that the "support_bot" column exists when defining the spec. In the single codebase setup this is not the case, as the column is backported in a later migration. Any attempt to use a different schema version or use of "around" blocks to conditionally disable specs won't help, as reverting the backport migration would also drop the "support_bot" column. Removing the "support_bot" tests entirely appears to be the only solution. We also need to update some foreign key tests now that we have backported the EE columns. Fortunately, these changes are very minor. == Backporting migrations This commit moves EE specific migrations (except those for the Geo tracking database) and related files to CE, and also removes any traces of the ee/db directory. Some migrations had to be modified or removed, as they no longer work with the schema being backported. These migrations were all quite old, so we opted for removing them where modifying them would take too much time and effort. Some old migrations were modified in EE, while also existing in CE. In these cases we took the EE code, and in one case removed them entirely. It's not worth spending time trying to merge these changes somehow as we plan to remove old migrations around the release of 12.0, see https://gitlab.com/gitlab-org/gitlab-ce/issues/59177 for more details.
\| \| *	Allow custom names for concurrent foreign keys	Yorick Peterse	2019-06-17	2	-5/+36
\| \|/ \| \| \| \| \| \| \| \|	This is necessary for backporting the EE schema to ensure backported foreign keys use the same key names.
\| *	Merge branch 'master-i18n' into 'master'	Bob Van Landuyt	2019-06-17	45	-71/+1556
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Master i18n See merge request gitlab-org/gitlab-ce!29723 (cherry picked from commit 305455cf9bda14a373f874ccec8c3d6416fb9e5e) a1dcb7d3 New translations gitlab.pot (Albanian) 8db4ba3e New translations gitlab.pot (Punjabi) c61fad94 New translations gitlab.pot (Italian) 34bf8941 New translations gitlab.pot (Japanese) 7d3419a0 New translations gitlab.pot (Korean) 49f57a69 New translations gitlab.pot (Mongolian) 34765378 New translations gitlab.pot (Norwegian Bokmal) 0e7a6679 New translations gitlab.pot (Polish) da83606f New translations gitlab.pot (Portuguese) baa8d077 New translations gitlab.pot (Portuguese, Brazilian) 2fd714bc New translations gitlab.pot (Romanian) 13e4fc39 New translations gitlab.pot (Hungarian) 68e85259 New translations gitlab.pot (Russian) be746bfa New translations gitlab.pot (Serbian (Cyrillic)) b0357577 New translations gitlab.pot (Serbian (Latin)) 892b407a New translations gitlab.pot (Slovak) 5290c636 New translations gitlab.pot (Spanish) a13e58c6 New translations gitlab.pot (Swahili) d7cb5911 New translations gitlab.pot (Swedish) a458871c New translations gitlab.pot (Turkish) 2cf187a9 New translations gitlab.pot (Ukrainian) d95c03ab New translations gitlab.pot (Indonesian) 196b7d5f New translations gitlab.pot (Hindi) eabd6864 New translations gitlab.pot (Arabic) 194d74a2 New translations gitlab.pot (Czech) e3237345 New translations gitlab.pot (Bengali) e5fec117 New translations gitlab.pot (Bengali, India) c55ab12e New translations gitlab.pot (Bulgarian) f355bdb5 New translations gitlab.pot (Catalan) 54f64291 New translations gitlab.pot (Chinese Simplified) 93d28530 New translations gitlab.pot (Chinese Traditional) 83d9265b New translations gitlab.pot (Chinese Traditional, Hong Kong) 4f1ef2d0 New translations gitlab.pot (Croatian) a201b464 New translations gitlab.pot (Danish) 0c49b3f8 New translations gitlab.pot (Hebrew) 9b2dadf7 New translations gitlab.pot (Dutch) 5cb639e2 New translations gitlab.pot (Esperanto) 872ca22c New translations gitlab.pot (Estonian) 4e51c327 New translations gitlab.pot (Filipino) 9e2c3477 New translations gitlab.pot (French) c5550010 New translations gitlab.pot (Galician) a7b4e2fa New translations gitlab.pot (Georgian) 9a02e9b3 New translations gitlab.pot (German) e26abe82 New translations gitlab.pot (Greek) 54ccdd45 New translations gitlab.pot (Welsh) 30fa8cbb New translations gitlab.pot (Ukrainian)
* \|	Merge branch 'config-application-differences' into 'master'	Lin Jen-Shin	2019-06-18	1	-0/+30
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Backport EE changes to config/application.rb See merge request gitlab-org/gitlab-ce!29557
\| * \|	Backport EE changes to config/application.rbconfig-application-differences	Yorick Peterse	2019-06-17	1	-0/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This backports the EE changes made to this config file to CE. EE specific bits do not need an `if Gitlab.ee?`, as everything will work transparently when using CE.
* \| \|	Merge branch 'ashmckenzie/add-created-at-index-to-events' into 'master'	Thong Kuah	2019-06-18	2	-0/+27
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add index to events and audit_events tables Closes gitlab-com/Product#309 See merge request gitlab-org/gitlab-ce!29194
\| * \| \|	Add index to events and audit_events tablesashmckenzie/add-created-at-index-to-events	Ash McKenzie	2019-06-18	2	-0/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Index on created_at, author_id
* \| \| \|	Merge branch 'bw-update-graphql-docs' into 'master'	Evan Read	2019-06-18	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update GraphQL document to mention that epics are supported See merge request gitlab-org/gitlab-ce!29777
\| * \| \| \|	Mention that epics are supported in GraphqlQLbw-update-graphql-docs	Brett Walker	2019-06-17	1	-1/+1
\| \| \| \| \|