Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master
Commits on Feb 25, 2015
  1. Abdelkader Boudih

    Merge pull request #19072 from y-yagi/mailer_doc

    seuros authored
    update docs to reflect that mailer generator add suffix to generated classes [ci skip]
  2. y-yagi
  3. Abdelkader Boudih

    Merge pull request #19069 from robertzk/patch-1

    seuros authored
    fix typo [ci-skip]
  4. Robert Krzyzanowski

    fix typo [ci-skip]

    robertzk authored
  5. Aaron Patterson

    cache quoted column names in SQLite3

    tenderlove authored
    we do this in other adapters, and it's a nice speed improvement
  6. Aaron Patterson

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

    tenderlove authored
    AR: translate_exception_class() no longer logs error.
  7. Arthur Nogueira Neves

    Merge pull request #18936 from arthurnn/txn_callbacks

    arthurnn authored
    Spike on new transaction callbacks
  8. Aaron Patterson

    Merge pull request #17426 from jpcody/fixture_associations_fix

    tenderlove authored
    Rely on through table name in has_many fixtures
  9. Arthur Nogueira Neves

    Rename tests

    arthurnn authored
  10. Arthur Nogueira Neves

    Add before_commit

    arthurnn authored
    [fixes #18903]
  11. Arthur Nogueira Neves

    Add transaction callbacks that wont enroll to the transaction.

    arthurnn authored
    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]
Commits on Feb 24, 2015
  1. Paul Annesley
  2. Jeremy Kemper
  3. Robin Dupret
  4. Sean Griffin
  5. Jeremy Kemper
  6. Rafael Mendonça França

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

    rafaelfranca authored
    Fix appending table_name to select and group when used with subquery (fr...
  7. Rafael Mendonça França

    Merge pull request #19066 from courtenay/mysql_boolean_limit_19065

    rafaelfranca authored
    Fix mysql's schema.rb dumper so it does not include limit on emulated booleans
  8. C o u r t e n a y

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

    courtenay authored
    … boolean tinyint(1) fields
  9. Rafael Mendonça França

    Merge pull request #19055 from ianks/model_name.to_json

    rafaelfranca authored
    activemodel: make .model_name json encodable
  10. Ian Ker-Seymer

    activemodel: make .model_name json encodable

    ianks authored
    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.
  11. Rafael Mendonça França
  12. Rafael Mendonça França
  13. Rafael Mendonça França

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

    rafaelfranca authored
    …back
    
    Deprecate `AbstractController::Callbacks#skip_action_callback`
  14. Yves Senn

    rework `disable_referential_integrity` for PostgreSQL.

    senny authored
    [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
  15. Rafael Mendonça França

    Merge pull request #19064 from kamipo/remove_unused_table

    rafaelfranca authored
    Remove unused table
  16. Ryuta Kamizono

    Remove unused table

    kamipo authored
    `postgresql_xml_data_type` table is used from nowhere.
  17. Rafael Mendonça França

    Merge pull request #19062 from kamipo/move_back_new_column_definition…

    rafaelfranca authored
    …_into_table_definition
    
    Move back `new_column_definition` into `TableDefinition`
  18. Ryuta Kamizono

    Move back `new_column_definition` into `TableDefinition`

    kamipo authored
    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`.
  19. Carlos Antonio da Silva
  20. Iain Beeston

    Deprecate `AbstractController::Callbacks#skip_action_callback`

    iainbeeston authored
    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.
  21. Rafael Mendonça França

    Merge pull request #19052 from square/testing-singleton

    rafaelfranca authored
    `ActiveJob::QueueAdapters::TestAdapter` is now a singleton
  22. Rafael Mendonça França

    Merge pull request #19030 from kamipo/extract_short_hand_column_methods

    rafaelfranca authored
    Extract the short-hand column methods into `ColumnMethods`
  23. Tamir Duberstein

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

    tamird authored
    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.
Commits on Feb 23, 2015
  1. Santiago Pastorino

    Merge pull request #19038 from tchandy/cleaning_actionpack_tests

    spastorino authored
    Cleaning actionpack tests
Something went wrong with that request. Please try again.