Skip to content
Commits on Oct 22, 2012
  1. @tenderlove
Commits on Oct 20, 2012
  1. @carlosantoniodasilva

    Merge pull request #7986 from Grandrath/patch-2

    Fix behavior of `rake db:structure:load` for 3.2.8
    carlosantoniodasilva committed Oct 20, 2012
Commits on Oct 18, 2012
  1. @rafaelfranca

    Require ActionController::Railtie in the default middleware stack.

    This will make possible to do a frameworkless initialization since the
    the default middleware stack is self contained.
    rafaelfranca committed Oct 18, 2012
  2. @rafaelfranca

    Merge pull request #7989 from senny/backport_7969

    backport: active_model/validations requires necessary files to run
    rafaelfranca committed Oct 18, 2012
  3. @senny @senny
  4. @Grandrath

    Use `Rails.env` instead of `ENV['RAILS_ENV']`; #7951

    `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".
    Grandrath committed Oct 18, 2012
  5. @spastorino @rafaelfranca

    Merge pull request #7371 from csmuc/fix_dup_validation_errors

    Dup'ed ActiveRecord objects may not share the errors object
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/test/cases/dup_test.rb
    spastorino committed with rafaelfranca Oct 16, 2012
Commits on Oct 15, 2012
  1. @tenderlove
Commits on Oct 14, 2012
  1. @rafaelfranca

    Merge pull request #7940 from arturopie/7914-backport-to-3-2-stable

    Backport fix of issue #7914 to 3-2-stable
    rafaelfranca committed Oct 14, 2012
  2. @arturopie

    7914 Using a better way to get the defaults from db.

    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.
    arturopie committed Oct 14, 2012
  3. @arturopie

    #7914 get default value when type uses schema name

    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.
    arturopie committed Oct 13, 2012
Commits on Oct 12, 2012
  1. @rafaelfranca

    Merge pull request #7925 from ernie/3-2-fix-collection-associations-w…

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

    Fix has_many assocation w/select load after create

    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.
    ernie committed Oct 5, 2012
Commits on Oct 11, 2012
  1. @rafaelfranca

    Merge pull request #7905 from jfirebaugh/eager_autoload_3-2

    Backport eager autoloading fixes
    rafaelfranca committed Oct 10, 2012
Commits on Oct 10, 2012
  1. @jfirebaugh

    Eager autoload Preloader classes

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

    Backport 1a70499

    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
    jeremy committed Oct 6, 2012
  2. @rafaelfranca

    Merge pull request #7865 from teleological/link_to_remote_3_2

    Accept :remote as symbol in link_to options (backport)
    rafaelfranca committed Oct 6, 2012
Commits on Oct 6, 2012
  1. @rafaelfranca
  2. @teleological @teleological

    Accept :remote as symbol in link_to options

    Accept either :remote or 'remote' in both the html_options and
    (url_)options hash arguments to link_to.
    teleological committed with teleological Oct 6, 2012
  3. @rafaelfranca

    Merge pull request #7848 from senny/3415_assert_template_has_nil_vari…

    …able
    
    can't pass :locals to #assert_template without a view test case (#3415)
    Conflicts:
    	actionpack/CHANGELOG.md
    rafaelfranca committed Oct 6, 2012
  4. @rafaelfranca

    Merge pull request #7850 from senny/5920_postgres_adapter_table_with_…

    …capital_letters
    
    postgres, quote table names when fetching the primary key (#5920)
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
    rafaelfranca committed Oct 5, 2012
Commits on Oct 4, 2012
  1. @rafaelfranca

    Merge pull request #6978 from frodsan/count_nosql_unsaved_parent

    Count returns 0 without querying if parent is not saved
    rafaelfranca committed Oct 3, 2012
Commits on Oct 3, 2012
  1. @rafaelfranca

    Merge pull request #7836 from lihanli/error-msg-update

    Update supported ruby versions error message in ruby_version_check.rb
    rafaelfranca committed Oct 3, 2012
  2. @lihanli
  3. @spastorino @rafaelfranca

    Refactor

    Conflicts:
    	activerecord/lib/active_record/counter_cache.rb
    spastorino committed with rafaelfranca Oct 3, 2012
Commits on Oct 2, 2012
  1. @rafaelfranca

    Merge pull request #7822 from lulalala/reset-counter-cache-for-has-ma…

    …ny-through
    
    Fix reset_counters crashing on has_many :through associations.
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/counter_cache.rb
    rafaelfranca committed Oct 2, 2012
  2. @rafaelfranca

    Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_va…

    …riables
    
    prefix TemplateAssertions ivars.
    
    Closes #7459
    Conflicts:
    	actionpack/lib/action_controller/test_case.rb
    	actionpack/lib/action_view/test_case.rb
    rafaelfranca committed Oct 1, 2012
Commits on Oct 1, 2012
  1. @rafaelfranca

    Merge pull request #7789 from senny/7777_resource_functions_modify_op…

    …tions
    
    resource and resources do no longer modify passed options
    rafaelfranca committed Oct 1, 2012
  2. @rafaelfranca

    Merge pull request #6450 from iHiD/resource_generator_routes_master

    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)
    rafaelfranca committed Sep 30, 2012
  3. @rafaelfranca
Commits on Sep 30, 2012
  1. @jeremy

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

    …ersa. Bump Sprockets requirements from 2.1+ to 2.2+ and let it answer "should we compile this asset?" for us.
    jeremy committed Sep 30, 2012
  2. @fxn

    Merge pull request #7802 from steveklabnik/issue_7799

    Fix reference to code sample in Getting Started.
    fxn committed Sep 30, 2012
  3. @steveklabnik
  4. @rafaelfranca
Something went wrong with that request. Please try again.