Thibaut Girka 659b8a12ec Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
	config/locales/ca.yml
	config/locales/nl.yml
	config/locales/oc.yml
	config/locales/pt-BR.yml

Resolved conflicts by removing upstream-specific changes

2018-05-27 13:20:15 +02:00

..

environments

Merge remote-tracking branch 'origin/master' into gs-master

2018-05-03 17:23:44 -05:00

initializers

Merge branch 'master' into glitch-soc/merge-upstream

2018-05-27 13:20:15 +02:00

locales

Merge branch 'master' into glitch-soc/merge-upstream

2018-05-27 13:20:15 +02:00

webpack

Merge branch 'master' into glitch-soc/merge

2018-05-14 20:51:50 +02:00

application.rb

Merge branch 'master' into glitch-soc/merge

2018-05-14 20:51:50 +02:00

boot.rb

Upgrade Rails to version 5.2.0 (#5898)

2018-04-12 14:45:17 +02:00

brakeman.ignore

Save video metadata and improve video OpenGraph tags (#6481)

2018-02-16 07:22:20 +01:00

database.yml

use-DB_NAME-in-development (#5430)

2017-10-17 11:45:37 +02:00

deploy.rb

Update dependencies for Ruby (2018-04-23) (#7237)

2018-04-23 11:29:17 +02:00

environment.rb

Make PreviewCard records reuseable between statuses (#4642)

2017-09-01 16:20:16 +02:00

i18n-tasks.yml

Ignore tootsuite-specific theme-related translation strings

2018-05-10 00:03:34 +02:00

navigation.rb

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-09 00:17:17 +00: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 branch 'master' into glitch-soc/merge-upstream

2018-05-19 22:41:10 +02: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-05-18 08:47:10 -05:00

sidekiq.yml

Account archive download (#6460)

2018-02-21 23:21:32 +01:00

webpacker.yml

Finalized theme loading and stuff

2017-11-20 22:13:37 -08:00