Ryan Fox 14d2b76354 Merge branch 'master' into fix-by-external ...

Conflicts:
	app/controllers/users_controller.rb

2015-05-15 19:54:11 -04:00

..

cloud/cloud66

Mark all files with a shebang line as executable

2015-05-12 13:21:32 +02:00

environments

ignore uploads for mini profiler

2015-04-17 12:16:37 +10:00

initializers

Enable CORS requests to pass necessary headers.

2015-05-14 09:46:41 -07:00

locales

Merge pull request #3458 from Qasem-h/Bosnian

2015-05-15 14:34:16 +02:00

apache2.conf.sample

Add a few extra ProxyPass calls

2013-12-23 13:15:39 +02:00

application.rb

Disable raise_in_transactional_callbacks for now

2015-04-28 23:20:08 -04: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

fixed a spelling benchamarking -> benchmarking

2014-08-14 10:16:57 +05:30

deploy.rb.sample

Replace Clockwork with Sidetiq

2013-08-14 21:39:40 +02:00

discourse_defaults.conf

remove unused setting

2015-04-30 12:06:32 +10:00

discourse.config.sample

Typo fix

2014-03-03 11:19:17 -05:00

discourse.pill.sample

Improve bluepill sample config.

2014-01-31 16:09:35 -05:00

environment.rb

…

logrotate.conf

Replace Clockwork with Sidetiq

2013-08-14 21:39:40 +02:00

multisite.yml.production-sample

warns sysadmin to rebake all the posts

2013-08-01 22:24:55 +02:00

nginx.global.conf

Address @Supermathie's concerns in PR1430

2013-09-30 16:28:22 -04:00

nginx.sample.conf

FEATURE: move stylesheet cache out of the uploads directory

2015-05-05 15:50:13 +10:00

projections.json

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

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

puma.rb

Update puma.rb fixed: num_worker(S)

2014-02-13 11:08:27 +07:00

redis.yml

get rid of cache db, not needed

2014-01-06 12:24:11 +11:00

routes.rb

Merge branch 'master' into fix-by-external

2015-05-15 19:54:11 -04:00

site_settings.yml

FIX: rate limit topic invitations

2015-05-13 14:44:37 +05:30

spring.rb

BUGFIX: Correct after_fork semantics

2014-03-31 12:34:13 +11:00

thin.yml.sample

…

unicorn_launcher

reopen logs on usr1

2014-08-25 10:49:13 +10:00

unicorn_upstart.conf

added upstart script for Discourse

2013-10-13 10:16:53 +11:00

unicorn.conf.rb

fix substitution - :fired:

2015-05-12 19:43:25 +02:00