Thibaut Girka 8b4abaa90d Merge branch 'master' into glitch-soc/master ...

Conflicts:
	config/routes.rb

Added the “endorsements” route from upstream.

2018-08-21 18:24:48 +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/master

2018-08-21 18:24:48 +02:00

locales

Merge branch 'master' into glitch-soc/master

2018-08-21 18:24:48 +02:00

webpack

Reduce assets precompilation time by about 20%

2018-07-28 23:24:41 +02:00

application.rb

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

2018-08-18 18:04:49 +02:00

boot.rb

…

brakeman.ignore

Add remote interaction dialog for toots (#8202)

2018-08-18 03:03:12 +02:00

database.yml

…

deploy.rb

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

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

environment.rb

…

i18n-tasks.yml

Ignore tootsuite-specific theme-related translation strings

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

navigation.rb

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

2018-07-17 22:05:25 +02:00

puma.rb

…

routes.rb

Merge branch 'master' into glitch-soc/master

2018-08-21 18:24:48 +02:00

secrets.yml

…

settings.yml

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

2018-08-01 22:20:25 +02:00

sidekiq.yml

…

webpacker.yml

…