Khoa, Le Ngoc 06e637fc4a Merge remote-tracking branch 'upstream/master' into update-locale-vietnamese ...

* upstream/master: (185 commits)
  SECURITY: Upgrade rails.
  FIX: new user summary page was broken
  Version bump to v1.5.0.beta9
  Remove addressable from Discourse.
  UX: change glyph when inviting existing user to a topic
  FIX: Allow for large free disk space
  Revert "FIX: disk_space should be a BigDecimal to handle large disk (closes #3923)"
  UX: improve styling of messages and mobile view of messages
  FIX: correct counts on user summary
  FIX: link to filtered down list of badges from summary FEATURE: pick featured badges in summary page
  FIX: do not allow new email to be duplicate FIX: return proper error message when email already exists
  retain unactivated accounts a bit longer default
  FEATURE: blocked users can send and reply to private messages from staff
  Remove Arel patch that has been merged upstream.
  correct path
  little typo
  FIX: Missing tag in CSS.
  PERF: remove 10-20ms of work from every page view
  FIX: remove green background for wiki (this can be re-added via a customization if needed)
  Hotfix for unsubscribe via email
  ...

# Conflicts:
#	.tx/config

2016-01-26 12:44:29 +07: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

FIX: 'cancel_scheduled_job' wasn't working due to sidekiq upgrade

2016-01-13 09:08:26 +01:00

locales

Merge remote-tracking branch 'upstream/master' into update-locale-vietnamese

2016-01-26 12:44:29 +07: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

Initial release of Discourse

2013-02-05 14:16:51 -05:00

database.yml

PERF: disable prepared statements

2015-10-19 14:02:22 +11:00

deploy.rb.sample

Replace Clockwork with Sidetiq

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

discourse_defaults.conf

PERF: disable prepared statements

2015-10-19 14:02:22 +11: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

Initial release of Discourse

2013-02-05 14:16:51 -05:00

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

Allow sites to set HTTP basic authentication through nginx.

2016-01-08 12:49:17 +08: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

routes.rb

FEATURE: first pass at user summary page

2016-01-20 15:14:25 +11:00

site_settings.yml

retain unactivated accounts a bit longer default

2016-01-22 13:13:07 -08:00

spring.rb

BUGFIX: Correct after_fork semantics

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

thin.yml.sample

Add sample Capistrano deployment files

2013-05-02 19:53:37 -07:00

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

extra logic to force kill orphan sidekiqs

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