Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								baac85e2e2 
								
							 
						 
						
							
							
								
								Merge pull request  #1743  from ClearlyClaire/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2022-04-14 14:45:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								9c7a6afbf6 
								
							 
						 
						
							
							
								
								Bump bootsnap from 1.10.3 to 1.11.1 ( #17778 )  
							
							... 
							
							
							
							Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.10.3 to 1.11.1.
- [Release notes](https://github.com/Shopify/bootsnap/releases )
- [Changelog](https://github.com/Shopify/bootsnap/blob/main/CHANGELOG.md )
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.10.3...v1.11.1 )
---
updated-dependencies:
- dependency-name: bootsnap
  dependency-type: direct:production
  update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2022-04-14 21:33:11 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								93b11ff22f 
								
							 
						 
						
							
							
								
								Bump eslint-plugin-import from 2.25.4 to 2.26.0 ( #18011 )  
							
							... 
							
							
							
							Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import ) from 2.25.4 to 2.26.0.
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases )
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md )
- [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.25.4...v2.26.0 )
---
updated-dependencies:
- dependency-name: eslint-plugin-import
  dependency-type: direct:development
  update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2022-04-14 21:25:13 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								28a6177e98 
								
							 
						 
						
							
							
								
								Bump @testing-library/jest-dom from 5.16.3 to 5.16.4 ( #18022 )  
							
							... 
							
							
							
							Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom ) from 5.16.3 to 5.16.4.
- [Release notes](https://github.com/testing-library/jest-dom/releases )
- [Changelog](https://github.com/testing-library/jest-dom/blob/main/CHANGELOG.md )
- [Commits](https://github.com/testing-library/jest-dom/compare/v5.16.3...v5.16.4 )
---
updated-dependencies:
- dependency-name: "@testing-library/jest-dom"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2022-04-14 21:22:07 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								92bd27f993 
								
							 
						 
						
							
							
								
								Bump brakeman from 5.2.1 to 5.2.2 ( #18021 )  
							
							... 
							
							
							
							Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 5.2.1 to 5.2.2.
- [Release notes](https://github.com/presidentbeef/brakeman/releases )
- [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md )
- [Commits](https://github.com/presidentbeef/brakeman/compare/v5.2.1...v5.2.2 )
---
updated-dependencies:
- dependency-name: brakeman
  dependency-type: direct:development
  update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2022-04-14 21:21:47 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								f9719b106c 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2022-04-14 14:21:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								4db5b3f298 
								
							 
						 
						
							
							
								
								Bump sidekiq-unique-jobs from 7.1.16 to 7.1.19 ( #18018 )  
							
							... 
							
							
							
							Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 7.1.16 to 7.1.19.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases )
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/main/CHANGELOG.md )
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.1.16...v7.1.19 )
---
updated-dependencies:
- dependency-name: sidekiq-unique-jobs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2022-04-14 21:21:05 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								c886ea77b5 
								
							 
						 
						
							
							
								
								Bump @babel/runtime from 7.17.8 to 7.17.9 ( #18012 )  
							
							... 
							
							
							
							Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.17.8 to 7.17.9.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.17.9/packages/babel-runtime )
---
updated-dependencies:
- dependency-name: "@babel/runtime"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2022-04-14 21:20:27 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								d0464f18a9 
								
							 
						 
						
							
							
								
								Bump @babel/plugin-proposal-decorators from 7.17.8 to 7.17.9 ( #18020 )  
							
							... 
							
							
							
							Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators ) from 7.17.8 to 7.17.9.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.17.9/packages/babel-plugin-proposal-decorators )
---
updated-dependencies:
- dependency-name: "@babel/plugin-proposal-decorators"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2022-04-14 21:20:01 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								6aa02a37ec 
								
							 
						 
						
							
							
								
								Bump i18n-tasks from 1.0.8 to 1.0.9 ( #18014 )  
							
							
							
						 
						
							2022-04-14 19:31:20 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								0a23ba5027 
								
							 
						 
						
							
							
								
								Bump @babel/core from 7.17.8 to 7.17.9 ( #18015 )  
							
							
							
						 
						
							2022-04-14 19:30:54 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								396b4492bc 
								
							 
						 
						
							
							
								
								Bump yargs from 17.4.0 to 17.4.1 ( #18017 )  
							
							
							
						 
						
							2022-04-14 19:29:52 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								71d83f4e61 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #17995 )  
							
							... 
							
							
							
							* New translations en.json (Catalan)
* New translations en.yml (Persian)
* New translations en.yml (Romanian)
* New translations en.yml (Afrikaans)
* New translations en.yml (Bulgarian)
* New translations en.yml (Czech)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Sanskrit)
* New translations en.yml (Asturian)
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Corsican)
* New translations en.yml (Sardinian)
* New translations en.yml (Kabyle)
* New translations en.yml (Cornish)
* New translations en.yml (Ido)
* New translations en.yml (Taigi)
* New translations en.yml (Silesian)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations en.json (Czech)
* New translations en.json (Hungarian)
* New translations en.yml (Kannada)
* New translations en.yml (Sinhala)
* New translations en.yml (Bengali)
* New translations en.yml (Hindi)
* New translations en.yml (Marathi)
* New translations en.yml (Croatian)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Kazakh)
* New translations en.yml (Estonian)
* New translations en.yml (Latvian)
* New translations en.yml (Malay)
* New translations en.yml (Breton)
* New translations en.yml (Telugu)
* New translations en.yml (Welsh)
* New translations en.yml (Esperanto)
* New translations en.yml (Uyghur)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Tatar)
* New translations en.yml (Malayalam)
* New translations en.json (Icelandic)
* New translations en.json (Vietnamese)
* New translations en.yml (Korean)
* New translations en.yml (Catalan)
* New translations en.yml (Czech)
* New translations en.yml (Icelandic)
* New translations en.json (Korean)
* New translations en.json (Polish)
* New translations en.yml (Albanian)
* New translations en.json (Albanian)
* New translations en.yml (Vietnamese)
* New translations en.yml (Chinese Traditional)
* New translations en.json (Chinese Traditional)
* New translations en.json (Vietnamese)
* New translations en.json (Russian)
* New translations en.yml (Russian)
* New translations en.json (Russian)
* New translations en.json (Latvian)
* New translations en.yml (Spanish, Argentina)
* New translations en.json (Spanish, Argentina)
* New translations en.yml (Danish)
* New translations en.yml (Latvian)
* New translations en.yml (Spanish)
* New translations en.json (Spanish)
* New translations simple_form.en.yml (Catalan)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Portuguese)
* New translations simple_form.en.yml (Russian)
* New translations simple_form.en.yml (Slovak)
* New translations simple_form.en.yml (Albanian)
* New translations simple_form.en.yml (Serbian (Cyrillic))
* New translations simple_form.en.yml (Swedish)
* New translations simple_form.en.yml (Turkish)
* New translations simple_form.en.yml (Ukrainian)
* New translations simple_form.en.yml (Dutch)
* New translations simple_form.en.yml (Vietnamese)
* New translations simple_form.en.yml (Galician)
* New translations simple_form.en.yml (Icelandic)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Indonesian)
* New translations simple_form.en.yml (Persian)
* New translations simple_form.en.yml (Tamil)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Spanish, Mexico)
* New translations simple_form.en.yml (Bengali)
* New translations simple_form.en.yml (Norwegian)
* New translations simple_form.en.yml (Slovenian)
* New translations simple_form.en.yml (Danish)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations simple_form.en.yml (Thai)
* New translations simple_form.en.yml (Polish)
* New translations simple_form.en.yml (Romanian)
* New translations simple_form.en.yml (French)
* New translations simple_form.en.yml (Spanish)
* New translations simple_form.en.yml (Arabic)
* New translations simple_form.en.yml (Bulgarian)
* New translations simple_form.en.yml (Czech)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Greek)
* New translations simple_form.en.yml (Basque)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Hungarian)
* New translations simple_form.en.yml (Armenian)
* New translations simple_form.en.yml (Italian)
* New translations simple_form.en.yml (Japanese)
* New translations simple_form.en.yml (Georgian)
* New translations simple_form.en.yml (Korean)
* New translations simple_form.en.yml (Croatian)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Kabyle)
* New translations simple_form.en.yml (Sardinian)
* New translations simple_form.en.yml (Corsican)
* New translations simple_form.en.yml (Sorani (Kurdish))
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Serbian (Latin))
* New translations simple_form.en.yml (Occitan)
* New translations simple_form.en.yml (Asturian)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Sinhala)
* New translations simple_form.en.yml (Breton)
* New translations simple_form.en.yml (Malayalam)
* New translations simple_form.en.yml (Tatar)
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
* New translations simple_form.en.yml (Esperanto)
* New translations simple_form.en.yml (Welsh)
* New translations simple_form.en.yml (Latvian)
* New translations simple_form.en.yml (Estonian)
* New translations simple_form.en.yml (Kazakh)
* New translations simple_form.en.yml (Standard Moroccan Tamazight)
* New translations simple_form.en.yml (Czech)
* New translations simple_form.en.yml (Latvian)
* New translations simple_form.en.yml (Spanish)
* New translations simple_form.en.yml (Czech)
* New translations simple_form.en.yml (Korean)
* New translations simple_form.en.yml (Russian)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Polish)
* New translations en.json (Swedish)
* New translations en.yml (Italian)
* New translations en.json (Italian)
* New translations simple_form.en.yml (Italian)
* New translations simple_form.en.yml (Catalan)
* New translations en.yml (Portuguese)
* New translations en.json (Portuguese)
* New translations en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Portuguese)
* New translations simple_form.en.yml (Russian)
* New translations en.json (French)
* New translations simple_form.en.yml (French)
* New translations en.json (Polish)
* New translations en.json (Polish)
* New translations en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Arabic)
* New translations en.yml (Arabic)
* New translations simple_form.en.yml (Arabic)
* New translations doorkeeper.en.yml (Arabic)
* New translations en.yml (Arabic)
* New translations doorkeeper.en.yml (Arabic)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Turkish)
* New translations en.json (Turkish)
* New translations simple_form.en.yml (Turkish)
* New translations en.yml (Czech)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Greek)
* New translations en.json (Greek)
* New translations simple_form.en.yml (Greek)
* New translations simple_form.en.yml (Icelandic)
* New translations en.yml (Czech)
* New translations en.yml (Ukrainian)
* New translations en.yml (Ukrainian)
* New translations en.json (Ukrainian)
* New translations simple_form.en.yml (Ukrainian)
* New translations en.yml (Ukrainian)
* New translations en.json (Ukrainian)
* New translations doorkeeper.en.yml (Ukrainian)
* New translations simple_form.en.yml (Danish)
* New translations en.yml (Galician)
* New translations en.json (Galician)
* New translations simple_form.en.yml (Galician)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.json (French)
* New translations en.yml (Indonesian)
* New translations en.json (Indonesian)
* New translations en.yml (Indonesian)
* New translations simple_form.en.yml (Indonesian)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations simple_form.en.yml (Thai)
* New translations simple_form.en.yml (Thai)
* New translations en.yml (Armenian)
* New translations en.json (Armenian)
* New translations en.yml (Italian)
* New translations en.json (Italian)
* New translations en.yml (Catalan)
* New translations en.json (Catalan)
* New translations en.yml (Spanish, Argentina)
* New translations en.json (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Hungarian)
* New translations en.yml (Chinese Simplified)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Polish)
* New translations en.json (Polish)
* New translations en.json (Polish)
* New translations en.json (Polish)
* New translations doorkeeper.en.yml (Polish)
* New translations doorkeeper.en.yml (Polish)
* New translations en.yml (Polish)
* New translations en.yml (Polish)
* New translations en.yml (Polish)
* New translations en.yml (Polish)
* New translations simple_form.en.yml (Polish)
* New translations en.json (Polish)
* New translations en.json (Polish)
* New translations en.json (Catalan)
* New translations en.json (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations en.json (Vietnamese)
* New translations en.json (Vietnamese)
* New translations en.yml (Vietnamese)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2022-04-14 02:52:53 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jeong Arm 
								
							 
						 
						
							
							
							
							
								
							
							
								c9fceecff1 
								
							 
						 
						
							
							
								
								Fix FetchFeaturedCollectionService ( #18030 )  
							
							
							
						 
						
							2022-04-13 13:25:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jeong Arm 
								
							 
						 
						
							
							
							
							
								
							
							
								caddc799c8 
								
							 
						 
						
							
							
								
								Implement infinity home timeline ( #1610 )  
							
							... 
							
							
							
							* Implement infinity home timeline
* Fix test for infinite home timeline
* Fix infinity home timeline with min_id
* Fix infinite home timeline duplicated statuses
* Codeclimate for infinite home timeline
* Refactor code as reviewed
* Fix redis sufficient check
* Fix typo on variable name 
							
						 
						
							2022-04-12 17:52:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								7d5f87e82c 
								
							 
						 
						
							
							
								
								Bump nokogiri from 1.13.3 to 1.13.4 ( #18025 )  
							
							... 
							
							
							
							Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.13.3 to 1.13.4.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/v1.13.4/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.3...v1.13.4 )
---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2022-04-12 21:20:40 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexandra Catalina 
								
							 
						 
						
							
							
							
							
								
							
							
								028f759564 
								
							 
						 
						
							
							
								
								chore(deps): update tootsuite/mastodon docker tag to v3.5.1 ( #18023 )  
							
							... 
							
							
							
							Co-authored-by: Renovate Bot <bot@renovateapp.com> 
							
						 
						
							2022-04-12 03:26:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								882d7f32aa 
								
							 
						 
						
							
							
								
								Merge pull request  #1741  from ClearlyClaire/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2022-04-11 22:36:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dogelover911 
								
							 
						 
						
							
							
							
							
								
							
							
								64b6d84782 
								
							 
						 
						
							
							
								
								FeedManager: skip account when target_account's last status is too old ( #18009 )  
							
							... 
							
							
							
							Co-authored-by: dogelover911 <dogelover911@localhost> 
							
						 
						
							2022-04-11 21:17:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								10bb53f2d3 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2022-04-11 16:16:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								654be99637 
								
							 
						 
						
							
							
								
								Fix link sanitization for outgoing text/html and text/markdown toots  
							
							... 
							
							
							
							Fixes  #1739  
						
							2022-04-11 09:06:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								5e13634c6b 
								
							 
						 
						
							
							
								
								Fix crash in alias settings page ( #18004 )  
							
							
							
						 
						
							2022-04-09 20:11:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								543bb64629 
								
							 
						 
						
							
							
								
								Merge pull request  #1738  from ClearlyClaire/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2022-04-08 23:07:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								a83e7ee440 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2022-04-08 23:00:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								a7f568403a 
								
							 
						 
						
							
							
								
								Merge pull request  #1737  from ClearlyClaire/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2022-04-08 22:24:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								23b61a753a 
								
							 
						 
						
							
							
								
								Bump version to 3.5.1 ( #18000 )  
							
							
							
						 
						
							2022-04-08 21:57:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									0x2019 
								
							 
						 
						
							
							
							
							
								
							
							
								e681e8d14c 
								
							 
						 
						
							
							
								
								Fix error resposes for from search prefix ( #17963 )  
							
							... 
							
							
							
							* Fix error responses in `from` search prefix (addresses mastodon/mastodon#17941 )
Using unsupported prefixes now reports a 422; searching for posts from an
account the instance is not aware of reports a 404. TODO: The UI for this
on the front end is abysmal.
Searching `from:username@domain` now succeeds when `domain` is the local
domain; searching `from:@username(@domain)?` now works as expected.
* Remove unused methods on new Error classes as they are not being used
Currently when `raise`d there are error messages being supplied, but
this is not actually being used. The associated `raise`s have been
edited accordingly.
* Remove needless comments
* Satisfy rubocop
* Try fixing tests being unable to find AccountFindingConcern methods
* Satisfy rubocop
* Simplify `from` prefix logic
This incorporates @ClearlyClaire's suggestion (see
https://github.com/mastodon/mastodon/pull/17963#pullrequestreview-933986737 ).
Accepctable account strings in `from:` clauses are more lenient than
before this commit; for example, `from:@user@example.org@asnteo +cat`
will not error, and return posts by @user@example.org containing the
word "cat". This is more consistent with how Mastodon matches mentions
in statuses. In addition, `from` clauses will not be checked for
syntatically invalid usernames or domain names, simply 404ing when
`Account.find_remote!` raises ActiveRecord::NotFound.
New code for this PR that is no longer used has been removed. 
							
						 
						
							2022-04-08 21:21:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								e3e79c5e5a 
								
							 
						 
						
							
							
								
								Add v3.5.x to SECURITY.md ( #17998 )  
							
							
							
						 
						
							2022-04-08 20:18:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								ed1d3bc1e2 
								
							 
						 
						
							
							
								
								[Glitch] Auto-fill timeline gaps when getting re-connecting to Websocket/EventSource stream  
							
							... 
							
							
							
							Port c9a5121ae5 
							
						 
						
							2022-04-08 20:05:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								3ad22b06ff 
								
							 
						 
						
							
							
								
								[Glitch] Fix potentially missing statuses when reconnecting to websocket  
							
							... 
							
							
							
							Port d43028a0d3 
							
						 
						
							2022-04-08 20:02:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								d4f25d52dd 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `Gemfile.lock`:
  Not a real conflict, just an upstream dependency udpated
  textually too close to a glitch-soc-only dependency.
  Updated dependencies like upstream.
- `app/controllers/settings/preferences_controller.rb`:
  Upstream added settings where we had extra glitch-soc-specific settings.
  Added upstream's new settings.
- `app/models/user.rb`:
  Upstream added settings where we had extra glitch-soc-specific settings.
  Added upstream's new settings.
- `config/i18n-tasks.yml`:
  Not a real conflict, just a new upstream line too textually close to
  a glitch-soc-only line.
  Ported upstream's change. 
							
						 
						
							2022-04-08 19:53:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								d2265cab26 
								
							 
						 
						
							
							
								
								Fix dangling language-specific trends ( #17997 )  
							
							... 
							
							
							
							- Change score half-life for trending statuses from 2 to 6 hours
- Change score threshold for trimming old items from 1 to 0.3 
							
						 
						
							2022-04-08 19:35:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								c9a5121ae5 
								
							 
						 
						
							
							
								
								Auto-fill timeline gaps when getting re-connecting to Websocket/EventSource stream ( #17987 )  
							
							
							
						 
						
							2022-04-08 19:17:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								72be882792 
								
							 
						 
						
							
							
								
								Fix extremely rare race condition when deleting a toot or account ( #17994 )  
							
							
							
						 
						
							2022-04-08 19:17:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								4ba66d256a 
								
							 
						 
						
							
							
								
								Change e-mail notifications to only be sent when recipient is offline ( #17984 )  
							
							... 
							
							
							
							* Change e-mail notifications to only be sent when recipient is offline
Change the default for follow and mention notifications back on
* Add preference to always send e-mail notifications
* Change wording 
							
						 
						
							2022-04-08 18:03:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								e3be46c743 
								
							 
						 
						
							
							
								
								Fix trends returning less results per page when filtered in REST API ( #17996 )  
							
							... 
							
							
							
							- Change filtering and pagination to occur in SQL instead of Redis
- Change rank/score displayed on trends in admin UI to be locale-specific 
							
						 
						
							2022-04-08 17:10:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								9de4369d43 
								
							 
						 
						
							
							
								
								Bump i18n-tasks from 0.9.37 to 1.0.8 ( #17993 )  
							
							... 
							
							
							
							* Bump i18n-tasks from 0.9.37 to 1.0.8
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 0.9.37 to 1.0.8.
- [Release notes](https://github.com/glebm/i18n-tasks/releases )
- [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md )
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.37...v1.0.8 )
---
updated-dependencies:
- dependency-name: i18n-tasks
  dependency-type: direct:development
  update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
* Run `bundle exec i18n-tasks normalize`
* Add `admin_mailer.new_appeal.actions.*` to ignore_unused
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2022-04-08 20:14:50 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								330c279c0c 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #17897 )  
							
							... 
							
							
							
							* New translations en.yml (Danish)
* New translations en.yml (German)
* New translations en.yml (Basque)
* New translations en.yml (Finnish)
* New translations en.yml (Hungarian)
* New translations en.yml (Hebrew)
* New translations en.yml (Catalan)
* New translations en.yml (Spanish)
* New translations en.yml (French)
* New translations en.yml (Arabic)
* New translations en.yml (Armenian)
* New translations en.yml (Afrikaans)
* New translations en.yml (Polish)
* New translations en.yml (Punjabi)
* New translations en.yml (Serbian (Cyrillic))
* New translations en.yml (Portuguese)
* New translations en.yml (Albanian)
* New translations en.yml (Dutch)
* New translations en.yml (Turkish)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Urdu (Pakistan))
* New translations en.yml (Icelandic)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Indonesian)
* New translations en.yml (Tamil)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Norwegian)
* New translations en.yml (Korean)
* New translations en.yml (Macedonian)
* New translations en.yml (Slovenian)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Swedish)
* New translations en.yml (Italian)
* New translations en.yml (Japanese)
* New translations en.yml (Russian)
* New translations en.yml (Slovak)
* New translations en.yml (Vietnamese)
* New translations en.yml (Lithuanian)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Occitan)
* New translations en.yml (Persian)
* New translations en.yml (Galician)
* New translations en.yml (Georgian)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Bengali)
* New translations en.yml (Sinhala)
* New translations en.yml (Silesian)
* New translations en.yml (Taigi)
* New translations en.yml (Ido)
* New translations en.yml (Kabyle)
* New translations en.yml (Sanskrit)
* New translations en.yml (Sardinian)
* New translations en.yml (Corsican)
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Asturian)
* New translations en.yml (Kannada)
* New translations en.yml (Cornish)
* New translations en.yml (Breton)
* New translations en.yml (Marathi)
* New translations en.yml (Malayalam)
* New translations en.yml (Tatar)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Uyghur)
* New translations en.yml (Esperanto)
* New translations en.yml (Welsh)
* New translations en.yml (Telugu)
* New translations en.yml (Malay)
* New translations en.yml (Hindi)
* New translations en.yml (Latvian)
* New translations en.yml (Estonian)
* New translations en.yml (Kazakh)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Croatian)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations en.yml (German)
* New translations en.yml (Icelandic)
* New translations en.yml (Catalan)
* New translations en.yml (Czech)
* New translations en.yml (Italian)
* New translations doorkeeper.en.yml (Czech)
* New translations en.yml (Danish)
* New translations en.json (Czech)
* New translations doorkeeper.en.yml (Czech)
* New translations en.yml (Czech)
* New translations doorkeeper.en.yml (Czech)
* New translations en.yml (Latvian)
* New translations doorkeeper.en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Indonesian)
* New translations en.yml (Czech)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations simple_form.en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Hungarian)
* New translations simple_form.en.yml (Czech)
* New translations simple_form.en.yml (Czech)
* New translations en.yml (Korean)
* New translations en.yml (Spanish)
* New translations en.yml (Czech)
* New translations simple_form.en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Portuguese)
* New translations en.yml (Polish)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.json (Chinese Traditional)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.json (Chinese Traditional)
* New translations en.json (Chinese Traditional)
* New translations en.yml (Czech)
* New translations en.json (Chinese Traditional)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Spanish, Argentina)
* New translations en.json (Chinese Traditional)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.json (Italian)
* New translations en.yml (Galician)
* New translations en.yml (French)
* New translations en.yml (Vietnamese)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations simple_form.en.yml (Vietnamese)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.yml (Korean)
* New translations en.json (Korean)
* New translations simple_form.en.yml (Galician)
* New translations en.yml (Korean)
* New translations en.yml (Portuguese)
* New translations en.yml (Hungarian)
* New translations en.yml (Armenian)
* New translations en.yml (Dutch)
* New translations en.yml (Norwegian)
* New translations en.yml (Polish)
* New translations en.yml (Albanian)
* New translations en.yml (Basque)
* New translations en.yml (Turkish)
* New translations en.yml (Ukrainian)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Icelandic)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Indonesian)
* New translations en.yml (Tamil)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Finnish)
* New translations en.yml (Greek)
* New translations en.yml (Galician)
* New translations en.yml (Slovak)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Swedish)
* New translations en.yml (Arabic)
* New translations en.yml (French)
* New translations en.yml (Spanish)
* New translations en.yml (Catalan)
* New translations en.yml (Italian)
* New translations en.yml (Japanese)
* New translations en.yml (Russian)
* New translations en.yml (Slovenian)
* New translations en.yml (German)
* New translations en.yml (Vietnamese)
* New translations en.yml (Thai)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Occitan)
* New translations en.yml (Persian)
* New translations en.yml (Romanian)
* New translations en.yml (Czech)
* New translations en.yml (Danish)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Kabyle)
* New translations en.yml (Sardinian)
* New translations en.yml (Corsican)
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Breton)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Esperanto)
* New translations en.yml (Welsh)
* New translations en.yml (Latvian)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Croatian)
* New translations en.yml (Catalan)
* New translations en.yml (Latvian)
* New translations en.yml (Catalan)
* New translations en.yml (Latvian)
* New translations en.yml (Icelandic)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Swedish)
* New translations en.yml (Russian)
* New translations en.yml (Czech)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Czech)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Korean)
* New translations en.yml (Korean)
* New translations en.yml (Galician)
* New translations en.yml (Vietnamese)
* New translations en.yml (Galician)
* New translations en.yml (Turkish)
* New translations en.yml (Polish)
* New translations en.yml (Hungarian)
* New translations en.yml (Hungarian)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Italian)
* New translations en.yml (Spanish)
* New translations en.yml (Arabic)
* New translations en.json (Arabic)
* New translations doorkeeper.en.yml (Arabic)
* New translations en.yml (Arabic)
* New translations en.yml (French)
* New translations en.json (Arabic)
* New translations en.json (Arabic)
* New translations en.json (Arabic)
* New translations en.json (Breton)
* New translations en.yml (Arabic)
* New translations en.json (Arabic)
* New translations en.yml (Vietnamese)
* New translations en.yml (Korean)
* New translations en.yml (Vietnamese)
* New translations en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations en.json (Esperanto)
* New translations en.json (Esperanto)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalzie`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2022-04-08 19:52:22 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								b7a6bba0b7 
								
							 
						 
						
							
							
								
								Fix cookies secure flag being set when served over Tor ( #17992 )  
							
							
							
						 
						
							2022-04-08 12:47:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								483af27d41 
								
							 
						 
						
							
							
								
								Bump gitlab-omniauth-openid-connect from 0.5.0 to 0.9.1 ( #17779 )  
							
							... 
							
							
							
							Bumps [gitlab-omniauth-openid-connect](https://gitlab.com/gitlab-org/gitlab-omniauth-openid-connect ) from 0.5.0 to 0.9.1.
- [Release notes](https://gitlab.com/gitlab-org/gitlab-omniauth-openid-connect/tags )
- [Changelog](https://gitlab.com/gitlab-org/gitlab-omniauth-openid-connect/blob/master/CHANGELOG.md )
- [Commits](https://gitlab.com/gitlab-org/gitlab-omniauth-openid-connect/compare/v0.5.0...v0.9.1 )
---
updated-dependencies:
- dependency-name: gitlab-omniauth-openid-connect
  dependency-type: direct:production
  update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2022-04-08 13:44:40 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								d2ba407fda 
								
							 
						 
						
							
							
								
								Bump fabrication from 2.27.0 to 2.28.0 ( #17960 )  
							
							... 
							
							
							
							Bumps [fabrication](https://gitlab.com/fabrication-gem/fabrication ) from 2.27.0 to 2.28.0.
- [Release notes](https://gitlab.com/fabrication-gem/fabrication/tags )
- [Changelog](https://gitlab.com/fabrication-gem/fabrication/blob/master/Changelog.markdown )
- [Commits](https://gitlab.com/fabrication-gem/fabrication/compare/2.27.0...2.28.0 )
---
updated-dependencies:
- dependency-name: fabrication
  dependency-type: direct:development
  update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2022-04-08 13:40:23 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								fd675d9fff 
								
							 
						 
						
							
							
								
								Bump lograge from 0.11.2 to 0.12.0 ( #17961 )  
							
							... 
							
							
							
							Bumps [lograge](https://github.com/roidrage/lograge ) from 0.11.2 to 0.12.0.
- [Release notes](https://github.com/roidrage/lograge/releases )
- [Changelog](https://github.com/roidrage/lograge/blob/master/CHANGELOG.md )
- [Commits](https://github.com/roidrage/lograge/compare/v0.11.2...v0.12.0 )
---
updated-dependencies:
- dependency-name: lograge
  dependency-type: direct:production
  update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2022-04-08 13:40:05 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								c1b85d1f99 
								
							 
						 
						
							
							
								
								Fix migration error handling ( #17991 )  
							
							
							
						 
						
							2022-04-07 20:46:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								2b7d558807 
								
							 
						 
						
							
							
								
								Fix error re-running some migrations if they get interrupted at the wrong moment ( #17989 )  
							
							
							
						 
						
							2022-04-07 20:17:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								aa6bc541d3 
								
							 
						 
						
							
							
								
								Fix pagination header on empty trends responses in REST API ( #17986 )  
							
							
							
						 
						
							2022-04-07 18:06:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								d43028a0d3 
								
							 
						 
						
							
							
								
								Fix potentially missing statuses when reconnecting to websocket ( #17981 )  
							
							... 
							
							
							
							* Fix potentially missing statuses when reconnecting to websocket
* Add gap on reconnect rather than maintaining it constantly 
							
						 
						
							2022-04-07 16:08:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								8f78c22b68 
								
							 
						 
						
							
							
								
								Merge pull request  #1736  from ClearlyClaire/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2022-04-07 15:25:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								24256816cc 
								
							 
						 
						
							
							
								
								[Glitch] Fix older items possibly disappearing on timeline updates  
							
							... 
							
							
							
							Port 00d429879f 
							
						 
						
							2022-04-07 15:05:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								7103869d62 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2022-04-07 15:03:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								fa6bf634b2 
								
							 
						 
						
							
							
								
								Merge pull request  #1734  from ClearlyClaire/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2022-04-07 15:03:31 +02:00