Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d9c5ae7c09 
								
							 
						 
						
							
							
								
								Update Copyrights for gun related files  
							
							
							
						 
						
							2020-03-03 17:16:24 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								4427161ca3 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into gun  
							
							
							
						 
						
							2020-03-03 17:15:49 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								05da5f5cca 
								
							 
						 
						
							
							
								
								Update Copyrights  
							
							
							
						 
						
							2020-03-03 16:44:49 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								884d9710b2 
								
							 
						 
						
							
							
								
								refactoring for gun api modules  
							
							
							
						 
						
							2020-03-03 19:24:14 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f98ee730f0 
								
							 
						 
						
							
							
								
								adapter renaming to adapter_helper  
							
							
							
						 
						
							2020-03-03 18:53:44 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8854770fc4 
								
							 
						 
						
							
							
								
								retry and retry_timeout settings default change  
							
							
							
						 
						
							2020-03-03 18:01:35 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1ad34bfdba 
								
							 
						 
						
							
							
								
								no try block in checkout connection  
							
							
							
						 
						
							2020-03-03 17:44:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								24bf5c4e89 
								
							 
						 
						
							
							
								
								remove try block from pool request  
							
							
							
						 
						
							2020-03-03 17:27:56 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								aaa879ce75 
								
							 
						 
						
							
							
								
								proxy parsing errors  
							
							
							
						 
						
							2020-03-03 17:27:22 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6ebf389d6e 
								
							 
						 
						
							
							
								
								poolboy timeout fix  
							
							
							
						 
						
							2020-03-03 16:51:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8fc00b7cbf 
								
							 
						 
						
							
							
								
								return error if connection failed to open  
							
							
							
						 
						
							2020-03-03 16:42:24 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7d68924e4f 
								
							 
						 
						
							
							
								
								naming  
							
							
							
						 
						
							2020-03-03 16:42:24 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e605e79df9 
								
							 
						 
						
							
							
								
								simplification of formatting host method  
							
							... 
							
							
							
							case for format_proxy method 
							
						 
						
							2020-03-03 16:42:03 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ee8071f0d5 
								
							 
						 
						
							
							
								
								removing unused method  
							
							
							
						 
						
							2020-03-03 15:12:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								05429730e4 
								
							 
						 
						
							
							
								
								unnecessary with  
							
							
							
						 
						
							2020-03-03 15:11:48 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d0e4d3ca3b 
								
							 
						 
						
							
							
								
								removing unnecessary with  
							
							... 
							
							
							
							comment in tesla client impovement 
							
						 
						
							2020-03-03 14:56:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								24d1ac125c 
								
							 
						 
						
							
							
								
								hiding raise error logic to otp_version module  
							
							
							
						 
						
							2020-03-03 13:24:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								28ed4b41d0 
								
							 
						 
						
							
							
								
								naming for checkin from pool timeout  
							
							
							
						 
						
							2020-03-03 13:05:28 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								151dc4e387 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/reverse_proxy/client/tesla.ex  
							
							
							
						 
						
							2020-03-03 09:53:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								7eb6592992 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/pool/connections.ex  
							
							
							
						 
						
							2020-03-03 09:53:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								a21a66972f 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/http/http.ex  
							
							
							
						 
						
							2020-03-03 09:52:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								614e3934f9 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/http/http.ex  
							
							
							
						 
						
							2020-03-03 09:50:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								d30ff35d94 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/http/request_builder.ex  
							
							
							
						 
						
							2020-03-03 09:46:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								a3ad028973 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/http/adapter.ex  
							
							
							
						 
						
							2020-03-03 09:34:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								2c8d80dc0a 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/pool/connections.ex  
							
							
							
						 
						
							2020-03-03 09:29:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								097ad10d02 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/pool/connections.ex  
							
							
							
						 
						
							2020-03-03 09:29:51 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4c8569d403 
								
							 
						 
						
							
							
								
								otp_version refactor  
							
							
							
						 
						
							2020-03-03 12:21:10 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								509c81e4b1 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into gun  
							
							
							
						 
						
							2020-03-03 10:08:07 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								764a50f8a6 
								
							 
						 
						
							
							
								
								Merge branch 'feature/1482-activity_pub_transactions' into 'develop'  
							
							... 
							
							
							
							ActivityPub actions & side-effects in transaction
Closes  #1482 
See merge request pleroma/pleroma!2089  
							
						 
						
							2020-03-02 07:58:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6da6540036 
								
							 
						 
						
							
							
								
								Bump copyright years of files changed after 2020-01-07  
							
							... 
							
							
							
							Done via the following command:
git diff fcd5dd259a 
							
						 
						
							2020-03-02 06:08:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d9e4b77f8b 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into gun  
							
							
							
						 
						
							2020-03-01 12:48:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								34f1d09f3a 
								
							 
						 
						
							
							
								
								spec fix  
							
							
							
						 
						
							2020-03-01 12:01:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ba87ed7335 
								
							 
						 
						
							
							
								
								fix for compiling  
							
							
							
						 
						
							2020-03-01 12:01:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								32d1e04817 
								
							 
						 
						
							
							
								
								ActivityPub actions & side-effects in transaction  
							
							
							
						 
						
							2020-03-01 12:01:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								b5465bf385 
								
							 
						 
						
							
							
								
								timeline controller: add a TODO for replacing copypaste with a macro  
							
							
							
						 
						
							2020-03-01 02:03:46 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ffcebe7e22 
								
							 
						 
						
							
							
								
								timeline controller: rate limit timelines to 3 requests per 500ms per timeline per ip/user  
							
							
							
						 
						
							2020-03-01 01:13:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								4d416343fa 
								
							 
						 
						
							
							
								
								rate limiter: Fix a race condition  
							
							... 
							
							
							
							When multiple requests are processed by rate limiter plug at the same
time and the bucket is not yet initialized, both would try to initialize
the bucket resulting in an internal server error. 
							
						 
						
							2020-03-01 01:13:07 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								df2173343a 
								
							 
						 
						
							
							
								
								pagination: limit the number of elements returned at one time to 40  
							
							
							
						 
						
							2020-03-01 01:11:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								19e559fe51 
								
							 
						 
						
							
							
								
								Merge branch 'rate-limiter-runtime-settings' into 'develop'  
							
							... 
							
							
							
							RateLimiter improvements: runtime configurability, no default limits in tests
See merge request pleroma/pleroma!2250  
							
						 
						
							2020-02-29 21:52:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								c747260989 
								
							 
						 
						
							
							
								
								[ #2250 ] Tiny refactoring per merge request review.  
							
							
							
						 
						
							2020-02-29 22:04:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								814b275af7 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into gun  
							
							
							
						 
						
							2020-02-29 11:34:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								3759b146c4 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/plugs/rate_limiter/rate_limiter.ex  
							
							
							
						 
						
							2020-02-28 13:33:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								f2216287a7 
								
							 
						 
						
							
							
								
								Merge branch 'admin-status-list' into 'develop'  
							
							... 
							
							
							
							Admin API: `/api/pleroma/admin/statuses` (accepts `godmode` and `local_only`)
Closes  #1550 
See merge request pleroma/pleroma!2192  
							
						 
						
							2020-02-27 18:11:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								6f2efb1c45 
								
							 
						 
						
							
							
								
								Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests.  
							
							
							
						 
						
							2020-02-27 18:46:05 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								4ab07cf0d5 
								
							 
						 
						
							
							
								
								Admin API: Exclude boosts from GET /api/pleroma/admin/users/:nickname/statuses and GET /api/pleroma/admin/instance/:instance/statuses  
							
							
							
						 
						
							2020-02-26 22:35:57 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								e2a6a40367 
								
							 
						 
						
							
							
								
								Admin API: GET /api/pleroma/admin/statuses - list all statuses (accepts godmode and local_only)  
							
							
							
						 
						
							2020-02-26 20:21:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fda6f35a46 
								
							 
						 
						
							
							
								
								Merge branch 'feat/instance-gen-improvements' into 'develop'  
							
							... 
							
							
							
							small instance.gen task improvements
See merge request pleroma/pleroma!2245  
							
						 
						
							2020-02-26 08:26:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								3bbfebd1c2 
								
							 
						 
						
							
							
								
								instance.gen task: make example instance name less confusing  
							
							... 
							
							
							
							See https://git.pleroma.social/pleroma/pleroma/merge_requests/2245#note_52217  
							
						 
						
							2020-02-26 00:32:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								359faa8645 
								
							 
						 
						
							
							
								
								instance.gen task: remind to transfer the config to the database after  
							
							... 
							
							
							
							migrations 
							
						 
						
							2020-02-25 22:13:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								cfa28dee32 
								
							 
						 
						
							
							
								
								instance.gen task: make instance name default to the domain  
							
							
							
						 
						
							2020-02-25 21:59:37 +03:00