Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
branch: master
Commits on Jun 29, 2014
  1. @sgrif

    Merge pull request #15963 from roryokane/getting-started-guide-fix-gr…

    sgrif authored
    …ammar
    
    Add punctuation and fix capitalization in Getting Started guide
  2. @sgrif

    Merge pull request #15964 from JuanitoFatas/doc/patch-01

    sgrif authored
    [ci skip] Fix router option reference in 4.2 release notes.
  3. @JuanitoFatas
  4. @roryokane

    Add punctuation and fix capitalization in Getting Started guide

    roryokane authored
    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. @senny

    Merge pull request #15957 from seuros/duplicate

    senny authored
    [Postgresql tests] remove duplicate helper
  2. @vijaydev
  3. @seuros
  4. @guilleiguaran

    Merge pull request #15955 from JuanitoFatas/levenshtein-guide

    guilleiguaran authored
    Update the levenshtein distance method in guides.
  5. @sgrif

    Merge pull request #15954 from roryokane/getting-started-guide-add-pe…

    sgrif authored
    …riod
    
    Add missing period in Getting Started guide
  6. @JuanitoFatas
  7. @roryokane

    Add missing period in Getting Started guide

    roryokane authored
    Within section 5.10 Adding Some Validation
  8. @chancancode

    Merge pull request #15951 from pcreux/fix-mysql-test-fk

    chancancode authored
    MySQL doesn't work with foreign keys
  9. @pcreux

    MySQL doesn't work with foreign keys

    pcreux authored
    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. @chancancode

    Merge pull request #15949 from pcreux/fix-add-foreign-key-in-test

    chancancode authored
    Fix test with `add_foreign_key` DSL
  2. @pcreux
  3. @rafaelfranca

    Merge pull request #15934 from seuros/rename

    rafaelfranca authored
    rename primary key sequence only if it exists
  4. @rafaelfranca

    Merge pull request #15943 from wagenet/cache-instrumentation

    rafaelfranca authored
    Always instrument ActiveSupport::Cache
  5. @rafaelfranca

    Merge pull request #15933 from rafael/master

    rafaelfranca authored
    Add always permitted parameters as a configurable option.
    
    [Rafael Mendonça França + Gary S. Weaver]
  6. @wagenet

    Always instrument ActiveSupport::Cache

    wagenet authored
    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.
  7. @rafaelfranca

    Merge pull request #15946 from jamesprior/patch-1

    rafaelfranca authored
    Update documentation for run_callbacks
  8. @rafaelfranca
  9. @jamesprior

    Update documentation for run_callbacks

    jamesprior authored
    In some cases run_callbacks will return nil.  I'm attempting to update the documentation for the method to clarify.
  10. @rafael

    Improvements per code review.

    rafael authored
    * General style fixes.
    * Add changes to configuration guide.
    * Add missing tests.
  11. @rafaelfranca
  12. @seuros
  13. @rafaelfranca
  14. @sgrif
  15. @sgrif

    Note that `_will_change!` is no longer needed for AR instances

    sgrif authored
    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.
  16. @rafaelfranca
  17. @rafaelfranca

    Merge pull request #12450 from iantropov/master

    rafaelfranca authored
    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
  18. @rafaelfranca

    Merge pull request #15788 from sgrif/sg-mutable-strings

    rafaelfranca authored
    Detect in-place modifications on Strings
  19. @rafaelfranca

    Merge pull request #8639 from bogdan/valid-with-bang

    rafaelfranca authored
    Add AR::Base#valid! method
  20. @rafaelfranca

    Merge pull request #15940 from DNNX/databases-rake-refactoring

    rafaelfranca authored
    databases.rake refactoring
  21. @rafaelfranca

    Merge pull request #15938 from sgrif/sg-stop-instance-execing

    rafaelfranca authored
    Stop using instance exec for type decorators
  22. @sgrif

    Stop using instance exec for type decorators

    Sean Griffin & Sean Doyle authored sgrif committed
    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`.
Something went wrong with that request. Please try again.