Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b9a87b1baa 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/custom-runtime-modules  
							
							 
							
							
							
						 
						
							2019-12-16 22:34:21 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fc484e5ce6 
								
							 
						 
						
							
							
								
								Add Kocaptcha endpoint to config.exs  
							
							 
							
							
							
						 
						
							2019-12-16 19:35:10 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8d242f52d4 
								
							 
						 
						
							
							
								
								Revert "Add default endpoint to Pleroma.Captcha.Kocaptcha"  
							
							 
							
							... 
							
							
							
							This reverts commit 82c62c5028 . 
							
						 
						
							2019-12-16 19:33:51 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								82c62c5028 
								
							 
						 
						
							
							
								
								Add default endpoint to Pleroma.Captcha.Kocaptcha  
							
							 
							
							
							
						 
						
							2019-12-16 15:32:33 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								7528322f83 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/custom-runtime-modules  
							
							 
							
							
							
						 
						
							2019-12-13 01:51:52 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								470a3a678d 
								
							 
						 
						
							
							
								
								Add Kocaptcha endpoint to the test config  
							
							 
							
							
							
						 
						
							2019-12-12 18:04:52 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									stwf 
								
							 
						 
						
							
							
							
							
								
							
							
								63ffa0e3ed 
								
							 
						 
						
							
							
								
								try local sheduling  
							
							 
							
							
							
						 
						
							2019-12-11 14:57:33 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								a75d4a41e0 
								
							 
						 
						
							
							
								
								Add a test for custom runtime modules  
							
							 
							
							
							
						 
						
							2019-12-06 17:05:09 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								edaae845af 
								
							 
						 
						
							
							
								
								Some tasks try to set log level in test environment, but we were stripping logs belog :warn.  
							
							 
							
							... 
							
							
							
							Ensure console backend logs in test environment are :warn, but mix tasks run in test env
do not run with :debug because it's far too verbose. 
							
						 
						
							2019-11-20 11:55:30 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								c65190c799 
								
							 
						 
						
							
							
								
								Console backend's log format should be prefixed and suffixed with newlines.  
							
							 
							
							... 
							
							
							
							This is how upstream does it by default. 
							
						 
						
							2019-11-20 11:18:42 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								1c17f18329 
								
							 
						 
						
							
							
								
								Be specific about format for logs in test as we have tests that check it  
							
							 
							
							
							
						 
						
							2019-11-20 09:14:27 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								cb513a599c 
								
							 
						 
						
							
							
								
								Allow test builds to have info and debug logs stripped  
							
							 
							
							
							
						 
						
							2019-11-19 16:21:30 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								ff9133b978 
								
							 
						 
						
							
							
								
								Allow mix tasks to always run with debug logging  
							
							 
							
							
							
						 
						
							2019-11-19 16:01:17 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								7e4c8b56ea 
								
							 
						 
						
							
							
								
								Add tests for emoji pack sharing  
							
							 
							
							
							
						 
						
							2019-09-19 00:16:33 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								a90ea8ba15 
								
							 
						 
						
							
							
								
								[ #1149 ] Addressed code review comments (code style, jobs pruning etc.).  
							
							 
							
							
							
						 
						
							2019-08-31 19:08:56 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e890ea7e82 
								
							 
						 
						
							
							
								
								[ #1149 ] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	config/config.exs 
							
						 
						
							2019-08-31 14:25:43 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								cc6c0b4ba6 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration  
							
							 
							
							
							
						 
						
							2019-08-24 15:48:33 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								581123f8bb 
								
							 
						 
						
							
							
								
								[ #1149 ] Introduced quantum job scheduler. Documentation & config changes.  
							
							 
							
							
							
						 
						
							2019-08-23 18:28:23 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								7101ba1a21 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue  
							
							 
							
							
							
						 
						
							2019-08-22 21:01:28 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								8d899d6197 
								
							 
						 
						
							
							
								
								Add :ap_routes rate limit  
							
							 
							
							
							
						 
						
							2019-08-20 22:10:36 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								267262491e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue  
							
							 
							
							
							
						 
						
							2019-08-09 20:09:56 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								9d4f34fbcb 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/digest-email  
							
							 
							
							
							
						 
						
							2019-08-02 18:16:04 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								23d279e03e 
								
							 
						 
						
							
							
								
								[ #1149 ] Replaced RetryQueue with oban-based retries.  
							
							 
							
							
							
						 
						
							2019-08-01 17:28:00 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mike Verdone 
								
							 
						 
						
							
							
							
							
								
							
							
								b729402774 
								
							 
						 
						
							
							
								
								Make test.exs read config in the same way as dev.exs  
							
							 
							
							... 
							
							
							
							This way, if your test.secret.exs has an error, you'll actually see it. 
							
						 
						
							2019-07-24 13:14:52 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								196cad46f3 
								
							 
						 
						
							
							
								
								Resolve merge conflicts  
							
							 
							
							
							
						 
						
							2019-07-20 22:04:47 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								36049f08ef 
								
							 
						 
						
							
							
								
								Merge develop  
							
							 
							
							
							
						 
						
							2019-07-20 01:03:25 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								1345e0c2bf 
								
							 
						 
						
							
							
								
								tests: add tests for signed object fetches  
							
							 
							
							
							
						 
						
							2019-07-17 23:06:16 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								10f82c88b8 
								
							 
						 
						
							
							
								
								mastoapi password reset  
							
							 
							
							... 
							
							
							
							added rate limit to password reset
configure rate limit in runtime 
							
						 
						
							2019-07-16 21:44:50 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e8fa477793 
								
							 
						 
						
							
							
								
								Refactor Follows/Followers counter syncronization  
							
							 
							
							... 
							
							
							
							- Actually sync counters in the database instead of info cache (which got
overriden after user update was finished anyway)
- Add following count field to user info
- Set hide_followers/hide_follows for remote users based on http status
codes for the first collection page 
							
						 
						
							2019-07-13 19:27:49 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								eae991b06a 
								
							 
						 
						
							
							
								
								merge develop  
							
							 
							
							
							
						 
						
							2019-07-12 18:08:27 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugenij 
								
							 
						 
						
							
							
							
							
								
							
							
								4198c3ac39 
								
							 
						 
						
							
							
								
								Extend Pleroma.Pagination to support offset-based pagination, use async/await to execute status and account search in parallel  
							
							 
							
							
							
						 
						
							2019-07-11 13:55:31 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								12b1454245 
								
							 
						 
						
							
							
								
								[ #1062 ] added option to disable send email  
							
							 
							
							
							
						 
						
							2019-07-10 05:34:21 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								371d39e160 
								
							 
						 
						
							
							
								
								Merge develop  
							
							 
							
							
							
						 
						
							2019-07-09 21:21:09 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								4e6e5d8042 
								
							 
						 
						
							
							
								
								reverse proxy tests  
							
							 
							
							
							
						 
						
							2019-07-09 16:54:13 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								abe2e8881f 
								
							 
						 
						
							
							
								
								Testing: Don't federate in testing.  
							
							 
							
							
							
						 
						
							2019-07-09 15:30:51 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								657277ffc0 
								
							 
						 
						
							
							
								
								Resolve conflicts  
							
							 
							
							
							
						 
						
							2019-06-29 00:52:50 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								4ad15ad2a9 
								
							 
						 
						
							
							
								
								add ignore hosts and TLDs for rich_media  
							
							 
							
							
							
						 
						
							2019-06-25 22:25:37 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								ce823fa88e 
								
							 
						 
						
							
							
								
								Fix rate limit test  
							
							 
							
							
							
						 
						
							2019-06-14 19:24:31 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								63ab3c30eb 
								
							 
						 
						
							
							
								
								Merge branch 'feature/rate-limiter' into 'develop'  
							
							 
							
							... 
							
							
							
							Feature/Rate Limiter
Closes  #943 
See merge request pleroma/pleroma!1266  
							
						 
						
							2019-06-11 11:32:01 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								ad04d12de6 
								
							 
						 
						
							
							
								
								Replace MastodonAPIController.account_register/2 rate limiter  
							
							 
							
							
							
						 
						
							2019-06-11 16:06:03 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								76fc4c92bb 
								
							 
						 
						
							
							
								
								Fix tests.  
							
							 
							
							
							
						 
						
							2019-06-07 17:16:56 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								01fe5abad1 
								
							 
						 
						
							
							
								
								Resolve conflicts  
							
							 
							
							
							
						 
						
							2019-06-07 01:20:50 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								3eefb274f4 
								
							 
						 
						
							
							
								
								OAuth consumer: tests fix, comments, Keycloak config notes.  
							
							 
							
							
							
						 
						
							2019-06-05 13:02:13 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								bd325132ca 
								
							 
						 
						
							
							
								
								Fix tests  
							
							 
							
							
							
						 
						
							2019-06-04 03:07:49 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								56fd7dbdd7 
								
							 
						 
						
							
							
								
								remove @websub and @ostatus module-level constants  
							
							 
							
							
							
						 
						
							2019-05-25 04:43:11 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								80d55d428f 
								
							 
						 
						
							
							
								
								tests: websub: check only that signature validation succeeds or fails  
							
							 
							
							
							
						 
						
							2019-05-25 04:34:16 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								290f5b2cfe 
								
							 
						 
						
							
							
								
								config: make sending the user agent configurable, disable sending the user agent in tests  
							
							 
							
							
							
						 
						
							2019-05-17 20:28:58 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8784a7d1b4 
								
							 
						 
						
							
							
								
								RUM: Set rum status by the environment.  
							
							 
							
							
							
						 
						
							2019-05-17 15:21:24 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								aa11fa4864 
								
							 
						 
						
							
							
								
								add report uri and report to  
							
							 
							
							
							
						 
						
							2019-05-16 12:49:40 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								2ca8d20053 
								
							 
						 
						
							
							
								
								Fix rate-limiting tests  
							
							 
							
							
							
						 
						
							2019-05-14 23:16:34 +03:00