Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Commits on Oct 21, 2012
  1. @vijaydev

    Merge branch 'master' of

    vijaydev authored
  2. @vijaydev

    copy edits [ci skip]

    vijaydev authored
  3. @fxn

    Merge pull request #7493 from steveklabnik/ajax_guide

    fxn authored
    Re-writing the AJAX Guide
  4. minor edits in AM documentation [ci skip]

    Francesco Rodriguez authored
  5. update AR::AttributeMethods documentation [ci skip]

    Francesco Rodriguez authored
  6. nodoc AR::Generators [ci skip]

    Francesco Rodriguez authored
Commits on Oct 20, 2012
  1. @rafaelfranca
  2. @rafaelfranca

    Merge pull request #8002 from nashby/checkbox-include

    rafaelfranca authored
    check_box value can be not only an object of Array class
  3. @nashby

    check_box value can be not only an object of Array class

    nashby authored
    there is a chance that `value` is a Set or an object that reponses to `include?` method so let's handle this case
  4. @jeremy
  5. @AvnerCohen
  6. @carlosantoniodasilva

    Merge pull request #7951 from Grandrath/patch-1

    carlosantoniodasilva authored
    Use `Rails.env` instead of `ENV['RAILS_ENV']`.
    Fix behavior of `rake db:structure:load`.
  7. @rafaelfranca
  8. @rafaelfranca

    Merge pull request #7995 from adimichele/master

    rafaelfranca authored
    Small change to active_record/locale/en.yml
  9. @adimichele

    Changed scope for "taken" error message translation to decrease prece…

    adimichele authored
    Moved activerecord.errors.messages.taken to errors.messages.taken so that translations for, e.g., don't get overridden.
    Test that the translation for 'taken' can be overridden
Commits on Oct 19, 2012
  1. @rafaelfranca

    Merge pull request #7997 from steveklabnik/issue_733

    rafaelfranca authored
    Add i18n scope to disance_of_time_in_words.
  2. @steveklabnik @rafaelfranca

    Add i18n scope to disance_of_time_in_words.

    steveklabnik authored rafaelfranca committed
    This fixes #733.
  3. @rafaelfranca

    Merge pull request #7996 from yahonda/revert_7994

    rafaelfranca authored
    Revert "truncate debug.log on each test run"
    I'm reverting this since we may want to see SQL results of subsequent tests run, to, per example, copare them.
    I didn't realized this first time but @yahonda pointed me out.
  4. @yahonda

    Revert "truncate debug.log on each test run"

    yahonda authored
    This reverts commit 98043c6.
    Because if every time `debug.log` is truncated,
    developers have no way to see the previous ActiveRecord unit test results.
    `debug.log` file can be easily reduced
    by executing `$ touch /dev/null > debug.log` periodically.
  5. @elpic
  6. @rafaelfranca

    Merge pull request #7994 from frodsan/truncate_debug_log

    rafaelfranca authored
    truncate debug.log on each test run
  7. @jonleighton

    Get rid of the ActiveRecord::Model::DeprecationProxy thing.

    jonleighton authored
    I think it's going to be too much pain to try to transition the
    :active_record load hook from executing against Base to executing
    against Model.
    For example, after Model is included in Base, and modules included in
    Model will no longer get added to the ancestors of Base.
    So plugins which wish to be compatible with both Model and Base should
    use the :active_record_model load hook which executes *before* Base gets
    In general, ActiveRecord::Model is an advanced feature at the moment and
    probably most people will continue to inherit from ActiveRecord::Base
    for the time being.
  8. truncate debug.log on each test run

    Francesco Rodriguez authored
  9. @carlosantoniodasilva

    Update rails gemspec to use sprockets-rails 2.0.0.rc1

    carlosantoniodasilva authored
    So that we can bundle and travis can run our tests.
  10. @jonleighton

    Rename the partial_updates config to partial_writes

    jonleighton authored
    This reflects the fact that it now impact inserts as well as updates.
  11. @shime
  12. @shime
  13. @jonleighton
  14. @jonleighton

    fix test :/

    jonleighton authored
  15. @jonleighton

    The default value of a text/blob in mysql strict mode should be nil

    jonleighton authored
    In non-strict mode it is '', but if someone is in strict mode then we
    should honour the strict semantics.
    Also, this removes the need for a completely horrible hack in dirty.rb.
    Closes #7780
  16. @jonleighton

    Add Relation#find_or_create_by and friends

    jonleighton authored
    This is similar to #first_or_create, but slightly different and a nicer
    API. See the CHANGELOG/docs in the commit.
    Fixes #7853
  17. @dogweather
  18. remove assert_valid method from testing guide [ci skip]

    Francesco Rodriguez authored
  19. @tenderlove

    synchronize on param filter cache.

    tenderlove authored
    Do we actually need this cache?
  20. @tenderlove
Something went wrong with that request. Please try again.