Commits on Jan 18, 2007
  1. @madrobby
  2. @dhh

    Update versions in preparation for Rails 1.2.1

    git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5984 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
    dhh committed Jan 18, 2007
  3. @dhh

    Fix nodoc breaking adapters (closes #7161)

    git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5983 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
    dhh committed Jan 18, 2007
  4. @dhh

    Keep the irrelevant stuff out with :nodoc:

    git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5981 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
    dhh committed Jan 18, 2007
  5. @dhh

    Keep the irrelevant stuff out with :nodoc:

    git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5980 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
    dhh committed Jan 18, 2007
Commits on Jan 17, 2007
  1. @technoweenie
  2. @technoweenie

    Heckling ActionController::Resources::Resource revealed that set_pref…

    …ixes didn't break when :name_prefix was munged. #7081 [Kevin Clark]
    
    git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5975 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
    technoweenie committed Jan 17, 2007
  3. @sstephenson

    Apply [5970] to 1.2 branch

    git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5971 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
    sstephenson committed Jan 17, 2007
  4. @dhh

    Prepare for release of 1.2

    git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5968 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
    dhh committed Jan 17, 2007
Commits on Jan 16, 2007
  1. @technoweenie

    [DOC] clear up some ambiguity with the way has_and_belongs_to_many cr…

    …eates the default join table name. #7072 [jeremymcanally]
    
    git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5961 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
    technoweenie committed Jan 16, 2007
  2. @NZKoz

    Merge oracle fixes over to 1.2

    git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5959 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
    NZKoz committed Jan 16, 2007
Commits on Jan 15, 2007
  1. @dhh
  2. @jeremy

    Merge [5944] from trunk. References #7048.

    git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5945 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
    jeremy committed Jan 15, 2007
  3. @jeremy

    Merge [5937] from trunk. References #6956.

    git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5938 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
    jeremy committed Jan 15, 2007
  4. @jeremy

    Merge [5935] from trunk. References #3987, #6664.

    git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5936 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
    jeremy committed Jan 15, 2007
  5. @jeremy

    Merge [5933] from trunk. References #7000.

    git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5934 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
    jeremy committed Jan 15, 2007
Commits on Jan 14, 2007
  1. @jeremy
  2. @jeremy

    Merge [5929] from trunk. References #6976.

    git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5930 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
    jeremy committed Jan 14, 2007
  3. @jeremy
  4. @jeremy

    Merge [5924] from trunk. References #7023.

    git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5925 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
    jeremy committed Jan 14, 2007
Commits on Jan 13, 2007
  1. @jeremy

    Merge [5919] from trunk. References #7021.

    git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5920 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
    jeremy committed Jan 13, 2007
  2. @jeremy

    Merge [5917] from trunk: unbundle flexmock.

    git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5918 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
    jeremy committed Jan 13, 2007
  3. @jeremy

    Merge [5914] from trunk. References #7015.

    git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5915 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
    jeremy committed Jan 13, 2007
Commits on Jan 12, 2007
  1. @jeremy

    Merge [5907] from trunk. References #6482.

    git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5908 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
    jeremy committed Jan 12, 2007
  2. @jeremy

    Merge [5904] from trunk. References #6252.

    git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5906 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
    jeremy committed Jan 12, 2007
  3. @jeremy
  4. @jeremy

    Merge [5899] from trunk. References #6962.

    git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5900 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
    jeremy committed Jan 12, 2007
  5. @jeremy
  6. @jeremy

    Merge [5893] from trunk. References #2541.

    git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5894 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
    jeremy committed Jan 12, 2007
  7. @jeremy

    Merge [5891] from trunk. References #6635.

    git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5892 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
    jeremy committed Jan 12, 2007
  8. @jeremy

    Merge [5889] from trunk. References #6030.

    git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5890 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
    jeremy committed Jan 12, 2007
  9. @jeremy

    Merge [5887] from trunk. References #4668.

    git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5888 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
    jeremy committed Jan 12, 2007
Commits on Jan 11, 2007
  1. @technoweenie

    merge [5718] to 1.2 branch

    git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5880 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
    technoweenie committed Jan 11, 2007
Commits on Jan 10, 2007
  1. @technoweenie
Commits on Jan 7, 2007
  1. @NZKoz

    Merge error_messages_on fix to 1.2

    git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5871 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
    NZKoz committed Jan 7, 2007