Permalink
Commits on Oct 29, 2012
  1. Bump to 3.2.9.rc1

    spastorino committed Oct 29, 2012
  2. Add 3.2.9 section in ARes CHANGELOG

    spastorino committed Oct 29, 2012
    [ci skip]
  3. Revert "Deprecate Paths::Path#children which is unused now"

    rafaelfranca committed Oct 29, 2012
    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
  4. Merge pull request #7587 from elia/fix-too-eager-loading

    rafaelfranca committed Oct 29, 2012
    Should not eager_load app/assets
  5. Merge pull request #8057 from frodsan/fix_sqlite_mutate_arg

    rafaelfranca committed Oct 29, 2012
    SQLite3Adapter#type_cast should not mutate arguments
    Conflicts:
    	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
  6. Merge pull request #8053 from henrik/update_columns_with_primary_key

    carlosantoniodasilva committed with rafaelfranca Oct 28, 2012
    Unbreak update_column/update_columns for the primary key attribute.
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/persistence.rb
    	activerecord/test/cases/persistence_test.rb
  7. Make Active Record tests pass in isolation

    rafaelfranca committed Oct 29, 2012
    Also remove the feature detecting for Ruby 1.9
  8. Fix the skip code.

    rafaelfranca committed Oct 29, 2012
    Checking for the constant doesn't work
  9. Merge pull request #7593 from veader/patch-1

    rafaelfranca committed Oct 26, 2012
    Decode attributes pulled from URI.parse
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/connection_adapters/connection_specification.rb
Commits on Oct 28, 2012
  1. Merge pull request #8048 from senny/7761_dont_render_view_without_mai…

    rafaelfranca committed Oct 28, 2012
    …l_call
    
    Do not render views when mail() isn't called. (NullMail refactoring)
    Conflicts:
    	actionmailer/CHANGELOG.md
  2. Merge pull request #8047 from arunagw/json_only_in_18

    carlosantoniodasilva committed Oct 28, 2012
    Removing JSON for other ruby
  3. Removing JSON for other ruby

    arunagw committed Oct 28, 2012
    It's only required for 1.8 and for JRuby!
    I was fixing a bug with JSON pure on 1.8.7
    and I found that we have included json for other
    1.8 > rubies also.
Commits on Oct 27, 2012
  1. Respect children paths filter settings

    elia committed Oct 27, 2012
    E.g. don't eager-load app/assets even if app/* has the eager_load flag set.
  2. Merge pull request #8038 from frodsan/fix_am_serializers_xml_dependency

    jeremy committed with rafaelfranca Oct 27, 2012
    Fix AM::Serializers::Xml dependency
Commits on Oct 24, 2012
  1. Merge pull request #8022 from GRoguelon/3-2-stable

    rafaelfranca committed Oct 24, 2012
    Adding a missing parenthesis in the doc of String#parameterize.
Commits on Oct 22, 2012
Commits on Oct 20, 2012
  1. Merge pull request #7986 from Grandrath/patch-2

    carlosantoniodasilva committed Oct 20, 2012
    Fix behavior of `rake db:structure:load` for 3.2.8
Commits on Oct 18, 2012
  1. Require ActionController::Railtie in the default middleware stack.

    rafaelfranca committed Oct 18, 2012
    This will make possible to do a frameworkless initialization since the
    the default middleware stack is self contained.
  2. Merge pull request #7989 from senny/backport_7969

    rafaelfranca committed Oct 18, 2012
    backport: active_model/validations requires necessary files to run
  3. Use `Rails.env` instead of `ENV['RAILS_ENV']`; #7951

    Grandrath committed Oct 18, 2012
    `ENV['RAILS_ENV']` is not defined unless explicitly specified on the
    command line when running `rake db:structure:load`. This patch lets
    the rake task retrieve the environment from `Rails.env` which defaults
    to "development".
  4. Merge pull request #7371 from csmuc/fix_dup_validation_errors

    spastorino committed with rafaelfranca Oct 16, 2012
    Dup'ed ActiveRecord objects may not share the errors object
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/test/cases/dup_test.rb
Commits on Oct 15, 2012
Commits on Oct 14, 2012
  1. Merge pull request #7940 from arturopie/7914-backport-to-3-2-stable

    rafaelfranca committed Oct 14, 2012
    Backport fix of issue #7914 to 3-2-stable
  2. 7914 Using a better way to get the defaults from db.

    arturopie committed Oct 14, 2012
    Changes:
    
    * According to postgreSQL documentation:
    (http://www.postgresql.org/docs/8.2/static/catalog-pg-attrdef.html)
    we should not be using 'adsrc' field because this field is unaware of
    outside changes that could affect the way that default values are
    represented. Thus, I changed the queries to use
    "pg_get_expr(adbin, adrelid)" instead of the historical "adsrc" field.
    
    * Remove parsing of character type default values for 8.1 formatting since
    Rails doesn't support postgreSQL 8.1 anymore.
    
    * Remove misleading comment unrelated to code.
  3. #7914 get default value when type uses schema name

    arturopie committed Oct 14, 2012
    PostgreSQL adapter properly parses default values when using multiple
    schemas and domains.
    
    When using domains across schemas, PostgresSQL prefixes the type of the
    default value with the name of the schema where that type (or domain) is.
    
    For example, this query:
    ```
    SELECT a.attname, d.adsrc
    FROM pg_attribute a LEFT JOIN pg_attrdef d
    ON a.attrelid = d.adrelid AND a.attnum = d.adnum
    WHERE a.attrelid = "defaults"'::regclass
    AND a.attnum > 0 AND NOT a.attisdropped
    ORDER BY a.attnum;
    ```
    
    could return something like "'<default_value>'::pg_catalog.text" or
    "(''<default_value>'::pg_catalog.text)::text" for the text columns with
    defaults.
    
    I modified the regexp used to parse this value so that it ignores
    anything between ':: and \b(?:character varying|bpchar|text), and it
    allows to have optional parens like in the above second example.
Commits on Oct 12, 2012
  1. Merge pull request #7925 from ernie/3-2-fix-collection-associations-w…

    rafaelfranca committed Oct 12, 2012
    …ith-select
    
    Fix has_many assocation w/select load after create
  2. Fix has_many assocation w/select load after create

    ernie committed Oct 5, 2012
    If you create a new record via a collection association proxy that has
    not loaded its target, and which selects additional attributes through
    the association, then when the proxy loads its target, it will
    inadvertently trigger a deprecation notice during attribute writing when
    CollectionAssociation#merge_target_lists attempts to do its thing, since
    the newly loaded records will possess attributes the created record does
    not.
Commits on Oct 11, 2012
  1. Merge pull request #7905 from jfirebaugh/eager_autoload_3-2

    rafaelfranca committed Oct 11, 2012
    Backport eager autoloading fixes
Commits on Oct 10, 2012
  1. Eager autoload Preloader classes

    jfirebaugh committed Oct 10, 2012
    Without eager autoloading, these would be autoloaded
    only when #preloader_for is called, which is too late
    in threaded applications.
Commits on Oct 7, 2012
  1. Backport 1a70499

    jeremy committed Oct 7, 2012
    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