Permalink
Switch branches/tags
Commits on Jun 29, 2014
  1. Merge pull request #15963 from roryokane/getting-started-guide-fix-gr…

    sgrif committed Jun 29, 2014
    …ammar
    
    Add punctuation and fix capitalization in Getting Started guide
  2. Merge pull request #15964 from JuanitoFatas/doc/patch-01

    sgrif committed Jun 29, 2014
    [ci skip] Fix router option reference in 4.2 release notes.
  3. Add punctuation and fix capitalization in Getting Started guide

    roryokane committed Jun 29, 2014
    Fix more small grammar mistakes in the [Getting Started guide](http://edgeguides.rubyonrails.org/getting_started.html#security), in sections 9 and 10.
    
    Specifically, within sections 9.1 “Basic Authentication”, 9.2 “Other Security Considerations”, and 10 “What's Next?”.
    
    “Rails Guides” is generally capitalized on the site, including on the linked page and in the title of the site, so I capitalized it.
    
    “The” is not part of the name of the Ruby on Rails Security Guide – “The” is not in the title on that page.
    
    And I added a missing period and a missing colon at the ends of two sentences.
Commits on Jun 28, 2014
  1. Merge pull request #15957 from seuros/duplicate

    senny committed Jun 28, 2014
    [Postgresql tests] remove duplicate helper
  2. Merge pull request #15955 from JuanitoFatas/levenshtein-guide

    guilleiguaran committed Jun 28, 2014
    Update the levenshtein distance method in guides.
  3. Merge pull request #15954 from roryokane/getting-started-guide-add-pe…

    sgrif committed Jun 28, 2014
    …riod
    
    Add missing period in Getting Started guide
  4. Add missing period in Getting Started guide

    roryokane committed Jun 28, 2014
    Within section 5.10 Adding Some Validation
  5. Merge pull request #15951 from pcreux/fix-mysql-test-fk

    chancancode committed Jun 28, 2014
    MySQL doesn't work with foreign keys
  6. MySQL doesn't work with foreign keys

    pcreux committed Jun 28, 2014
    This was previously fixed in e84799d but broken in 3f596f8. This commit
    reintroduced the conditional that prevents the foreign keys from being
    added to MySQL databases.
Commits on Jun 27, 2014
  1. Merge pull request #15949 from pcreux/fix-add-foreign-key-in-test

    chancancode committed Jun 27, 2014
    Fix test with `add_foreign_key` DSL
  2. Merge pull request #15934 from seuros/rename

    rafaelfranca committed Jun 27, 2014
    rename primary key sequence only if it exists
  3. Merge pull request #15943 from wagenet/cache-instrumentation

    rafaelfranca committed Jun 27, 2014
    Always instrument ActiveSupport::Cache
  4. Merge pull request #15933 from rafael/master

    rafaelfranca committed Jun 27, 2014
    Add always permitted parameters as a configurable option.
    
    [Rafael Mendonça França + Gary S. Weaver]
  5. Always instrument ActiveSupport::Cache

    wagenet committed Jun 27, 2014
    The current approach is broken because it uses a thread local value
    which means on multi-threaded environments it has to be turned on
    per thread. Secondly, ActiveSupport::Notifications does not
    instrument items when there are not subscribers so this flag is
    unnecessary.
  6. Merge pull request #15946 from jamesprior/patch-1

    rafaelfranca committed Jun 27, 2014
    Update documentation for run_callbacks
  7. Update documentation for run_callbacks

    jamesprior committed Jun 27, 2014
    In some cases run_callbacks will return nil.  I'm attempting to update the documentation for the method to clarify.
  8. Improvements per code review.

    rafael committed Jun 27, 2014
    * General style fixes.
    * Add changes to configuration guide.
    * Add missing tests.
  9. Note that `_will_change!` is no longer needed for AR instances

    sgrif committed Jun 27, 2014
    Leave the note for `ActiveModel`, since it can't yet detect mutations
    (hopefully we can change this in time for 4.2). However, we now detect
    mutations on all supported types in `ActiveRecord`, so we can note that
    `_will_change!` is no longer needed there.
  10. Merge pull request #12450 from iantropov/master

    rafaelfranca committed Jun 27, 2014
    Fix bug, when ':dependent => :destroy' violates foreign key constraints
    
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/associations/builder/association.rb
    	activerecord/lib/active_record/associations/builder/has_one.rb
  11. Merge pull request #15788 from sgrif/sg-mutable-strings

    rafaelfranca committed Jun 27, 2014
    Detect in-place modifications on Strings
  12. Merge pull request #8639 from bogdan/valid-with-bang

    rafaelfranca committed Jun 27, 2014
    Add AR::Base#valid! method
  13. Merge pull request #15940 from DNNX/databases-rake-refactoring

    rafaelfranca committed Jun 27, 2014
    databases.rake refactoring
  14. Merge pull request #15938 from sgrif/sg-stop-instance-execing

    rafaelfranca committed Jun 27, 2014
    Stop using instance exec for type decorators
  15. Stop using instance exec for type decorators

    Sean Griffin & Sean Doyle authored and sgrif committed Jun 27, 2014
    We are moving this behavior out to an object that we would like to keep
    separated from `ActiveRecord::Base`, which means not passing the class
    object to it. As such, we need to stop using `instance_exec`, and
    instead close over the subclass on global type decorators that are
    applied in `Base`.