Yamagishi Kazutoshi 
							
						 
					 
					
						
						
							
						
						676ba50601 
					 
					
						
						
							
							Show error message to suspended user ( #3281 )  
						
						 
						
						
						
						
					 
					
						2017-05-24 16:39:09 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Yamagishi Kazutoshi 
							
						 
					 
					
						
						
							
						
						73e4468ff3 
					 
					
						
						
							
							Change "Account.any?" to "Account.exists?" ( #3217 )  
						
						 
						
						
						
						
					 
					
						2017-05-22 15:02:30 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Akihiko Odaki 
							
						 
					 
					
						
						
							
						
						aa662cecad 
					 
					
						
						
							
							single_user_mode? always returns boolean ( #3215 )  
						
						 
						
						... 
						
						
						
						This change also adds a specification for the method. 
						
						
					 
					
						2017-05-22 06:00:06 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matt Jankowski 
							
						 
					 
					
						
						
							
						
						7bffd16024 
					 
					
						
						
							
							Error responses cleanup ( #2692 )  
						
						 
						
						... 
						
						
						
						* Use respond_with_error for forbidden errors
* Wrap up common error code into single method 
						
						
					 
					
						2017-05-01 22:24:36 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matt Jankowski 
							
						 
					 
					
						
						
							
						
						fdcf884cf7 
					 
					
						
						
							
							Extract user tracking into concern ( #2600 )  
						
						 
						
						
						
						
					 
					
						2017-04-30 00:28:16 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alpaca-tc 
							
						 
					 
					
						
						
							
						
						9317ec8eb1 
					 
					
						
						
							
							Localize with i18n for Devise::FailureApp ( #2309 )  
						
						 
						
						... 
						
						
						
						This PR fixes I18n.locale for rake middlewares. Mastodon uses Devise that depends on Warden.
Warden::Manager can be found in rake middleware. It is outside of the controller.
In the case of authentication failed, warden calls throw(:warden). At the time Warden::Manager
delegates request to failure_app to generate response and flash[:alert] after catching it.
Unfortunately, I18n.locale is already reset then because I18n.with_locale is enabled only
inside the controller. If we used I18n.locale=, Devise::FailureApp could get the current locale. 
						
						
					 
					
						2017-04-25 15:06:41 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matt Jankowski 
							
						 
					 
					
						
						
							
						
						a0dd90a397 
					 
					
						
						
							
							Return force_ssl to the controller ( #2380 )  
						
						 
						
						
						
						
					 
					
						2017-04-24 02:44:05 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Minto 
							
						 
					 
					
						
						
							
						
						66fd8e7821 
					 
					
						
						
							
							ActivityPub: Add basic, read-only support for Outboxes, Notes, and Create/Announce Activities ( #2197 )  
						
						 
						
						... 
						
						
						
						* Clean up collapsible components
* Expose user Outboxes and AS2 representations of statuses
* Save work thus far.
* Fix bad merge.
* Save my work
* Clean up pagination.
* First test working.
* Add tests.
* Add Forbidden error template.
* Revert yarn.lock changes.
* Fix code style deviations and use localized instead of hardcoded English text. 
						
						
					 
					
						2017-04-23 05:21:10 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matt Jankowski 
							
						 
					 
					
						
						
							
						
						ee82d8a876 
					 
					
						
						
							
							Move force_ssl check to production config ( #2165 )  
						
						 
						
						... 
						
						
						
						The force_ssl method from controllers does not add all of the options that the
sitewide configuration in a config block does. For example, HSTS enforcement is
not added by the controller method, but is added by this style. 
						
						
					 
					
						2017-04-23 04:22:22 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Takayoshi Nishida 
							
						 
					 
					
						
						
							
						
						5e33ad29d4 
					 
					
						
						
							
							Fix   #2195  - Set locale to error pages ( #2255 )  
						
						 
						
						... 
						
						
						
						* Fix  #2195  - Set locale to error pages
* Fix  #2195  - Cut duplicate process into one method 
						
						
					 
					
						2017-04-21 18:11:20 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen 
							
						 
					 
					
						
						
							
						
						5d710b1139 
					 
					
						
						
							
							Make file attachment on MediaAttachment optional ( #1865 )  
						
						 
						
						... 
						
						
						
						Create MediaAttachment but without actual file download when domain is blocked with reject_media set to true
Clean up old media files when creating a new domain block with reject_media set to true
Return remote_url in media attachments API if local file is not present
Undo domain block action in admin UI
Ability to enable reject_media from admin UI 
						
						
					 
					
						2017-04-16 12:51:30 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marcin Cieślak 
							
						 
					 
					
						
						
							
						
						1c8477eab2 
					 
					
						
						
							
							Give SINGLE_USER a chance to register ( #1820 )  
						
						 
						
						... 
						
						
						
						An attempt to open a brand new Mastodon instance configured
as SINGLE_USER_MODE=true will cause an exception.
Enable temporary registration if we have no users in the database
Fixes  #1817  
						
						
					 
					
						2017-04-15 16:46:27 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						4b621188ad 
					 
					
						
						
							
							Fix   #1165  - before_action was called before protect_from_forgery  
						
						 
						
						
						
						
					 
					
						2017-04-08 02:30:50 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						e3a3422a65 
					 
					
						
						
							
							Allow setting of default language through config  
						
						 
						
						... 
						
						
						
						Setting of locale in controller extracted to Localized concern,
the doorkeeper authorized applications controller moved under
custom namespace with inclusion of Localized, which resolves the
"it sometimes appears in a different random language" bug 
						
						
					 
					
						2017-04-07 12:40:26 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						b510a56c0c 
					 
					
						
						
							
							Only call regeneration worker after first login after a 14 day break  
						
						 
						
						
						
						
					 
					
						2017-04-04 02:00:10 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						2d07cb5771 
					 
					
						
						
							
							Catching rack timeout from rails doesn't work  
						
						 
						
						
						
						
					 
					
						2017-04-02 21:12:18 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						5b12624847 
					 
					
						
						
							
							Add proper error page for request timeouts  
						
						 
						
						
						
						
					 
					
						2017-04-02 19:43:44 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						08b96f1b9f 
					 
					
						
						
							
							Fix wrong HTTP status codes on error pages  
						
						 
						
						
						
						
					 
					
						2017-03-19 20:03:28 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						e22a56183a 
					 
					
						
						
							
							Improve error page layouting. 500 page has to stay static because it's  
						
						 
						
						... 
						
						
						
						used from nginx when Rails fails. 
						
						
					 
					
						2017-01-21 22:30:47 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Effy Elden 
							
						 
					 
					
						
						
							
						
						ed41f9f0b1 
					 
					
						
						
							
							Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether  
						
						 
						
						
						
						
					 
					
						2017-01-15 10:30:23 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						3282448878 
					 
					
						
						
							
							Fix   #86  - resolve layout breaking on zoom-out on accounts grid  
						
						 
						
						
						
						
					 
					
						2016-12-26 18:48:33 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						f406e01fcf 
					 
					
						
						
							
							Add filters for suspended accounts  
						
						 
						
						
						
						
					 
					
						2016-12-06 18:03:30 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						816284d739 
					 
					
						
						
							
							Fix   #248  - Reload all accounts when fetching from cache  
						
						 
						
						
						
						
					 
					
						2016-12-03 18:21:26 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						1d0321fc45 
					 
					
						
						
							
							Fix pt translations, improve pre-cache queries, removing will_paginate  
						
						 
						
						... 
						
						
						
						from accounts/tags because it's a terribly inefficient way to paginate
large sets of data 
						
						
					 
					
						2016-12-01 16:26:25 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						a21bcac9e1 
					 
					
						
						
							
							Further abstract caching for includes  
						
						 
						
						
						
						
					 
					
						2016-11-30 15:57:56 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						356d3874eb 
					 
					
						
						
							
							Normalize localizations, add stub for admin/accounts  
						
						 
						
						
						
						
					 
					
						2016-11-30 15:32:26 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						ff21ff1489 
					 
					
						
						
							
							Make User#current_sign_in_at actually track when user was last active,  
						
						 
						
						... 
						
						
						
						by updating it at least every 24h if the user visits the site 
						
						
					 
					
						2016-11-30 15:17:03 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						7e90772c92 
					 
					
						
						
							
							Unify collection caching code  
						
						 
						
						
						
						
					 
					
						2016-11-29 15:49:39 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						27fc49d745 
					 
					
						
						
							
							Add simple admin overview of PuSH subscriptions  
						
						 
						
						
						
						
					 
					
						2016-11-28 18:45:13 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						8e34bed7cc 
					 
					
						
						
							
							Mini Profiler not working well, remove it  
						
						 
						
						
						
						
					 
					
						2016-11-24 19:59:11 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						4bdb6a0eaf 
					 
					
						
						
							
							Rename "publish" to "toot" in english locale, fix lightbox showing old image  
						
						 
						
						... 
						
						
						
						before loading new one, cache notifications API, fix missing follow button
on public profiles 
						
						
					 
					
						2016-11-23 09:20:34 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						5c78547198 
					 
					
						
						
							
							More query optimizations  
						
						 
						
						
						
						
					 
					
						2016-11-22 23:18:54 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						fc90d38893 
					 
					
						
						
							
							Moving some counter queries out of subqueries in the API  
						
						 
						
						
						
						
					 
					
						2016-11-22 22:59:54 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						fb48cc3b74 
					 
					
						
						
							
							Desktop notifications  
						
						 
						
						
						
						
					 
					
						2016-11-21 10:24:50 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						2c766bd4b4 
					 
					
						
						
							
							Add user locale setting  
						
						 
						
						
						
						
					 
					
						2016-11-16 17:56:31 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						fdc17bea58 
					 
					
						
						
							
							Fix rubocop issues, introduce usage of frozen literal to improve performance  
						
						 
						
						
						
						
					 
					
						2016-11-15 16:56:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						b60430fe8f 
					 
					
						
						
							
							Fix sign-in redirecting "back" to a missing image because missing static files hit the raise_not_found method  
						
						 
						
						
						
						
					 
					
						2016-10-06 15:42:00 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						fe77921e47 
					 
					
						
						
							
							Catching more exceptions that slipped through, removing AR logging from  
						
						 
						
						... 
						
						
						
						production as it's very verbose and not very useful 
						
						
					 
					
						2016-10-05 13:26:44 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						9d59d7b463 
					 
					
						
						
							
							Adding a block model and filter mentions from blocked users ( fix   #60 )  
						
						 
						
						
						
						
					 
					
						2016-10-03 17:12:13 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						fc198a8b4c 
					 
					
						
						
							
							Adding e-mail confirmations  
						
						 
						
						
						
						
					 
					
						2016-10-03 16:51:00 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						a0f85774c4 
					 
					
						
						
							
							Redirect after sign in to previous page (unless it's a sign in/up/etc page)  
						
						 
						
						
						
						
					 
					
						2016-10-02 17:11:08 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						927333f4f8 
					 
					
						
						
							
							Improve code style  
						
						 
						
						
						
						
					 
					
						2016-09-29 21:28:21 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						509c18eb13 
					 
					
						
						
							
							Fix local follows, 404 in logs  
						
						 
						
						
						
						
					 
					
						2016-09-08 02:40:51 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						bc0692d75b 
					 
					
						
						
							
							Removing mini-profiler that doesn't work, formatting timelines a bit better  
						
						 
						
						
						
						
					 
					
						2016-08-24 19:23:37 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						49520d6e62 
					 
					
						
						
							
							Adding React.js, Redux, revamping dashboard  
						
						 
						
						
						
						
					 
					
						2016-08-24 17:56:44 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						8985f8e66c 
					 
					
						
						
							
							Fixing more configuration issues with ActionCable  
						
						 
						
						
						
						
					 
					
						2016-08-18 18:39:35 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						8459acd123 
					 
					
						
						
							
							Fix for force SSL issue with websockets  
						
						 
						
						
						
						
					 
					
						2016-08-18 17:48:57 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						6426819b6f 
					 
					
						
						
							
							Fix tests  
						
						 
						
						
						
						
					 
					
						2016-08-18 17:22:44 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						6deb9f966e 
					 
					
						
						
							
							Live timelines using ActionCable  
						
						 
						
						
						
						
					 
					
						2016-08-18 15:49:51 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						e24bfbde1a 
					 
					
						
						
							
							Fixing FanOutOnWriteService, fixing Sidekiq not having enough DB connections  
						
						 
						
						... 
						
						
						
						in the pool, adding a throttle of 60rpm per IP, adding mini profiler, adding
admin status to users 
						
						
					 
					
						2016-03-25 14:12:24 +01:00