David Yip 020b40efdb Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: .travis.yml app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_detailed_status.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml		2018-02-09 09:25:53 -06:00
..
environments	change referrer policy to same-origin	2018-02-03 14:49:00 -05:00
initializers	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-02-04 16:36:19 -06:00
locales	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-02-09 09:25:53 -06:00
webpack	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-01-28 22:45:17 -06:00
application.rb	Merge remote-tracking branch 'origin/master' into merge-upstream-20180121	2018-01-21 16:26:50 -06:00
boot.rb	Adds bootsnap. Faster boot time (#3176)	2017-05-20 19:42:27 +02:00
brakeman.ignore	Add logging of admin actions (#5757)	2017-11-24 02:05:53 +01:00
database.yml	use-DB_NAME-in-development (#5430)	2017-10-17 11:45:37 +02:00
deploy.rb	Update dependencies for Ruby (2017-10-30) (#5566)	2017-10-31 12:22:32 +01:00
environment.rb	Make PreviewCard records reuseable between statuses (#4642)	2017-09-01 16:20:16 +02:00
i18n-tasks.yml	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-02-04 16:36:19 -06:00
navigation.rb	Moved flavour UI into own prefs tab	2017-12-10 20:32:27 -08:00
puma.rb	Do not set port for puma if it is bound to unix socket (#2289)	2017-04-22 01:22:20 +02:00
routes.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-02-04 16:36:19 -06:00
secrets.yml	Upgrade to Rails 5.0.0.1	2016-08-17 17:58:00 +02:00
settings.yml	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-02-09 09:25:53 -06:00
sidekiq.yml	Move e-mail digest task to sidekiq, reduce workload, improve hint (#6252)	2018-01-15 04:34:28 +01:00
webpacker.yml	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00