Merge branch 'master' into joindep

* master: (23 commits)
  Escape the parentheses in the default function regexp
  Update docs on Tilt::Template in Asset Pipeline guide
  Fix loading a sql structure file on postgres when the file's path has whitespace in it
  remove trailing whitespace added with b057765 [ci skip].
  Allow unscope to work with `where.not`
  Raise an exception when model without primary key calls .find_with_ids
  Process sub-query relation's binding values
  Instrument the generation of Action Mailer messages
  Remove extra variable creation and merge.
  In Relation#empty? use #exists? instead of #count.
  [ci skip] avoid deprecation warning in sample code
  Convert Fixnum into String the port number in MySQL
  Fix some indentation on autosave association
  Make define_non_cyclic_method simpler
  Add Sass gobbling info to asset pipeline docs
  Ensure the state is clean after one failure
  Fix typo in form_helper.rb
  add a new local variable to track if digests are being stored, to ensure the cleanup works correctly
  [ci skip] Fix number of methods added by association.
  update digestor code based on review
  ...

0 files changed, 0 insertions, 0 deletions