Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
branch: master
Commits on Aug 13, 2013
  1. @josevalim

    Merge pull request #11861 from sadjow/improve-doc-translations-active…

    josevalim authored
    …-record-models
    
    Add plural form example for AR I18n section [ci skip]
  2. @sadjow
Commits on Aug 12, 2013
  1. @fxn

    renames the :abort deprecation behaviour to :raise

    fxn authored
    That is a better name, thanks @jeremy.
  2. @fxn

    fixes typo in CHANGELOG

    fxn authored
  3. @fxn

    defines a new :abort deprecation behaviour that raises

    fxn authored
    See the CHANGELONG message in the patch for further details.
  4. @steveklabnik

    Merge pull request #11856 from dchelimsky/refactor-duration-inspect

    steveklabnik authored
    Refactor Duration#inspect
  5. @dchelimsky

    Refactor Duration#inspect

    dchelimsky authored
    In preparing rails#11855, it took me a
    minute to understand what was going on due to naming (parts refers first
    to an attr_accessor, then to a local, and is then reassigned), but also
    because the iterator conditionally builds nulls and then removes them.
    
    I refactored to something much more functional-looking that I find
    easier to read, but you may or may not. If you do, great! Enjoy! If
    not, oh well, I tried. Can't win 'em all :)
    
    Rationale:
    
    * no name conflict between local var and attr_accessor
    * no reassignment of local var
    * algorithm spelled out in steps
    * unused items in initial list filtered out early
    * empty-list case handled early instead of reassigning local var
    * no duplication of formatting strings ("0 seconds")
    
    Benchmarks (after PR #11855 merged):
    
    10000.times do
      1.second.inspect
    end
    
    original #inspect
       0.350000   0.000000   0.350000 (  0.354709)
       0.330000   0.000000   0.330000 (  0.331885)
       0.330000   0.000000   0.330000 (  0.334441)
    
    refactored #inspect
       0.340000   0.000000   0.340000 (  0.340080)
       0.340000   0.010000   0.350000 (  0.345069)
       0.330000   0.000000   0.330000 (  0.335873)
    
    10000.times do
      (1.day + 1.month + 2.minutes + 1.day).inspect
    end
    
    original #inspect
       0.400000   0.000000   0.400000 (  0.403027)
       0.400000   0.000000   0.400000 (  0.403781)
       0.390000   0.000000   0.390000 (  0.387596)
    
    refactored #inspect
       0.400000   0.010000   0.410000 (  0.399792)
       0.400000   0.000000   0.400000 (  0.404145)
       0.400000   0.000000   0.400000 (  0.403820)
  6. @rafaelfranca

    Merge pull request #11855 from dchelimsky/chop-is-faster

    rafaelfranca authored
    Use chop instead of singularize in Duration#inspect
  7. @dchelimsky

    Use chop instead of singularize in Duration#inspect

    dchelimsky authored
    Even though singularize tells a better story, chop is more than 50%
    faster and is all that is necessary in the case of Duration#inspect, in
    which all of the candidates for chopping appear in the same method and
    are all singularized by removing the final 's'.
    
    Benchmarks:
    
    10000.times do
      1.second.inspect
    end
    
    original #inspect
       0.740000   0.000000   0.740000 (  0.739065)
       0.740000   0.000000   0.740000 (  0.741458)
       0.740000   0.010000   0.750000 (  0.744011)
    
    refactored #inspect
       0.330000   0.000000   0.330000 (  0.333390)
       0.330000   0.000000   0.330000 (  0.331013)
       0.320000   0.000000   0.320000 (  0.330103)
    
    10000.times do
      (1.day + 1.month + 2.minutes + 1.day).inspect
    end
    
    original #inspect
       0.790000   0.000000   0.790000 (  0.794624)
       0.770000   0.000000   0.770000 (  0.774577)
       0.770000   0.010000   0.780000 (  0.771295)
    
    refactored #inspect
       0.390000   0.000000   0.390000 (  0.392921)
       0.400000   0.000000   0.400000 (  0.397412)
       0.370000   0.000000   0.370000 (  0.379660)
  8. @steveklabnik

    Merge pull request #11823 from fomede/add-jquery-ujs-reference-link

    steveklabnik authored
    Add events reference link to the text about jquery-ujs [ci skip]
  9. @sadjow
  10. @steveklabnik

    Merge pull request #11852 from prijutme4ty/guide_addition

    steveklabnik authored
    Added comment to a guide about necessity of `:dependent` option for asso... [ci skip]
  11. @prijutme4ty

    Added comment to a guide about necessity of `:dependent` option for a…

    prijutme4ty authored
    …ssociations with NOT NULL constraint
  12. @steveklabnik

    Merge pull request #11838 from vipulnsward/drop_extra_var

    steveklabnik authored
    drop extra variable
  13. @drogus
  14. @drogus

    Merge pull request #11525 from Empact/nested_attributes_with_callback…

    drogus authored
    …s_bug
    
    Improve #5476 - "Nested attributes with callbacks bugfix" to use add_to_target and clearer tests
  15. @Empact

    Refactor NestedAttributesWithCallbacksTest for clarity

    Empact authored
    1) Use `assert` and `refute` where possible.
    2) Separately include the setup, subject, and assertions in each test - don't hide the tested call in an assertion method.
    3) Name things based on their role rather than incidental facts about them - e.g. `@bird[1]` -> `bird_to_destroy`. `bird2_deletion_attributes` -> `destroy_bird_attributes`.
    4) Use more succinct naming where possible - e.g. `birds_with_callback` -> `birds_with_add`, `@pirate_with_two_birds` -> `@pirate`
  16. @Empact

    Restore the use of `#add_to_target` for nested attribute updates on e…

    Empact authored
    …xisting records, and don't bother updating the association if the update is going to be rejected anyway.
    
    This requires adding a `skip_callbacks` argument to `#add_to_target`
    so that we don't call the callbacks multiple times in this case,
    which is functionally an application of existing association data,
    rather than an addition of a new record to the association.
  17. @joergschray @Empact

    Fix interactions between :before_add callbacks and nested attributes …

    joergschray authored Empact committed
    …assignment
    
    Issue #1: :before_add callback is called when nested attributes assignment assigns to existing record if the association is not yet loaded
    Issue #2: Nested Attributes assignment does not affect the record in the association target when callback triggers loading of the association
  18. @guilleiguaran

    Merge pull request #11846 from gaurish/jdbc-upgrade

    guilleiguaran authored
    Upgrade ActiveRecord-JDBC-Adapter to v1.3 for better compatibility with ActiveRecord 4
  19. @vipulnsward

    drop extra variable

    vipulnsward authored
  20. @gaurish

    Upgrade ActiveRecord-JDBC-Adapter to master branch

    gaurish authored
    Switch to master branch which provides Version 1.3.x of AR-JDBC adapter.
    It strives to provide ActiveRecord 4.x compatibility (as well as still supporting 2.3 and 3.x) from a single code base. It's a recommended update for all AR-JDBC 1.2.x users.
Commits on Aug 11, 2013
  1. chmod -x

    authored
  2. @tenderlove

    only reconnect if there was already an active connection

    tenderlove authored
    If you're using an in-memory database for the test database,
    reconnecting will lose all information that schema:load did for us.
Commits on Aug 10, 2013
  1. @rafaelfranca

    Merge pull request #11826 from etipton/enable_extensions_revertible

    rafaelfranca authored
    Make 'enable_extension' revertible
  2. @rafaelfranca

    Merge pull request #11799 from njakobsen/fix-controller-filter-callbacks

    rafaelfranca authored
    Execute conditional procs on controller filters only for current action
  3. @njakobsen

    Execute conditional procs on controller filters only for current action.

    njakobsen authored
    :only and :except options for controller filters are now added before
    :if and :unless. This prevents running :if and :unless procs when not
    on the specified. Closes #11786.
  4. @josevalim

    Merge pull request #11830 from cr0t/master

    josevalim authored
    Fixed small mistake in the engines docs
  5. @cr0t
  6. @etipton

    Make 'enable_extension' revertible

    etipton authored
    If 'enable_extension' is used in a migration's 'change' method, use
    'disable_extension' on down migration (and vice-versa).
Commits on Aug 9, 2013
  1. @rafaelfranca

    Merge pull request #11820 from vipulnsward/remove_s2b

    rafaelfranca authored
    Remove redundant `string_to_binary` from type-casting
  2. @vipulnsward
  3. @senny

    Merge pull request #11815 from yaotti/patch-1

    senny authored
    Fix a broken link [ci skip]
  4. @yaotti

    Fix a broken link

    yaotti authored
Commits on Aug 8, 2013
  1. @carlosantoniodasilva

    Merge pull request #11806 from jetthoughts/change_model_term_by_simpl…

    carlosantoniodasilva authored
    …e_word
    
    Remove using of suffix with term. [ci skip]
Something went wrong with that request. Please try again.