Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Nov 1, 2012
  1. @spastorino

    Bump to 3.2.9.rc2

    spastorino authored
Commits on Oct 29, 2012
  1. @rafaelfranca

    Merge pull request #8009 from graceliu/3-2-fix_database_url_support

    rafaelfranca authored
    fixed support for DATABASE_URL for rake db tasks
  2. @graceliu @rafaelfranca

    fixed support for DATABASE_URL for rake db tasks

    graceliu authored rafaelfranca committed
    Backport for #7521
    
    - added tests to confirm establish_connection uses DATABASE_URL and
      Rails.env correctly even when no arguments are passed in.
    - updated rake db tasks to support DATABASE_URL, and added tests to
      confirm correct behavior for these rake tasks.  (Removed
      establish_connection call from some tasks since in those cases
      the :environment task already made sure the function would be called)
    - updated Resolver so that when it resolves the database url, it
      removes hash values with empty strings from the config spec (e.g.
      to support connection to postgresql when no username is specified).
    - updated ResolverTest to use current_adapter? to check the type of
      the current adapter.
  3. @spastorino

    Bump to 3.2.9.rc1

    spastorino authored
  4. @rafaelfranca

    Revert "Deprecate Paths::Path#children which is unused now"

    rafaelfranca authored
    This reverts commit f7de647.
    
    We can't deprecate things in stable branches. I didn't not realized that
    the pull request was for 3-2-stable
  5. @elia
Commits on Oct 27, 2012
  1. @elia

    Respect children paths filter settings

    elia authored
    E.g. don't eager-load app/assets even if app/* has the eager_load flag set.
  2. @rafaelfranca @elia

    Add test case to assets eager load

    rafaelfranca authored elia committed
Commits on Oct 18, 2012
  1. @rafaelfranca

    Require ActionController::Railtie in the default middleware stack.

    rafaelfranca authored
    This will make possible to do a frameworkless initialization since the
    the default middleware stack is self contained.
Commits on Oct 7, 2012
  1. @jeremy

    Backport 1a70499

    jeremy authored
    Tag the blank log line between dev requests so it's easier to filter out entire requests with grep -v without leaving a stray newline behind. Example:
    
      # Tag asset requests so it's easy to filter them from dev logs
      config.log_tags = [
        -> request { :assets if request.path.starts_with?(config.assets.prefix) },
        -> request { request.uuid }
      ]
    
      # Watch the logs, ignoring asset requests
      $ tail -100f log/development.log | grep -v assets
Commits on Oct 3, 2012
  1. @lihanli
Commits on Oct 1, 2012
  1. @rafaelfranca

    Merge pull request #6450 from iHiD/resource_generator_routes_master

    rafaelfranca authored
    Master branch: Fixed generated whitespace in routes when using namespaced resource.
    
    Merge pull request #7811 from iHiD/resource_generator_routes_master
    
    Fix the build (Broken scaffold routes test)
Commits on Sep 30, 2012
  1. @jeremy

    Asset manifest includes aliases for foo.js -> foo/index.js and vice v…

    jeremy authored
    …ersa. Bump Sprockets requirements from 2.1+ to 2.2+ and let it answer "should we compile this asset?" for us.
  2. @steveklabnik
Commits on Sep 28, 2012
  1. @jeremy

    Hashrocket for 1.8 support

    jeremy authored
Commits on Sep 27, 2012
  1. @jeremy

    Tune up Rails::Rack::Logger. Only put space between requests in devel…

    jeremy authored
    …opment logs.
    
    Conflicts:
    	railties/test/application/rack/logger_test.rb
  2. @jeremy
  3. @jeremy
Commits on Sep 20, 2012
  1. @rafaelfranca
Commits on Sep 18, 2012
  1. @steveklabnik
Commits on Aug 28, 2012
  1. @fxn

    CHANGELOGs are now per branch

    fxn authored
    Check 810a50d for the rationale.
Commits on Aug 24, 2012
  1. @arunagw

    We need to have 1-0-stable for joureny gem in edge

    arunagw authored
    Problem : Edge rails can't bundle
    Fixes #7437
Commits on Aug 11, 2012
  1. @drogus
Commits on Aug 9, 2012
  1. @spastorino
  2. @spastorino

    Bump to 3.2.8

    spastorino authored
  3. @spastorino
Commits on Aug 7, 2012
  1. @josh

    Fix invalid asset compile assertions

    josh authored
    Logical paths to compile should require an extension
  2. @tenderlove
Commits on Aug 3, 2012
  1. @spastorino

    Bump to 3.2.8.rc2

    spastorino authored
Commits on Aug 2, 2012
  1. @spastorino

    html_escape should escape single quotes

    spastorino authored
    https://www.owasp.org/index.php/XSS_%28Cross_Site_Scripting%29_Prevention_Cheat_Sheet#RULE_.231_-_HTML_Escape_Before_Inserting_Untrusted_Data_into_HTML_Element_Content
    Closes #7215
    
    Conflicts:
    	actionpack/test/template/erb_util_test.rb
    	actionpack/test/template/form_tag_helper_test.rb
    	actionpack/test/template/text_helper_test.rb
    	actionpack/test/template/url_helper_test.rb
    	activesupport/lib/active_support/core_ext/string/output_safety.rb
  2. @spastorino @rafaelfranca

    html_escape should escape single quotes

    spastorino authored rafaelfranca committed
    https://www.owasp.org/index.php/XSS_%28Cross_Site_Scripting%29_Prevention_Cheat_Sheet#RULE_.231_-_HTML_Escape_Before_Inserting_Untrusted_Data_into_HTML_Element_Content
    Closes #7215
    
    Conflicts:
    	actionpack/test/template/erb_util_test.rb
    	actionpack/test/template/form_tag_helper_test.rb
    	actionpack/test/template/text_helper_test.rb
    	actionpack/test/template/url_helper_test.rb
    	activesupport/lib/active_support/core_ext/string/output_safety.rb
  3. @rafaelfranca @spastorino

    Use `:data => { :confirm => "Text" }` syntax instead of `:confirm` at

    rafaelfranca authored spastorino committed
    the ERB scaffold generator.
    
    We are trying to teach the data attributes as best practices and
    `:confirm` will be deprecated in 4.0.
  4. @rafaelfranca

    Use `:data => { :confirm => "Text" }` syntax instead of `:confirm` at

    rafaelfranca authored
    the ERB scaffold generator.
    
    We are trying to teach the data attributes as best practices and
    `:confirm` will be deprecated in 4.0.
Commits on Aug 1, 2012
  1. @spastorino

    Bump to 3.2.8.rc1

    spastorino authored
  2. @rafaelfranca

    Revert "Deprecate `:confirm` in favor of `:data => { :confirm => 'Tex…

    rafaelfranca authored
    …t' }` option"
    
    Revert "Deprecate `:disable_with` in favor of `'data-disable-with'` option for `button_to` and `submit_tag` helpers."
    
    This reverts commit fc092a9.
    This reverts commit e9051e2.
    This reverts commit d47d6e7.
    This reverts commit 21141e7.
Something went wrong with that request. Please try again.