Terry Garcia 
								
							 
						 
						
							
							
							
							
								
							
							
								9a1bd1c3e9 
								
							 
						 
						
							
							
								
								[Glitch] Switched bookmark and favourites around  
							
							... 
							
							
							
							Port a1347f456e 
							
						 
						
							2023-03-05 21:07:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								03ac84b0f4 
								
							 
						 
						
							
							
								
								[Glitch] Fix duplicate “Publish” button on mobile  
							
							... 
							
							
							
							Port b55fc883b6 
							
						 
						
							2023-03-05 21:07:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								7623e18124 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `README.md`:
  Upstream README has been changed, but we have a completely different one.
  Kept our `README.md`.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added support for more incoming HTML tags (a large subset of what
  glitch-soc accepts).
  Change the code style to match upstream's but otherwise do not change our
  code.
- `spec/lib/sanitize_config_spec.rb`:
  Upstream added support for more incoming HTML tags (a large subset of what
  glitch-soc accepts).
  Kept our version, since the tests are mostly glitch-soc's, except for cases
  which are purposefuly different. 
							
						 
						
							2023-03-05 20:46:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bb4e211c86 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #2118 )  
							
							... 
							
							
							
							* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip] 
							
						 
						
							2023-03-05 20:38:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bcbc2a43d4 
								
							 
						 
						
							
							
								
								Merge pull request  #2121  from ClearlyClaire/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2023-03-05 20:37:42 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								0e476f3c4f 
								
							 
						 
						
							
							
								
								[Glitch] Add lang attribute to media and poll options  
							
							... 
							
							
							
							Port d3eefead30 
							
						 
						
							2023-03-05 17:52:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dfa9843ac8 
								
							 
						 
						
							
							
								
								Fix pgBouncer resetting application name on every transaction ( #23958 )  
							
							
							
						 
						
							2023-03-05 01:52:42 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								be1792e1d4 
								
							 
						 
						
							
							
								
								Fix streaming API not being usable without DATABASE_URL ( #23960 )  
							
							
							
						 
						
							2023-03-05 01:52:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Samruddhi Khandale 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ade3c5d40c 
								
							 
						 
						
							
							
								
								Updates dev container and adds doc for getting started with GitHub Codespaces ( #23872 )  
							
							
							
						 
						
							2023-03-05 00:35:00 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								82a6cf4012 
								
							 
						 
						
							
							
								
								Enable Rubocop for app/views ( #23874 )  
							
							
							
						 
						
							2023-03-05 00:33:52 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								14f0b48fb6 
								
							 
						 
						
							
							
								
								Update browser gem to version 5.3.1 ( #23945 )  
							
							
							
						 
						
							2023-03-05 00:33:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cb868228bd 
								
							 
						 
						
							
							
								
								Do not leave Mastodon when clicking “Back” ( #23953 )  
							
							
							
						 
						
							2023-03-04 23:18:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c599e289d8 
								
							 
						 
						
							
							
								
								Fix spec for api/v1/statuses/translations ( #23956 )  
							
							
							
						 
						
							2023-03-04 23:17:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2d1ccb3d8b 
								
							 
						 
						
							
							
								
								Restore missing fabricators ( #23951 )  
							
							
							
						 
						
							2023-03-04 18:31:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								506b16cf59 
								
							 
						 
						
							
							
								
								Pending example models minimal coverage ( #23912 )  
							
							
							
						 
						
							2023-03-04 17:16:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7f4412eeeb 
								
							 
						 
						
							
							
								
								User mailer spec coverage improvements ( #23905 )  
							
							
							
						 
						
							2023-03-04 17:16:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								42ddc45133 
								
							 
						 
						
							
							
								
								Admin controllers specs ( #23917 )  
							
							
							
						 
						
							2023-03-04 17:13:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ad585fb195 
								
							 
						 
						
							
							
								
								Specs api v1 controllers ( #23930 )  
							
							
							
						 
						
							2023-03-04 17:12:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cd99fa8ceb 
								
							 
						 
						
							
							
								
								Fabricator specs ( #23925 )  
							
							
							
						 
						
							2023-03-04 17:12:09 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c40d5e5a8f 
								
							 
						 
						
							
							
								
								Misc coverage improvements for validators ( #23928 )  
							
							
							
						 
						
							2023-03-04 17:00:00 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2f606ba122 
								
							 
						 
						
							
							
								
								Helpers specs coverage improvement ( #23937 )  
							
							
							
						 
						
							2023-03-04 16:58:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								00eb2269b6 
								
							 
						 
						
							
							
								
								Policies specs ( #23924 )  
							
							
							
						 
						
							2023-03-04 16:57:22 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6a57c42316 
								
							 
						 
						
							
							
								
								Settings controllers specs ( #23915 )  
							
							
							
						 
						
							2023-03-04 16:56:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								39e7525c96 
								
							 
						 
						
							
							
								
								Add basic coverage for some worker jobs ( #23943 )  
							
							
							
						 
						
							2023-03-04 16:56:09 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f9c2213ae5 
								
							 
						 
						
							
							
								
								Models specs coverage ( #23940 )  
							
							
							
						 
						
							2023-03-04 16:43:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jean byroot Boussier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								922837dc96 
								
							 
						 
						
							
							
								
								Upgrade to latest redis-rb 4.x and fix deprecations ( #23616 )  
							
							... 
							
							
							
							Co-authored-by: Jean Boussier <jean.boussier@gmail.com> 
							
						 
						
							2023-03-04 16:38:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								aa98c8fbeb 
								
							 
						 
						
							
							
								
								Disable Style/SymbolArray ( #23921 )  
							
							
							
						 
						
							2023-03-03 22:55:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1840d5d50c 
								
							 
						 
						
							
							
								
								Remove pry gems ( #23884 )  
							
							
							
						 
						
							2023-03-03 22:53:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b00f945d92 
								
							 
						 
						
							
							
								
								Remove implied StandardError rescue ( #23942 )  
							
							
							
						 
						
							2023-03-03 22:49:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c65c34dfd1 
								
							 
						 
						
							
							
								
								Remove climate_control gem ( #23886 )  
							
							
							
						 
						
							2023-03-03 22:48:48 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								050f1669c6 
								
							 
						 
						
							
							
								
								Fix original account being unfollowed on migration before the follow request could be sent ( #21957 )  
							
							
							
						 
						
							2023-03-03 21:13:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ddde4e0d95 
								
							 
						 
						
							
							
								
								Change ActivityPub::DeliveryWorker retries to be spread out more ( #21956 )  
							
							
							
						 
						
							2023-03-03 21:08:22 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5a8c651e8f 
								
							 
						 
						
							
							
								
								Only offer translation for supported languages ( #23879 )  
							
							
							
						 
						
							2023-03-03 21:06:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ramūns Usovs 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0872f3e3d7 
								
							 
						 
						
							
							
								
								Allow streaming to connect to postgress with self-signed certs ( #21431 )  
							
							
							
						 
						
							2023-03-03 21:01:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jamie Hoyle 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								de137e6bb0 
								
							 
						 
						
							
							
								
								Added support for specifying S3 storage classes in environment ( #22480 )  
							
							
							
						 
						
							2023-03-03 20:53:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3f52e717fa 
								
							 
						 
						
							
							
								
								Add tests for moderation actions without custom text ( #23184 )  
							
							
							
						 
						
							2023-03-03 20:50:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6b16b77ab0 
								
							 
						 
						
							
							
								
								Fix external authentication not running onboarding code for new users ( #23458 )  
							
							
							
						 
						
							2023-03-03 20:45:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8784498ebf 
								
							 
						 
						
							
							
								
								Fix tootctl accounts migrate error due to typo ( #23567 )  
							
							
							
						 
						
							2023-03-03 20:45:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d6679d1751 
								
							 
						 
						
							
							
								
								Add mail headers to avoid auto-replies ( #23597 )  
							
							
							
						 
						
							2023-03-03 20:44:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f94aa70b81 
								
							 
						 
						
							
							
								
								Fix error when displaying post history of a trendable post in the admin interface ( #23574 )  
							
							
							
						 
						
							2023-03-03 20:44:02 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Terry Garcia 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a1347f456e 
								
							 
						 
						
							
							
								
								Switched bookmark and favourites around ( #23701 )  
							
							
							
						 
						
							2023-03-03 20:37:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								02c6bad3ca 
								
							 
						 
						
							
							
								
								Change unintended SMTP read timeout from 5 seconds to 20 seconds ( #23750 )  
							
							
							
						 
						
							2023-03-03 20:37:22 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f8bb4d0d6b 
								
							 
						 
						
							
							
								
								Fix server error when failing to follow back followers from /relationships ( #23787 )  
							
							
							
						 
						
							2023-03-03 20:36:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b55fc883b6 
								
							 
						 
						
							
							
								
								Fix duplicate “Publish” button on mobile ( #23804 )  
							
							
							
						 
						
							2023-03-03 20:25:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c2a046ded1 
								
							 
						 
						
							
							
								
								Fix “Remove all followers from the selected domains” being more destructive than it claims ( #23805 )  
							
							
							
						 
						
							2023-03-03 20:25:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3a6451c867 
								
							 
						 
						
							
							
								
								Add support for incoming rich text ( #23913 )  
							
							
							
						 
						
							2023-03-03 20:19:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								276c1d32d6 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-03-02 17:32:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								af578e8ce0 
								
							 
						 
						
							
							
								
								Fix deprecation warning about merging conditions ( #23618 )  
							
							
							
						 
						
							2023-03-02 16:21:04 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9da52ac044 
								
							 
						 
						
							
							
								
								Update rspec-rails to version 6.0.1 ( #23908 )  
							
							
							
						 
						
							2023-03-02 15:55:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								35dff48edf 
								
							 
						 
						
							
							
								
								Add spec coverage for Admin::Trends::StatusesHelper ( #23898 )  
							
							
							
						 
						
							2023-03-02 15:30:40 +01:00