Switch branches/tags
Commits on Sep 2, 2012
  1. Merge pull request #7495 from steveklabnik/issue_7478

    tenderlove committed Sep 2, 2012
    Properly reset the session on reset_session
Commits on Sep 1, 2012
  1. Force reloading of the session after destroy

    alup authored and steveklabnik committed Sep 1, 2012
    Use load_for_write! to ensure a refresh of the session object.
    This way the new session_id and the empty data will be stored properly.
    E.g. in the case of the session cookie store this means that a new
    digest will be returned to the user.
  2. copy edits [ci skip]

    vijaydev committed Sep 1, 2012
  3. require bundle in the app generator

    fxn committed Sep 1, 2012
    The app generator is not generally run under bundler, but the Bundler
    constant is used here.
    In particular you cannot create --dev apps without this.
  4. Revert "added .DS_Store to .gitignore"

    vijaydev committed Sep 1, 2012
    This reverts commit fc80ebb.
    Such changes aren't allowed in docrails.
  5. Remove unneeded require

    drogus committed Sep 1, 2012
  6. Merge pull request #7494 from route/actionview_decoupling_issue

    drogus committed Sep 1, 2012
    ActionView decoupling and sprockets-rails tests fail
  7. Sprockets-rails tests fail

    route committed Sep 1, 2012
    Method invalid_asset_host! was delegated to controller but sprockets
    compile assets in their own scope without controller. And if we set asset_host
    with second parameter it should raise error through invalid_asset_host!.
    But since controller is nil it cannot be reached.
Commits on Aug 31, 2012
  1. Require bundler 1.2

    drogus committed Aug 31, 2012
  2. Don't use Gemfile in test application in railties

    drogus committed May 16, 2012
    Option to run `bundle install` after generating new appplication was
    added recently to rails. Since introduction, it contained a subtle bug
    that caused it to use `Gemfile` from current directory (if it exists)
    rather than from generated directory. This also accidentaly caused
    railties tests to work without any problems - after generating test app
    it just used `Gemfile` from the repository, rather than the one in
    generated app. After fixing the bug mentioned above, this of course
    broke. The easiest way to bypass that is to not generate a `Gemfile` for
    test application - with such setup Bundler will just use first available
    `Gemfile` in one of the parent directories.
  3. Revert "Revert changes related to `bundle install` fixes in `rails new`"

    drogus committed Jun 25, 2012
    The cause of the previous revert was bug in bundler that made it hard to
    make railties test work. Fix for bundler was recently pushed to github,
    so now we can safely get back to the original commit.
    This reverts commit 0f5cc34.
  4. Fix comment about Session.

    steveklabnik committed Aug 31, 2012
    SessionHash isn't a thing, and tenses are wrong.
  5. Fix my bio

    lifo committed Aug 31, 2012
  6. Avoid #fetch for non-nil values.

    jonleighton committed Aug 31, 2012
    This is purely a performance optimisation.
  7. Key the attributes hash with symbols

    jonleighton committed Aug 31, 2012
    This is a performance/GC optimisation.
    In theory, this could be optimised by the implementation (last time I
    checked, this would have no effect on JRuby). But in practise, this make
    attribute access faster.
  8. One hash is enough

    jonleighton committed Aug 31, 2012
    We don't need separate @class_to_pool and @connection_pool hashes.
  9. Make connection pool retrieval faster

    jonleighton committed Aug 31, 2012
    * Loop rather than recurse in retrieve_connection_pool
    * Key the hash by class rather than class name. This avoids creating
      unnecessary strings.
  10. Revert "Merge pull request #7452 from arunagw/memcached_dalli"

    jonleighton committed Aug 31, 2012
    This reverts commit 7256cb5, reversing
    changes made to 6ebe22c.
    Reason: A test was failing.
  11. Revert "Add missing require"

    jonleighton committed Aug 31, 2012
    This reverts commit e4b33b0.
    #7452 (comment)
  12. Merge pull request #111 from 5v3n/master

    5v3n committed Aug 31, 2012
    Fixed little mistake in the docs
  13. Merge pull request #7479 from eriko/master

    fxn committed Aug 31, 2012
    the example for contraint( :ip => XXXX) has an invalid regex
  14. In example about params naming conventions use params[:person] [ci skip]

    xoen committed Aug 31, 2012
    The example is about a Person model, say that "params[:model] would usually be a
    hash of all the attributes for the person to create" could be confusing.
    I changed to params[:person] since the example is about a Person creation.
  15. Merge pull request #106 from neilstockbridge/master

    jeffshantz committed Aug 31, 2012
    Added a bullet for :enable_starttls_auto in the smtp_settings table
Commits on Aug 30, 2012
  1. Instrumentation requires RackDelegation

    josevalim committed Aug 30, 2012
    Since it uses request and response methods
  2. in section 4.1 acts_as_yaffle_test was incorrectly failing due to ass…

    RudyOnRails committed Aug 30, 2012
    …ertion incorrectly using symbol instead of string