Permalink
Commits on Oct 24, 2013
  1. @timsly

    pass app config to controller helper proxy

    After this fix application config become available when calling helper outisde of view
    
    config/application.rb
    
        #...
        config.asset_host = 'http://mycdn.com'
        #...
    
    Somewhere else
    
        ActionController::Base.helpers.asset_path('fallback.png')
        # => http://mycdn.com/assets/fallback.png
    timsly committed Oct 24, 2013
Commits on Oct 23, 2013
  1. @rafaelfranca

    Merge pull request #12619 from Veraticus/fix_utils_normalize_path

    Correct error in Utils.normalize_path that changed paths improperly
    rafaelfranca committed Oct 23, 2013
  2. @Veraticus
  3. @rafaelfranca

    Fix the install task

    rafaelfranca committed Oct 23, 2013
  4. @rafaelfranca

    Merge pull request #12617 from skv-headless/master

    [ci skip] second parameter of asset-url is deprecated
    rafaelfranca committed Oct 23, 2013
  5. @skv-headless
  6. @rafaelfranca

    Merge pull request #12612 from amatsuda/amo_validates_inclusion_of_ti…

    …me_range_error
    
    Let validates_inclusion_of accept Time and DateTime ranges
    rafaelfranca committed Oct 23, 2013
  7. @amatsuda

    Let validates_inclusion_of accept Time and DateTime ranges

    fixes 4.0.0 regression introduced in 0317b93
    amatsuda committed Oct 23, 2013
Commits on Oct 22, 2013
  1. @rafaelfranca

    Try arel master

    Conflicts:
    	Gemfile
    rafaelfranca committed Oct 22, 2013
  2. @tenderlove
  3. @tenderlove
  4. @tenderlove
  5. @tenderlove
  6. @rafaelfranca

    Fix order dependent tests

    rafaelfranca committed Oct 22, 2013
  7. @senny

    Merge pull request #12606 from robin850/apps-with-spaces

    Make the application name snake cased when it contains spaces
    senny committed Oct 22, 2013
  8. @robin850

    Make the application name snake cased when it contains spaces

    The application name is used to fill the `database.yml` and
    `session_store.rb` files ; previously, if the provided name contained
    whitespaces, it led to unexpected names in these files.
    
    Since Shellwords.escape adds backslashes to escape spaces, the app_name
    should remove them and replace any space with an underscore (just like
    periods previously).
    
    Also improve the assert_file helper to work with paths containing spaces
    using String#shellescape.
    robin850 committed Oct 22, 2013
  9. @senny
Commits on Oct 21, 2013
  1. @tenderlove

    move helper class to the top

    tenderlove committed Oct 21, 2013
  2. @tenderlove

    build the association graph functionally

    This lets us avoid the constant calls to Array#<<
    tenderlove committed Oct 21, 2013
  3. @tenderlove

    Merge branch 'master' into joindep

    * master: (23 commits)
      Escape the parentheses in the default function regexp
      Update docs on Tilt::Template in Asset Pipeline guide
      Fix loading a sql structure file on postgres when the file's path has whitespace in it
      remove trailing whitespace added with b057765 [ci skip].
      Allow unscope to work with `where.not`
      Raise an exception when model without primary key calls .find_with_ids
      Process sub-query relation's binding values
      Instrument the generation of Action Mailer messages
      Remove extra variable creation and merge.
      In Relation#empty? use #exists? instead of #count.
      [ci skip] avoid deprecation warning in sample code
      Convert Fixnum into String the port number in MySQL
      Fix some indentation on autosave association
      Make define_non_cyclic_method simpler
      Add Sass gobbling info to asset pipeline docs
      Ensure the state is clean after one failure
      Fix typo in form_helper.rb
      add a new local variable to track if digests are being stored, to ensure the cleanup works correctly
      [ci skip] Fix number of methods added by association.
      update digestor code based on review
      ...
    tenderlove committed Oct 21, 2013
  4. @tenderlove

    @base_klass is not used

    tenderlove committed Oct 21, 2013
  5. @tenderlove
  6. @tenderlove
  7. @tenderlove

    remove node duping code

    tenderlove committed Oct 21, 2013
  8. @tenderlove
  9. @tenderlove
  10. @tenderlove
  11. @rafaelfranca

    Merge pull request #12588 from jetthoughts/12586_subquery_with_unprep…

    …ared_sql
    
    Inline bind values for sub-queries generated for Relation in where
    
    Conflicts:
    	activerecord/CHANGELOG.md
    rafaelfranca committed Oct 21, 2013
  12. @rafaelfranca

    Escape the parentheses in the default function regexp

    This is causing every default value in PostreSQL database to being
    handled as default function.
    
    Fixes #12581
    rafaelfranca committed Oct 21, 2013
  13. @senny

    Merge pull request #12567 from GoBoundless/fix_postgres_structure_import

    Fix loading a sql structure file on postgres when the file's path has whitespace in it
    senny committed Oct 21, 2013
  14. @guilleiguaran

    Merge pull request #12603 from dv/fix-tilt-template-in-asset-pipeline…

    …-docs
    
    Update docs on Tilt::Template in Asset Pipeline guide
    guilleiguaran committed Oct 21, 2013
  15. @dv
  16. @kevinmook
  17. @senny
  18. @senny

    Merge pull request #12565 from stormsilver/unscope_fixes

    Allow unscope to work with `where.not`
    senny committed Oct 21, 2013