Sam 29c2423daf Merge branch 'master' into vdom ...

# Conflicts:
#	app/assets/javascripts/discourse/views/post.js.es6

2016-02-19 14:09:31 +11:00

..

cloud/cloud66

FEATURE: Localization fallbacks (server-side)

2015-07-15 10:17:36 -07:00

environments

FEATURE: upgrade to Rails 4.2.4

2015-09-23 15:24:30 +10:00

initializers

PERF: cut down on memory usage allowed to redis

2016-02-04 13:58:38 +11:00

locales

Merge branch 'master' into vdom

2016-02-19 14:09:31 +11:00

application.rb

remove template compiler, handle it in another way

2015-11-25 15:45:36 +11:00

boot.rb

Do not assume all interpreter versions support allocation tracing

2014-12-07 23:28:38 +00:00

cdn.yml.sample

…

database.yml

Second attempt which removes any kind proxying.

2016-02-05 08:51:10 +08:00

deploy.rb.sample

…

discourse_defaults.conf

FEATURE: AR adapter to failover to a replica DB server.

2016-02-05 08:51:10 +08:00

discourse.config.sample

…

discourse.pill.sample

…

environment.rb

…

logrotate.conf

…

multisite.yml.production-sample

…

nginx.global.conf

…

nginx.sample.conf

Merge pull request #3928 from jamielinux/nginx204

2016-01-30 01:48:22 -08:00

projections.json

Instead of .js.handlebars use .hbs for handlebars templates

2014-09-26 15:23:15 -04:00

puma.rb

…

routes.rb

FEATURE: new incoming email details modal

2016-02-10 22:00:27 +01:00

site_settings.yml

Merge branch 'master' into vdom

2016-02-19 14:09:31 +11:00

spring.rb

…

thin.yml.sample

…

unicorn_launcher

…

unicorn_upstart.conf

…

unicorn.conf.rb

extra logic to force kill orphan sidekiqs

2015-06-18 15:32:04 +10:00