Baptiste Lemoine f76462ade2 Merge remote-tracking branch 'tk/master' into messaging		2019-12-13 16:33:46 +01:00
..
environments	Add SMTP reply_to option (#11718)	2019-09-02 18:12:40 +02:00
initializers	Merge remote-tracking branch 'gh/master'	2019-12-10 12:05:30 +01:00
locales	Merge remote-tracking branch 'tk/master' into messaging	2019-12-13 16:33:46 +01:00
webpack	⚡ merge with gh master	2019-12-02 16:35:37 +01:00
application.rb	Fix localization test failing due to order of locale definitions (#12393)	2019-11-15 21:00:09 +01:00
boot.rb	Fix bootsnap cache directory being declared relatively (#9511)	2018-12-13 05:19:52 +01:00
brakeman.ignore	Add type, limit, offset, min_id, max_id, account_id to search API (#10091)	2019-02-26 15:21:36 +01:00
database.yml	config: add DB_SSLMODE for managed/remote PG (#10210)	2019-03-08 14:36:28 +01:00
deploy.rb	Bump capistrano from 3.11.1 to 3.11.2 (#12012)	2019-10-04 11:11:36 +09:00
environment.rb	Make PreviewCard records reuseable between statuses (#4642)	2017-09-01 16:20:16 +02:00
i18n-tasks.yml	Fix inconsistent interpolations test by ignoring single plural keys (#12394)	2019-11-15 21:23:03 +01:00
navigation.rb	Fix relays UI being available in whitelist/secure mode (#11963)	2019-09-27 02:13:34 +02:00
pghero.yml	Use override_csp options on pghero (#12489)	2019-11-27 05:28:11 +01:00
puma.rb	Add PERSISTENT_TIMEOUT option (#11756)	2019-09-04 20:44:08 +02:00
routes.rb	⚡ merge with gh master	2019-12-02 16:35:37 +01:00
secrets.yml	Upgrade to Rails 5.0.0.1	2016-08-17 17:58:00 +02:00
settings.yml	⚡ merge with gh master	2019-12-02 16:35:37 +01:00
sidekiq.yml	Change trending hashtags to not disappear instantly after midnight (#11712)	2019-09-02 18:11:13 +02:00
themes.yml	bliss theme separated	2019-08-27 13:55:47 +02:00
webpacker.yml	hop	2019-12-02 16:33:04 +01:00