Permalink
Commits on Oct 5, 2011
  1. copy editing

    vijaydev committed Oct 5, 2011
  2. s/help/helper/

    MMSequeira committed Oct 5, 2011
  3. Merge pull request #3229 from amatsuda/string_prepend

    ruby193: String#prepend
    josevalim committed Oct 5, 2011
  4. Fix the lame config.action_controller.present? check scattered throug…

    …hout assets_path.
    
    Conflicts:
    
    	actionpack/test/template/sprockets_helper_test.rb
    josevalim committed Oct 5, 2011
  5. Raise error on unknown primary key.

    If we don't have a primary key when we ask for it, it's better to fail
    fast. Fixes GH #2307.
    jonleighton committed Oct 5, 2011
Commits on Oct 4, 2011
  1. Encapsulate common rake invocation logic in a method.

    Signed-off-by: José Valim <jose.valim@gmail.com>
    josevalim committed Oct 4, 2011
  2. added comment about why nondigest assets requires a reinvocation

    Signed-off-by: José Valim <jose.valim@gmail.com>
    mjtko committed with josevalim Oct 4, 2011
  3. only reinvoke if necessary

    Signed-off-by: José Valim <jose.valim@gmail.com>
    mjtko committed with josevalim Oct 4, 2011
  4. only execute the nondigest task if needed

    Signed-off-by: José Valim <jose.valim@gmail.com>
    mjtko committed with josevalim Oct 4, 2011
  5. don't munge the environment, let rake do that for us

    Signed-off-by: José Valim <jose.valim@gmail.com>
    mjtko committed with josevalim Oct 4, 2011
  6. assets compilation task refactoring

    Signed-off-by: José Valim <jose.valim@gmail.com>
    mjtko committed with josevalim Oct 4, 2011
  7. [engines guide] initial layout

    radar committed Oct 4, 2011
  8. Fix failing test added in previous commit.

    Signed-off-by: José Valim <jose.valim@gmail.com>
    josevalim committed Oct 4, 2011
  9. correct path used in "digested assets are not mistakenly removed" test

    Signed-off-by: José Valim <jose.valim@gmail.com>
    mjtko committed with josevalim Oct 4, 2011
  10. add failing test: "digested assets are removed from configured path"

    Signed-off-by: José Valim <jose.valim@gmail.com>
    mjtko committed with josevalim Oct 4, 2011
  11. Bump sprockets to 2.0.2

    spastorino committed Oct 4, 2011
  12. Merge pull request #3212 from ayrton/master

    incorrect to_formatted_s example
    spastorino committed Oct 4, 2011
  13. Merge pull request #3209 from ksob/subdomain_false_strips_subdomains

    :subdomain => false will remove all subdomains now. Closes #2025
    josevalim committed Oct 4, 2011
  14. Changing rake db:schema:dump to run :environment as well as :load_con…

    …fig, as running :load_config alone will lead to the dumper being run without including extensions such as those included in foreigner and spatial_adapter.
    
    This reverses a change made here: 5df72a2#L0L324
    
    I'm assuming here that :load_config needs to be invoked separately from :environment, as it is elsewhere in the file for db operations, if not the alternative is to go back to "task :dump => :environment do".
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
    Empact committed with josevalim Oct 4, 2011
  15. :subdomain can now be specified with a value of false in url_for, all…

    …owing for subdomain(s) removal from the host during link generation. Closes #2025
    ksob committed Oct 4, 2011