added quotes
FIX: Allow backticks in code blocks
FIX: schemaless urls in emails
Merge pull request #1387 from ZogStriP/fix-schemaless-urls-in-emails

FIX: schemaless urls in emails
Merge pull request #1386 from Andersos/patch-1

added quotes
upgrade rails 4
revert non queuing of emails
BUGFIX: When running under a forking server (apache or unicorn) openid strategy was caching a redis connection from the parent, this made "login with google" only work some of the time.
recover from bad CSRF tokens without requiring a hard refresh of the browser
leftover console.log
jshint is upset
Update client.zh_CN.yml
Update client.zh_CN.yml
Extracted featured_users functionality out of Topic.

* Created a TopicFeatureUsers model
* Topic#featured_user_ids and Topic#feature_topic_users now delegate to
* a TopicFeatureUsers instance to keep demeter happy.
Merge pull request #1388 from ofgeek/patch-2

Update client.zh_CN.yml
Merge pull request #1389 from einarj/extract_featured_users

Extracted featured_users functionality out of Topic.
FIX: Navigating to a new topic after editing one was leaving edit controls open.
FIX: BAD CSRF on login. Don't check csrf in the fake login form since it doesn't actually do anything.
FIX: Allow intra-word underscores.
FIX: avatar thumbnail won't save after upload
Merge pull request #1391 from ZogStriP/fix-avatar-thumbnail-wont-save-after-upload

FIX: avatar thumbnail won't save after upload