Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master

Oct 24, 2013

  1. Tima Maslyuchenko

    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 authored

Oct 23, 2013

  1. Rafael Mendonça França

    Merge pull request #12619 from Veraticus/fix_utils_normalize_path

    Correct error in Utils.normalize_path that changed paths improperly
    rafaelfranca authored
  2. Josh Symonds

    Correct error in Utils.normalize_path that changed paths improperly

    Veraticus authored
  3. Rafael Mendonça França

    Fix the install task

    rafaelfranca authored
  4. Rafael Mendonça França

    Merge pull request #12617 from skv-headless/master

    [ci skip] second parameter of asset-url is deprecated
    rafaelfranca authored
  5. Evgeniy Sokovikov

    [ci skip] second parameter of asset-url is depricated

    skv-headless authored
  6. Rafael Mendonça França

    Merge pull request #12612 from amatsuda/amo_validates_inclusion_of_ti…

    …me_range_error
    
    Let validates_inclusion_of accept Time and DateTime ranges
    rafaelfranca authored
  7. Akira Matsuda

    Let validates_inclusion_of accept Time and DateTime ranges

    fixes 4.0.0 regression introduced in 0317b93
    amatsuda authored

Oct 22, 2013

  1. Rafael Mendonça França

    Try arel master

    Conflicts:
    	Gemfile
    rafaelfranca authored
  2. Aaron Patterson

    this should be private, no other instances of Root should call it

    tenderlove authored
  3. Aaron Patterson

    do not search through the keys array twice

    tenderlove authored
  4. Aaron Patterson

    use the provided block to filter lists

    tenderlove authored
  5. Aaron Patterson

    stop using `send` so that method privacy is respected and we get a small

    perf increase
    tenderlove authored
  6. Rafael Mendonça França

    Fix order dependent tests

    rafaelfranca authored
  7. Yves Senn

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

    Make the application name snake cased when it contains spaces
    senny authored
  8. Robin Dupret

    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 authored
  9. Yves Senn

    minor Active Record CHANGELOG cleanup. [ci skip].

    senny authored

Oct 21, 2013

  1. Aaron Patterson

    move helper class to the top

    tenderlove authored
  2. Aaron Patterson

    build the association graph functionally

    This lets us avoid the constant calls to Array#<<
    tenderlove authored
  3. Aaron Patterson

    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 authored
  4. Aaron Patterson

    @base_klass is not used

    tenderlove authored
  5. Aaron Patterson

    join_type isn't used on the node anymore

    tenderlove authored
  6. Aaron Patterson

    make joins generation method look similar

    tenderlove authored
  7. Aaron Patterson

    remove node duping code

    tenderlove authored
  8. Aaron Patterson

    refactor outer join generation

    tenderlove authored
  9. Aaron Patterson

    add outer joins for matching nodes

    tenderlove authored
  10. Aaron Patterson

    construct joins by walking the outer join tree

    tenderlove authored
  11. Rafael Mendonça França

    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 authored
  12. Rafael Mendonça França

    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 authored
  13. Yves Senn

    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 authored
  14. Guillermo Iguaran

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

    …-docs
    
    Update docs on Tilt::Template in Asset Pipeline guide
    guilleiguaran authored
  15. David Verhasselt

    Update docs on Tilt::Template in Asset Pipeline guide

    dv authored
  16. kevinmook

    Fix loading a sql structure file on postgres when the file's path has…

    … whitespace in it
    kevinmook authored
  17. Yves Senn

    remove trailing whitespace added with b057765 [ci skip].

    senny authored
  18. Yves Senn

    Merge pull request #12565 from stormsilver/unscope_fixes

    Allow unscope to work with `where.not`
    senny authored
Something went wrong with that request. Please try again.