Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							07eb31eeac 
							
						 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						... 
						
						
						
						Conflicts:
- app/views/admin/settings/edit.html.haml:
  Conflict due to how the theming settings change. 
						
						
					 
					
						2019-03-14 17:17:20 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							51e154f5e8 
							
						 
					 
					
						
						
							
							Admission-based registrations mode ( #10250 )  
						
						... 
						
						
						
						Fix  #6856 
Fix  #6951  
					
						2019-03-14 05:28:30 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							71d683b410 
							
						 
					 
					
						
						
							
							Change instance_presenter_spec to point to glitch-soc instead of tootsuite  
						
						
						
						
					 
					
						2018-12-23 11:45:26 +01:00 
						 
				 
			
				
					
						
							
							
								ysksn 
							
						 
					 
					
						
						
						
						
							
						
						
							1bc78ec50e 
							
						 
					 
					
						
						
							
							Add specs for InstancePresenter ( #9596 )  
						
						
						
						
					 
					
						2018-12-21 08:59:56 +01:00 
						 
				 
			
				
					
						
							
							
								Akihiko Odaki 
							
						 
					 
					
						
						
						
						
							
						
						
							9b8a448477 
							
						 
					 
					
						
						
							
							Isolate each specs for cache store ( #6450 )  
						
						... 
						
						
						
						The cache store is explicitly used by some specs, but they were not
isolated and therefore not reliable. This fixes the issue by clearing
the cache after each specs. 
						
						
					 
					
						2018-02-17 22:35:05 +01:00 
						 
				 
			
				
					
						
							
							
								Akihiko Odaki 
							
						 
					 
					
						
						
						
						
							
						
						
							76fa9d2488 
							
						 
					 
					
						
						
							
							Use around hook to restore context in InstancePresenter spec ( #3430 )  
						
						
						
						
					 
					
						2017-05-30 09:03:35 -04:00 
						 
				 
			
				
					
						
							
							
								Matt Jankowski 
							
						 
					 
					
						
						
						
						
							
						
						
							3b8908c114 
							
						 
					 
					
						
						
							
							About page contact email ( #1839 )  
						
						... 
						
						
						
						* Correct site_contact_email typo
* Separate about more page into partials, add specs 
						
						
					 
					
						2017-04-15 13:33:25 +02:00 
						 
				 
			
				
					
						
							
							
								Matt Jankowski 
							
						 
					 
					
						
						
						
						
							
						
						
							e5282e4ec0 
							
						 
					 
					
						
						
							
							Clean up about page ( #1282 )  
						
						... 
						
						
						
						* Add InstancePresenter to expose site details
* Clean up about controller, use instance presenter 
						
						
					 
					
						2017-04-09 14:47:25 +02:00