Ondřej Hruška 6913426e48 Merge pull request #92 from tootsuite/master ...

tiny upstream merge

2017-07-22 22:20:17 +02:00

..

environments

Updated from tootsuite

2017-07-17 20:03:57 +02:00

initializers

Fix sessions being replaced needlessly (#4292)

2017-07-22 01:09:10 +02:00

locales

Update French locales (settings, ToS, & co) (#4261)

2017-07-22 20:28:40 +02:00

webpack

Fix for stylesheet split

2017-07-18 11:28:52 -07:00

application.rb

Merge upstream!! #64 <3 <3

2017-07-12 02:03:17 -07:00

boot.rb

Adds bootsnap. Faster boot time (#3176)

2017-05-20 19:42:27 +02:00

brakeman.ignore

Enable CodeClimate Brakeman checks (#2861)

2017-05-07 02:45:33 +02:00

database.yml

fix unnecessary variable (#3947)

2017-06-25 23:29:22 +02:00

deploy.rb

Update capistrano lock version to 3.8.1 (#3056)

2017-05-14 17:38:29 +02:00

environment.rb

…

i18n-tasks.yml

Add date to ignore_missing and ignore_unused in config/i18n-tasks.yml (#3572)

2017-06-05 01:02:19 +02:00

navigation.rb

Rename "Credentials" page to "Security" for clarity (#3941)

2017-06-25 22:13:02 +02: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 that good fresh upstream shit

2017-07-22 01:16:53 +00:00

secrets.yml

…

settings.yml

disable about page timeline

2017-07-20 17:26:00 -04:00

sidekiq.yml

Bind web UI access tokens to sessions (#3940)

2017-06-25 23:51:32 +02:00

webpacker.yml

Fix webpack-dev-server on Windows (#4000)

2017-06-30 13:43:26 +02:00