khr 3591c7e5c4 Merge branches 'branding_cybre', 'dependency_whatinput', 'feature_512_char_toots', 'feature_cybrespace_locale', 'feature_disable_reply_counts', 'feature_doodlebox', 'feature_hotlink_twitter_mentions', 'feature_longer_bios', 'feature_machine_registration_task', 'theme_base' and 'theme_cybre' into cybrespace		2019-01-20 13:23:35 -08:00
..
environments	Fix missing protocol in dns-prefetch, improve code style (#8963)	2018-10-12 02:19:10 +02:00
initializers	Add timeouts for S3 (#9842)	2019-01-18 01:36:59 +01:00
locales	Merge branches 'branding_cybre', 'dependency_whatinput', 'feature_512_char_toots', 'feature_cybrespace_locale', 'feature_disable_reply_counts', 'feature_doodlebox', 'feature_hotlink_twitter_mentions', 'feature_longer_bios', 'feature_machine_registration_task', 'theme_base' and 'theme_cybre' into cybrespace	2019-01-20 13:23:35 -08:00
webpack	Update dependencies for Node.js (2018-12-31) (#9669)	2018-12-31 18:11:48 +01:00
application.rb	Cybrespace locale	2019-01-20 13:09:41 -08:00
boot.rb	Fix bootsnap cache directory being declared relatively (#9511)	2018-12-13 05:19:52 +01:00
brakeman.ignore	Allow joining several hashtags in a single column (#8904)	2018-11-05 18:53:25 +01:00
database.yml	Remove PostgreSQL statement timeout (#9537)	2018-12-16 21:17:15 +01:00
deploy.rb	Use the bundled Capistrano version (#9855)	2019-01-18 21:31:11 +01:00
environment.rb	Make PreviewCard records reuseable between statuses (#4642)	2017-09-01 16:20:16 +02:00
i18n-tasks.yml	Cybrespace locale	2019-01-20 13:09:41 -08:00
navigation.rb	Change "federation" admin UI link to point to "limited" domains (#9762)	2019-01-08 17:41:27 +01:00
puma.rb	Improve ActiveRecord connection in on_worker_boot (#9238)	2018-11-09 09:08:01 +01:00
routes.rb	Redesign admin instances area (#9645)	2019-01-08 13:39:49 +01:00
secrets.yml	Upgrade to Rails 5.0.0.1	2016-08-17 17:58:00 +02:00
settings.yml	Cybrespace branding changes	2019-01-20 13:03:49 -08:00
sidekiq.yml	Add scheduled statuses (#9706)	2019-01-05 12:43:28 +01:00
themes.yml	Cybre dark theme	2019-01-20 13:20:17 -08:00
webpacker.yml	Fix building assets in test environment (#8691)	2018-09-13 15:18:47 +02:00