946bd2e7e1 
								
							 
						 
						
							
							
								
								Merge commit '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-05-01 19:16:48 +02:00  
				
					
						
							
							
								 
						
							
								6f342a6d4c 
								
							 
						 
						
							
							
								
								Merge commit '34e826f373d20f6230d1ef0aa03ad41a3bdf5998' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/helpers/theme_helper.rb`:
  Conflict caused by our different theme systems.
  Ported upstream's changes.
- `app/models/account.rb`:
  Upstream basically made a change we already made.
  Moved constant declaration to match upstream. 
							
						 
						
							2024-05-01 18:56:48 +02:00  
				
					
						
							
							
								 
						
							
								7208edbd37 
								
							 
						 
						
							
							
								
								Replace `use_pack`, `layouts/theme` and `@theme` by new helpers  
							
							... 
							
							
							
							Packs are now loaded from views, just like upstream, and are
identified by their filenames. The definition of `theme.yml` has
changed as such:
- `pack_directory` is now required
- `pack` is now unused
- `signed_in_preload` has been introduced 
							
						 
						
							2024-04-28 15:45:42 +02:00  
				
					
						
							
							
								 
						
							
								7fed4a9740 
								
							 
						 
						
							
							
								
								Pull out repeated setup to shared setup in statusus/show view spec ( #29927 )  
							
							
							
						 
						
							2024-04-15 15:24:31 +00:00  
				
					
						
							
							
								 
						
							
								61d108f415 
								
							 
						 
						
							
							
								
								Extract `header_tags` method in statuses/show view spec ( #29907 )  
							
							
							
						 
						
							2024-04-12 09:50:46 +00:00  
				
					
						
							
							
								 
						
							
								92855948a0 
								
							 
						 
						
							
							
								
								Remove unused `show_landing_strip?` helper method ( #29618 )  
							
							
							
						 
						
							2024-03-18 08:55:54 +00:00  
				
					
						
							
							
								 
						
							
								949f5eb860 
								
							 
						 
						
							
							
								
								Fix `RSpec/MetadataStyle` cop in spec/ ( #27729 )  
							
							
							
						 
						
							2023-11-06 14:28:20 +00:00  
				
					
						
							
							
								 
						
							
								bcd0171e5e 
								
							 
						 
						
							
							
								
								Fix `Lint/UselessAssignment` cop ( #27472 )  
							
							
							
						 
						
							2023-10-19 16:55:06 +02:00  
				
					
						
							
							
								 
						
							
								b970ed6098 
								
							 
						 
						
							
							
								
								Update rubocop and rubocop-rspec ( #26329 )  
							
							
							
						 
						
							2023-08-22 09:31:40 +02:00  
				
					
						
							
							
								 
						
							
								05f9e39b32 
								
							 
						 
						
							
							
								
								Fix `RSpec/VerifiedDoubles` cop ( #25469 )  
							
							
							
						 
						
							2023-06-22 14:55:22 +02:00  
				
					
						
							
							
								 
						
							
								bdc74086e6 
								
							 
						 
						
							
							
								
								Fix Rails/ContentTag cop ( #24691 )  
							
							
							
						 
						
							2023-04-30 06:47:15 +02:00  
				
					
						
							
							
								 
						
							
								4f15fd0ba1 
								
							 
						 
						
							
							
								
								Fix style for hashes ( #20518 )  
							
							... 
							
							
							
							* Fix style for hashes
Make the style for hashes consistent.
* New style
More consistency 
							
						 
						
							2022-11-17 11:05:39 +01:00  
				
					
						
							
							
								 
						
							
								7afc6a630c 
								
							 
						 
						
							
							
								
								Redirect non-logged-in user to owner statuses on single user mode ( #19333 )  
							
							
							
						 
						
							2022-10-12 21:07:30 +02:00  
				
					
						
							
							
								 
						
							
								62782babd0 
								
							 
						 
						
							
							
								
								Change public statuses pages to mount the web UI ( #19301 )  
							
							
							
						 
						
							2022-10-06 02:26:34 +02:00  
				
					
						
							
							
								 
						
							
								5159ba26e4 
								
							 
						 
						
							
							
								
								Fix error when rendering public pages with media attachments ( #16763 )  
							
							... 
							
							
							
							* Add tests
* Fix error when rendering public pages with media attachments
* Add tests
* Fix tests
* Please CodeClimate 
							
						 
						
							2021-10-13 15:27:19 +02:00  
				
					
						
							
							
								 
						
							
								b851456139 
								
							 
						 
						
							
							
								
								Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` ( #11247 )  
							
							
							
						 
						
							2019-07-07 16:16:51 +02:00