Permalink
Commits on Feb 25, 2015
  1. @seuros

    Merge pull request #19072 from y-yagi/mailer_doc

    update docs to reflect that mailer generator add suffix to generated classes [ci skip]
    seuros committed Feb 25, 2015
  2. @y-yagi
  3. @seuros

    Merge pull request #19069 from robertzk/patch-1

    fix typo [ci-skip]
    seuros committed Feb 25, 2015
  4. @robertzk

    fix typo [ci-skip]

    robertzk committed Feb 25, 2015
  5. @tenderlove

    cache quoted column names in SQLite3

    we do this in other adapters, and it's a nice speed improvement
    tenderlove committed Feb 25, 2015
  6. @tenderlove

    Merge pull request #19068 from pda/ar-translate-exception-class-no-log

    AR: translate_exception_class() no longer logs error.
    tenderlove committed Feb 25, 2015
  7. @arthurnn

    Merge pull request #18936 from arthurnn/txn_callbacks

    Spike on new transaction callbacks
    arthurnn committed Feb 25, 2015
  8. @tenderlove

    Merge pull request #17426 from jpcody/fixture_associations_fix

    Rely on through table name in has_many fixtures
    tenderlove committed Feb 25, 2015
  9. @arthurnn

    Rename tests

    arthurnn committed Feb 25, 2015
  10. @arthurnn

    Add before_commit

    [fixes #18903]
    arthurnn committed Feb 14, 2015
  11. @arthurnn

    Add transaction callbacks that wont enroll to the transaction.

    Add after_commit_without_transaction_enrollment and
    after_rollback_without_transaction_enrollment private callbacks so we
    can create after_commit and after_rollback callbacks without having the
    records automatic enrolled in the transaction.
    
    [fixes #18904]
    arthurnn committed Feb 13, 2015
Commits on Feb 24, 2015
  1. @pda
  2. @jeremy
  3. @robin850
  4. @sgrif
  5. @jeremy
  6. @rafaelfranca

    Merge pull request #18744 from mfazekas/no-table-name-with-from

    Fix appending table_name to select and group when used with subquery (fr...
    rafaelfranca committed Feb 24, 2015
  7. @rafaelfranca

    Merge pull request #19066 from courtenay/mysql_boolean_limit_19065

    Fix mysql's schema.rb dumper so it does not include limit on emulated booleans
    rafaelfranca committed Feb 24, 2015
  8. @courtenay

    Fix mysql's schema.rb dumper so it does not include limit on emulated…

    … boolean tinyint(1) fields
    courtenay committed Feb 24, 2015
  9. @rafaelfranca

    Merge pull request #19055 from ianks/model_name.to_json

    activemodel: make .model_name json encodable
    rafaelfranca committed Feb 24, 2015
  10. @ianks

    activemodel: make .model_name json encodable

    Previously, calling `User.model_name.to_json` would result in an infinite
    recursion as `.model_name` inherited its `.as_json` behavior from Object. This
    patch fixes that unexpected behavior by delegating `.as_json` to :name.
    ianks committed Feb 24, 2015
  11. @rafaelfranca
  12. @rafaelfranca
  13. @rafaelfranca

    Merge pull request #19060 from iainbeeston/deprecate-skip-action-call…

    …back
    
    Deprecate `AbstractController::Callbacks#skip_action_callback`
    rafaelfranca committed Feb 24, 2015
  14. @senny

    rework `disable_referential_integrity` for PostgreSQL.

    [Toby Ovod-Everett & Andrey Nering & Yves Senn]
    
    Closes #17726.
    Closes #10939.
    
    This patch makes three distinct modifications:
    
    1. no longer fall back to disabling user triggers if system triggers can't be disabled
    2. warn the user when referential integrity can't be disabled
    3. restore aborted transactions when referential integrity can't be disabled
    
    The motivation behind these changes is to make the behavior of Rails
    transparent and less error-prone. To require superuser privileges is not optimal
    but it's what Rails currently needs. Users who absolutely rely on disabling user triggers
    can patch `disable_referential_integrity`.
    
    We should investigate `SET CONSTRAINTS` as a possible solution which does not require
    superuser privileges.
    
    /cc @matthewd
    senny committed Feb 24, 2015
  15. @rafaelfranca

    Merge pull request #19064 from kamipo/remove_unused_table

    Remove unused table
    rafaelfranca committed Feb 24, 2015
  16. @kamipo

    Remove unused table

    `postgresql_xml_data_type` table is used from nowhere.
    kamipo committed Feb 24, 2015
  17. @rafaelfranca

    Merge pull request #19062 from kamipo/move_back_new_column_definition…

    …_into_table_definition
    
    Move back `new_column_definition` into `TableDefinition`
    rafaelfranca committed Feb 24, 2015
  18. @kamipo

    Move back `new_column_definition` into `TableDefinition`

    Only `primary_key` should be extracted by d47357e in #19030, but
    `new_coclumn_definition` was also extracted because #17631 is merged
    previously, then #19030 is auto merged without conflicts.
    
    This commit is for move back `new_column_definition` into
    `TableDefinition`.
    kamipo committed Feb 24, 2015
  19. @carlosantoniodasilva
  20. @iainbeeston

    Deprecate `AbstractController::Callbacks#skip_action_callback`

    As part of #19029, in future `skip_before_action`, `skip_after_action` and
    `skip_around_action` will raise an ArgumentError if the specified
    callback does not exist. `skip_action_callback` calls all three of these
    methods and will almost certainly result in an ArgumentError. If anyone
    wants to remove all three callbacks then they can still call the three
    individual methods. Therefore let's deprecate `skip_action_callback` now
    and remove it when #19029 is merged.
    iainbeeston committed Feb 23, 2015
  21. @rafaelfranca

    Merge pull request #19052 from square/testing-singleton

    `ActiveJob::QueueAdapters::TestAdapter` is now a singleton
    rafaelfranca committed Feb 24, 2015
  22. @rafaelfranca

    Merge pull request #19030 from kamipo/extract_short_hand_column_methods

    Extract the short-hand column methods into `ColumnMethods`
    rafaelfranca committed Feb 24, 2015
  23. @tamird

    `ActiveJob::QueueAdapters::TestAdapter` is now a singleton

    Since `ActiveJob::TestHelper` globally sets
    `ActiveJob::Base.queue_adapter` on setup, there is no benefit in
    instantiating a new `TestAdapter` per tests. The original rationale was
    to allow parallel tests to run without interference, but since they'd
    all mutate the global `ActiveJob::Base.queue_adapter`, that was never
    realized.
    tamird committed Sep 24, 2014
Commits on Feb 23, 2015
  1. @spastorino

    Merge pull request #19038 from tchandy/cleaning_actionpack_tests

    Cleaning actionpack tests
    spastorino committed Feb 23, 2015