Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: rails/rails
...
head fork: rails/rails
This comparison is big! We're only showing the most recent 250 commits
Commits on May 20, 2011
Guillermo Iguaran guilleiguaran Allow pluralize_table_names for individual model 6a3b3fb
Guillermo Iguaran guilleiguaran Refactoring test_has_many_with_pluralize_table_names_false test 23e94a6
Xavier Noria fxn Merge pull request #1161 from guilleiguaran/each_syntax_in_activerecord
Syntax cleanup:  for in => each on ActiveRecord
5b8bc46
Arun Agrawal arunagw Not updating rubyforge for new versions. Result of "gem list -d rails…
…" is not useful.
f72f591
Xavier Noria fxn Merge pull request #1157 from smartinez87/extra_whitespaces
Remove extra white spaces.
499825e
Yves Senn senny Specify the name to be used for ActiveModel::Name fixes #1168
This patch allows to specify the name of your models independent of the class name.
e5429b7
José Valim josevalim Merge pull request #1169 from senny/specify_a_custom_active_model_name
Specify the name to be used for ActiveModel::Name fixes #1168
19ee841
José Valim josevalim Temporarily ship with ContentLength middleware. 5eadb4d
Commits on May 21, 2011
Patrick Quinn bilts Make Rake::DSL methods available within Railtie rake_tasks block
Fixes incompatibility introduced by Rake 0.9.0
e290835
Guillermo Iguaran guilleiguaran AliasTracker.pluralize use pluralize_table_names of model e0e8918
Josh Kalderimis joshk attr_accessor_with_default is deprecated, so lets not use it in Activ…
…eResource
1bfe9ec
José Valim josevalim Merge pull request #1175 from joshk/active_resource_correction
attr_accessor_with_default removed from ActiveResource
fa3f273
Josh Kalderimis joshk fixed some ruby 19 warnings, including circular requires and variable…
… name reuse
c659505
José Valim josevalim Merge pull request #1177 from joshk/ruby19_warnings
Fixed some ruby 19 warnings
e4bcd5e
Josh Kalderimis joshk corrected a minor ruby19 variable name reuse warning c9b5d64
José Valim josevalim Merge pull request #1178 from joshk/ruby19_warning
Corrected a minor ruby19 variable name reuse warning
ea548c8
Andrew White pixeltrix Correct example and expand on description of :shallow option for reso…
…urces
89d7133
Raghunadh raghunadhd fixed failing tests of ActiveSupport for deprecation test cd6ae26
Karunakar (Ruby) Karunakar Documentation Error Fixed for ticket #839 b134e0f
José Valim josevalim Merge pull request #1179 from castlerock/activesupport_test
fixed failing tests of ActiveSupport for deprecation test
7288682
Ganesh Kumar ganeshkumar ActionMailer deliver method Documentation corrected Ticket #761 3d789ea
Ganesh Kumar ganeshkumar Merge remote branch 'upstream/master' into documentation_change 0a15928
Jon Leighton jonleighton Merge pull request #1162 from guilleiguaran/singularize_individual_ta…
…ble_name

Singularize individual table name
d62a39a
Prakash Murthy prakashmurthy Check for Module.new.dup as well in https://github.com/rails/rails/bl… 6b0dc80
José Valim josevalim Merge pull request #1165 from arunagw/rubyforge_remove
Not updating rubyforge for new versions.
26703f4
José Valim josevalim Merge pull request #1182 from prakashmurthy/patch-1
Enhanced test for duplicable in  active_support/core_ext/object/duplicable.rb
1a959ad
thedarkone thedarkone Handle polymorphic_type NOT NULL-able columns as well. 1c614bc
thedarkone thedarkone Fix AS::Duration#duplicable? on 1.8 03cd88a
Andrew White pixeltrix Add support for passing mass assignment roles to dynamic finders. Clo…
…ses #1170.
09daaaa
David Heinemeier Hansson dhh Bind to Rake 0.8.7 until a fix for Rake 0.9.0 is released f3c3a78
David Heinemeier Hansson dhh Uglifier works properly now with 0.5.4 eba978c
Santiago Pastorino spastorino Merge pull request #1187 from thedarkone/polymorphic-class-fix
Handle polymorphic_type NOT NULL columns
da8469f
David Heinemeier Hansson dhh Merge pull request #1174 from bilts/fix-rake-dsl
Make Rake::DSL methods available within Railtie rake_tasks block (so we're compatible with Rake 0.9.0).
8b719cf
David Heinemeier Hansson dhh Now that we are compatible with Rake 0.9.0, lets allow it back in f62aba7
Xavier Noria fxn Merge pull request #1180 from Karunakar/documentation_change
Documentation Error Fixed for ticket #839
eb02579
José Valim josevalim Merge pull request #1188 from thedarkone/duplicable-duration
Fix AS::Duration#duplicable? on 1.8
f007885
Arun Agrawal arunagw Removal require again from tests. 40e3377
José Valim josevalim Merge pull request #1191 from arunagw/removal_extra
Removal require again from tests.
f674aed
Damien Mathieu dmathieu don't raise NoMethodError the tried method doesn't exists 29a5aea
Damien Mathieu dmathieu make sure missing method does not fail with arguments a85e00c
Commits on May 22, 2011
David Heinemeier Hansson dhh Merge pull request #1195 from dmathieu/try_undefined_method
Don't raise NoMethodError the tried method doesn't exists
073f80e
David Heinemeier Hansson dhh Bump versions for rc1 82857ad
Guillermo Iguaran guilleiguaran Adding pluralize_table_names change to CHANGELOG 6e5419a
Vishnu Atrai vatrai test fix jdom_engine_test 7bf9d6f
Arun Agrawal arunagw Let's load jruby-openssl now for all. #jruby 69bad8f
José Valim josevalim Merge pull request #1198 from guilleiguaran/changelog_pluralize_table…
…_names

Adding pluralize_table_names change to CHANGELOG
c932539
José Valim josevalim Merge pull request #1199 from vatrai/jdon_engine_test_fix
test fix jdom_engine_test
f924dbe
José Valim josevalim Merge pull request #1206 from arunagw/jruby_openssl_load
Let's load jruby-openssl now for all. #jruby
1ab556f
Daniel Schierbeck dasch Remove superfluous whitespace from ActiveModel::SecurePassword
Only one space is needed, yo!
93659a3
José Valim josevalim Merge pull request #1208 from dasch/patch-1
Remove superfluous whitespace from ActiveModel::SecurePassword
a0eee5f
José Valim josevalim Fix failing tests. a6e9455
José Valim josevalim Fix I18n dependency as final is out. 9164dda
Joshua Peek josh Lock to stable sprockets beta cdc9c3c
Joshua Peek josh Add debug_asset support 27159df
Commits on May 23, 2011
Joshua Peek josh Require sprockets beta 8 7ad24a7
José Valim josevalim Use Rack 1.3.0. 7236861
José Valim josevalim Move content length to the server, this brings the same behavior as i…
…n rack 1.2.
65f54a6
Josh Kalderimis joshk deprecate AS core_ext/kernel/requires in 3.1 d79e284
José Valim josevalim Merge pull request #1235 from joshk/deprecate_kernel_requires
Deprecate kernel requires
b648286
Jon Leighton jonleighton Replace references to ActiveSupport::SecureRandom with just SecureRan…
…dom, and require 'securerandom' from the stdlib when active support is required.
5a6927e
Jon Leighton jonleighton Deprecate ActiveSupport::SecureRandom. Just use SecureRandom which is…
… provided by the standard library.
3cbfc8c
Jon Leighton jonleighton Fix problem with loading polymorphic associations which have been def…
…ined in an abstract superclass. Fixes #552.
872a9c1
Commits on May 24, 2011
David Heinemeier Hansson dhh The asset pipeline is always on for new apps, dont need the legacy js…
… ext stuff
da1ee0e
David Heinemeier Hansson dhh Remove asserts for js ext stuff thats not used any more c77bdc0
Joey B JoeyButler Add failing test case for issue 796 177666e
Aaron Patterson tenderlove do not bother with assert_nothing_raised, the test will fail and we g…
…et a better trace without it
d485633
Aaron Patterson tenderlove adding a test for create! with invalid associations b102e60
Aaron Patterson tenderlove add tests surrounding behavior of save and save! for associations tha…
…t have validation errors
1d864e8
Aaron Patterson tenderlove rescue record invalid exceptions and return false from the save metho…
…d. fixes #796
656e7b0
tomhuda Change compressor API so that plugins can register default compressor…
…s for their stylesheet or JS engines and still allow the user to turn off compression
7eed5c0
tomhuda Move SCSS generators and default templates from Rails to the Sass Rai…
…ltie (d435726312601edb3ba6f97b34f562221f72c1f8).

* Sass gem registers a compressor
* Sass gem registers generators for assets and scaffold
* Create a default stylesheet_engine ("css") for apps that remove the Sass gem
e1043cc
Yehuda Katz wycats Update generator config to support hiding namespaces and pass the app…
… into generator blocks
5d9eb1a
Yehuda Katz wycats Hide css:* and the default stylesheet from rails g 23820a2
Yehuda Katz wycats Update default Gemfile to point to sass-rails, not sass c08f845
Andrew White pixeltrix Failing tests for #1233. 0daf574
Jon Leighton jonleighton Ensure that the surrounding code in Relation#to_a respects the defaul…
…t_scope (as well as having Relation#arel respect the default scope). Fixes #1233.
63a6598
Andrew White pixeltrix Ignore :includes on through associations 8a4263c
Jon Leighton jonleighton Fix infinite recursion where a lazy default scope references a scope.…
… Fixes #1264.
b519b0c
José Valim josevalim Everyone receives app as argument for consistency.
Conflicts:

	railties/lib/rails/application.rb
289f9ce
Commits on May 25, 2011
Yehuda Katz wycats Renaming helper in the Rake task, but why is this needed in the first…
… place? (paging JP)
9701014
Josh Kalderimis joshk correction to the AR::Base#attributes= guard_protected_attributes dep…
…recation message
a1936b4
José Valim josevalim Merge pull request #1313 from joshk/deprecation_message_correction
Deprecation message correction
3868624
Commits on May 27, 2011
Damien Mathieu dmathieu don't raise an exception if the format isn't recognized
Fixed while traveling to heuruko
9cb8a18
Aaron Patterson tenderlove adding a test for #1322 37b2104
Aaron Patterson tenderlove fixing test for mysql2 c0c9a33
Aaron Patterson tenderlove work around bug in the sqlite3 bindings. fixes #1289 18a2dfb
Commits on May 28, 2011
Geoff Jacobsen jacott fixed asset_paths when called from sprockets for relative_url_root db05478
Akira Matsuda amatsuda Disable IdentityMap by default for ActiveRecord testing
because enabling IM by default will possibly hide some bugs on 3.1 default behavior
37304e3
Aaron Patterson tenderlove Merge pull request #1375 from amatsuda/disable_im_by_default_on_test_31
Disable IdentityMap by default for ActiveRecord testing on 3-1-stable
1c42bd5
Commits on May 31, 2011
Jon Leighton jonleighton Implementing @dmathieu's cleaner fix from #1425. Unfortunately he del…
…eted the branch so I cannot just merge it.
9d17913
Farley Knight farleyknight Tests for issue #1360 842043e
Jon Leighton jonleighton Only save the record once when calling create! on a collection associ…
…ation. Fixes #1360.
64d7348
Erik Fonselius Fonsan Failing test for aggregating on default_scope with select c22364b
Jon Leighton jonleighton Ensure that calculations properly override the select value even if i…
…t's set in the default scope. Fixes #1395.
f4e3b70
Andrew White pixeltrix Make MemCacheStore work with Ruby 1.9 and -Ku de7fecb
Josh Kalderimis joshk added an alias for new to build to the AR collection proxy, this corr…
…ects an issue where the collection proxies were not consistent
22b02cb
Jon Leighton jonleighton Merge pull request #1437 from joshk/ar_collection_new_alias
Ar collection new alias
6687670
Jon Leighton jonleighton Merge pull request #1437 from joshk/ar_collection_new_alias
Ar collection new alias
3c09ae7
Jon Leighton jonleighton Merge pull request #1437 from joshk/ar_collection_new_alias
Ar collection new alias
5ca2e57
Commits on Jun 01, 2011
Andrew White pixeltrix Raise NameError instead of ArgumentError in ActiveSupport::Dependencies
ActiveSupport::Dependencies now raises NameError if it finds an existing
constant in load_missing_constant. This better reflects the nature of
the error which is usually caused by calling constantize on a nested constant.

Closes #1423
f1fe3c2
Brian Mathiyakom winterchord Fix issue #1272
Set reverse_order_value when asked to reverse_order().
Do the actual reversal in build_arel.
8a4013d
Vishnu Atrai vatrai AttributeMethodTest test fix #jruby 26d0f42
Arun Agrawal arunagw Adding comment 7f34d5b
Arun Agrawal arunagw Loading files if PLATFORM available. 98cd7ca
Arun Agrawal arunagw Using java_import instead of import. Need with rake 0.9.0 60c9b7b
Arun Agrawal arunagw Fixing XMLMini_JDOM 88813e1
Arun Agrawal arunagw Fixed tests for JDOM. File From Xml is working now 425c892
Arun Agrawal arunagw Indented as required. 68fc6ba
Jon Leighton jonleighton Merge pull request #1444 from arunagw/3-1-stable
Jruby fixes for 3 1 stable
df0e2db
Arun Agrawal arunagw Import => java_import performance test #jruby 42b8fb1
Jon Leighton jonleighton Merge pull request #1451 from arunagw/3-1-stable
3-1-stable import to java_import
1243683
Jon Leighton jonleighton Fix broken test. You know, the merge button will be the end of us... 03d087d
Commits on Jun 02, 2011
David Heinemeier Hansson dhh Revert "Renaming helper in the Rake task, but why is this needed in t…
…he first place? (paging JP)" -- Waiting on YK to fix.

This reverts commit e144b3e.
2c6127f
Yehuda Katz wycats Start moving some logic from being embedded in AV into the Rails Spro…
…ckets extensions
866889c
Yehuda Katz wycats Move javascript/css helpers into the Sprockets helper and just have t…
…hem override the old behavior
476d679
Yehuda Katz wycats Move the last pockets of Sprockets stuff into the Sprockets directory ee018be
Yehuda Katz wycats Make sure that Sprockets::Helpers::RailsHelper can be found 7a8d3d7
Yehuda Katz wycats Update generator config to support hiding namespaces and pass the app…
… into generator blocks
af83304
Yehuda Katz wycats Renaming helper in the Rake task, but why is this needed in the first…
… place? (paging JP)
b5ac04a
Yehuda Katz wycats Pull back in asset_path 5b300a9
Commits on Jun 03, 2011
Yehuda Katz wycats Remove explicit sprockets usage. This should have come over in the me…
…rge, but for some reason it didn't.
de63942
Andrew White pixeltrix Don't double assign attributes - closes #1467. 67f5c07
Yehuda Katz wycats Another missed piece of the merge. I screwed up this merge. I am sorr…
…y :(
80745f1
Larry Sprock lardawge Generate correct asset paths when using asset pipeline 9b55007
Larry Sprock lardawge Don't need asset_path twice 8b8e181
Larry Sprock lardawge Bring inline with master 3b75ec9
Commits on Jun 04, 2011
Yehuda Katz wycats Merge pull request #1473 from lardawge/fix_broken_asset_pipeline_paths
Fix broken asset pipeline paths
639dca4
Yehuda Katz wycats Restructure TemplateAssertions-related code to eliminate circular req…
…uires.

Also, no need to include dependencies in AS::Concerns inside included blocks.
63467a4
Vijay Dev vijaydev fixes Rake::GemPackageTask deprecation warnings from rake 0.9.0 a81c2ec
Vijay Dev vijaydev fixes Rake::RDocTask deprecation warnings from rake 0.9.0 b6040f4
Xavier Noria fxn specify image dimensions for pictures in the guides credits page aedc627
Xavier Noria fxn adds Ryan Bigg to the credits page of the guides, he is the author of…
… the new configuring guide
7bbcf53
Xavier Noria fxn move Ryan up, since the list is ordered by surname 63eab0b
Xavier Noria fxn adds Vijay Dev to the new Rails Guides Reviewers team 3939fbd
Jon Leighton jonleighton Force RAILS_ENV=development in rackup_test.rb. This fixes a problem o…
…n the CI server. For some reason the RAILS_ENV on the CI server is production, which means that the ActionDispatch::Static middleware is not used, and so the request in 'config.ru can be racked up' returns a 404 rather than a 200.
f9464a2
Jon Leighton jonleighton Refactor Active Record test connection setup. Please see the RUNNING_…
…UNIT_TESTS file for details, but essentially you can now configure things in test/config.yml. You can also run tests directly via the command line, e.g. ruby path/to/test.rb (no rake needed, uses default db connection from test/config.yml). This will help us fix the CI by enabling us to isolate the different Rails versions to different databases.
f9e3d4b
Jon Leighton jonleighton Bring back oracle specific crap 550064c
Commits on Jun 05, 2011
Jon Leighton jonleighton Fix typo 6925423
Jon Leighton jonleighton Fix adapter_test.rb to make no assumptions about the database name 04d238b
Arun Agrawal arunagw Loading multi_json instead of i18n gem.
Don't know why it's giving error with i18n gem. 
Changing this as it dosn't matter with specific gem.
596f6ec
José Valim josevalim Merge pull request #1495 from arunagw/fixed_failing_isolated_test
Fixed failing isolated test
af1c020
Jon Leighton jonleighton load_path_test.rb is also dependent on RAILS_ENV=development 3ac805b
Commits on Jun 06, 2011
José Valim josevalim Merge pull request #1478 from arunagw/warning_cherry-picks
Some Cherry-picks for 1.9.2 warning removal
0c4fd88
Arun Agrawal arunagw framework_test.rb also dependent on RAILS_ENV=development 710dfff
Arun Agrawal arunagw loading_test.rb with RAILS_ENV=development 077ffe0
Arun Agrawal arunagw Fix for CI server. Dependent on RAILS_ENV=development e909fa4
José Valim josevalim Merge pull request #1505 from arunagw/3-1-stable
Cherry-picked from master to fix the build
ae534f2
Akira Matsuda amatsuda require 'rake/rdoctask' if failed to require 'rdoc/task'
fixes a regression introduced by b921679
require 'rdoc/task' fails if the system RDoc version is below 2.4.2 (e.g. CRuby 1.8.7)
84fac20
Akira Matsuda amatsuda Ensure RDoc::Task exists even if 'rdoc/task' was not required f3fa66f
José Valim josevalim Merge pull request #1508 from vijaydev/rake_rdoc_fixes_cherry_picks
Rake deprecation fixes - cherry picks
1bc159f
Jon Leighton jonleighton Solve the RAILS_ENV problem in the railties tests in a more generic way 1f59c57
David Heinemeier Hansson dhh Depend on latest Sprockets beta 50a7e8e
Jon Leighton jonleighton Fix another CIfail :zap: :fire: Deleting RAILS_ENV from ENV doesn't produce th…
…e desired result if RACK_ENV is still defined. And in any case it's better to be explicit here, so just set RALS_ENV=development.
fe2b411
Jon Leighton jonleighton Fix double definition of #teardown. Thanks @mike-burns :+1: 4a39581
Jon Leighton jonleighton Make sure that the build/drop database rake tasks take account of the…
… test/config.yml config
dc4da12
Jon Leighton jonleighton Don't ensure all keys in build_results are only written once, otherwi…
…se we get false positive builds reported.
d7edce2
Sebastian Martinez smartinez87 Fix fixed-fonts stlye on rails_on_rack guide. e5fb901
Sebastian Martinez smartinez87 Fix grammar mistake. Lets vs let's. 815dd81
Sebastian Martinez smartinez87 Revert this, commited by mistake. 20f1f9e
Thais Camilo narwen On "contribute" guide: remove mention of LH 8c358d0
Thais Camilo narwen Stop linking API Guidelines to GitHub wiki e856157
Thais Camilo narwen Stop linking Rails guidelines to GitHub wiki 64db0ee
diego Added missing quote in grouped_options_for_select example 9d275a8
Sebastian Martinez smartinez87 Fix font styling on associations.rb c32ba39
Ben Orenstein r00k Don't you lie to me! 7dcbbae
Ben Orenstein r00k Improve 'Joining Tables' section with additional examples and explana…
…tion.
5eaf012
Ben Orenstein r00k Copy edits 64148ab (previous commit). Please squash at will. 97fd8c0
Ben Orenstein r00k Fix incorrect description of the returned results. 8b72166
Vijay Dev vijaydev document aliases for commands and update rails versions 1d654cc
Vijay Dev vijaydev fix typo 39e5cbc
Vijay Dev vijaydev removed references to old remote_* helpers; add info about 3.1 adding…
… multipart option to a form with file_field automatically
5ab4b9e
Evan Farrar evanfarrar Typo and sentence restructuring 3a22027
Hendy Tanata htanata Update Rails coding conventions link. 2e7a039
Hendy Tanata htanata Fix punctuation. 7ff491c
Mark Roghelia mjroghelia The example in the API docs incorrectly indicated that form_for would…
… use the same default route for both new and previously persisted records. The default path given in the example would have generated a routing error for new records. form_for actually uses polymorphic_path to determine which route to use based on the state of the record. The example has been updated to reflect the method's actual behavior.
8ac4e4d
Guillermo Iguaran guilleiguaran Removing trailing white-spaces 48b9096
Akira Matsuda amatsuda s/an/a/ 4c716e6
Akira Matsuda amatsuda s/a/an/ 6f3d997
dafaqisdat dafaqisdat The URL http://dev.mysql.com/doc/refman/5.0/en/savepoints.html is no …
…longer available
700fd6d
dafaqisdat dafaqisdat Edited activerecord/lib/active_record/transactions.rb via GitHub 6ad8f6e
Vijay Dev vijaydev add alias info for runner command f51cea6
Ben Orenstein r00k Change hashrocket spacing to match conventions. f4a4d5f
Brian Pearce brianp Fixed sections regarding validations and callbacks to mention the tou…
…ch method does not fire either validations or callbacks as stated in the docs.
50a7391
Vijay Dev vijaydev fix indentation, fixed-width for nils 40e7682
Vijay Dev vijaydev remove stray ( 69b3c9c
Linux on Rails linuxonrails FIXED: error with url_for & link_to when we have nested resources. f7ac354
ganesh updated Changelog 5e44184
Prem Sichanugrist sikachu Revise documentation indentation from [7999050] eade591
Waynn Lue waynn add a missing "the" and normalize the use of periods. d57cfc1
Vijay Dev vijaydev use clearer variable name in examples 424d725
Rohit Arondekar rohit Upcoming version of Rails is upon us so no need to refer to it. [API …
…DOCS]
9726ed8
Alberto Perdomo Fixed order of parameters in assert_equal call examples, first expect…
…ed, then actual object.
f9087ee
Vijay Dev vijaydev fix incorrect output 0e8857b
Vijay Dev vijaydev some grammatical corrections dff7c62
Vijay Dev vijaydev fix incorrect module name for wrap parameters 2974869
Vijay Dev vijaydev minor corrections in generators guide b1919b1
Vijay Dev vijaydev s/ActiveRecord/Active Record according to api guidelines 3432775
Vijay Dev vijaydev correct code indendation in the initialization guide 670ae12
Guillermo Iguaran guilleiguaran Remove trailing white-spaces 527499c
Vijay Dev vijaydev annotate class_eval method for active resource schema attributes 47670a5
Vijay Dev vijaydev minor edits in migrations guide 5d4b73a
Guillermo Iguaran guilleiguaran Change http://api.rubyonrails.com to http://api.rubyonrails.org c1ce168
Mariusz Pękala Arsen7 Validations guide: order of :after_save callback was incorrect.
The guide was contracting itself. First it stated that 'there is a list
of callbacks in order of execution', on the list 'after_save' was placed
before 'after_create', and then there was a warning that 'after_save'
runs after them. I am not sure about 'around_' callbacks, but let's
leave that for another patch.
b6826be
Vijay Dev vijaydev document assets related rake tasks 3962d94
Vijay Dev vijaydev rearrange sections of the commandline guide giving more importance to…
… rake tasks
7262d92
Vijay Dev vijaydev up and down are no longer class methods in a migration 59016b9
Vijay Dev vijaydev comment the recorder methods fa1aad7
Vijay Dev vijaydev add info about docrails policy on changelogs 95f3046
Aaron Patterson tenderlove please use ruby -I lib:test path/to/test.rb, or export RUBY_OPT e504101
Aaron Patterson tenderlove add test to the include path b8714ed
Aaron Patterson tenderlove updating configs for oracle 10eb479
Aaron Patterson tenderlove do not muck with the load path, that is the test task responsibility 50d331d
Aaron Patterson tenderlove more oracle fixes 606108a
Aaron Patterson tenderlove set the environment variable from the rake file 945b131
Aaron Patterson tenderlove oops! add parens so the block is properly bound 75fb26a
Commits on Jun 07, 2011
Aaron Patterson tenderlove make sure AR isolated tests set the environment variable 377b15a
Xavier Noria fxn adds missing require 645f138
Guillermo Iguaran guilleiguaran Fixing Rails::Server#app under Rack::URLMap 8d758d8
José Valim josevalim Merge pull request #1527 from guilleiguaran/3-1-stable
Rails::Server#app should be nice with Rack::URLMap (3.1 stable)
69b25eb
Chris Eppstein chriseppstein Use the sass-rails release candidate until full release. 654514a
Aaron Patterson tenderlove Merge pull request #1528 from chriseppstein/3-1-stable
Update project Gemfile to use the sass-rails rc
a995911
Dmitriy Kiriyenko dmitriy-kiriyenko This way asserting that updated_at was changed in touch look more obv…
…ious.
96711aa
Dmitriy Kiriyenko dmitriy-kiriyenko Do not use default_scope in ActiveRecord::Persistence#touch. 54f5fb5
Xavier Noria fxn sprockets gzips assets now
Conflicts:

	railties/lib/rails/tasks/assets.rake
ea8b05c
Xavier Noria fxn mention assets:clean in railties CHANGELOG 296ca01
Vijay Dev vijaydev fix indents and a code error in caching guide da5122e
Vijay Dev vijaydev proof reading and fixes in configuring guide 2cbd024
Vijay Dev vijaydev add missing generator configs f8f00cc
Vijay Dev vijaydev fix spacing
Conflicts:

	railties/guides/source/configuring.textile
b7ea35d
Jon Leighton jonleighton Allow polymorphic has_one to work when the association is set before …
…the owner has been saved. Fixes #1524.
f5f020b
Jon Leighton jonleighton When you add a record to a polymorphic has_one, you should be able to…
… access the owner from the associated record
e149861
Commits on Jun 08, 2011
Michael Koziarski NZKoz Ensure that the strings returned by SafeBuffer#gsub and friends aren'…
…t considered html_safe?

Also make sure that the versions of those methods which modify a string in place such as gsub! can't be called on safe buffers at all.

Conflicts:

	activesupport/test/safe_buffer_test.rb
a06fec6
Aaron Patterson tenderlove bumping to rails 3.1.0.rc2 2664897
Christopher Meiklejohn cmeiklejohn Fragment caching needs to operate on the pure output, not the
safebuffer.
eb85169
Prem Sichanugrist sikachu Fix `simple_format` helper to work correctly with the new SafeBuffer …
…rule.

This has been ported from `3-0-stable` [ed37964]
509aa66
Prem Sichanugrist sikachu Adapt [823aa22] to make sure we perform cloning before manipulation o…
…nly on `OutputBuffer`.

After the fragment rendering, `Builder` returns the `String` object instead of `ActionView::OutputBuffer`. Somehow the same procedure which was in [823aa22] does not play nice with the String, and result in the fragment got lost.
d1a7475
Prem Sichanugrist sikachu Add proper fix to `mail_to` helper.
* Fix the problem on manipulating on the `ActiveSupport::SafeBuffer`
* Make sure that we run `escape_javascript` on the `String`, to avoid unexpected behavior.
719e05d
José Valim josevalim Merge pull request #1546 from sikachu/31safebuffer
Fix failing ActionPack tests on 3-1-stable
623c16f
Raimonds Simanovskis rsim Do not hardcode :id as it was ignored by mass assignment filter
As a result test was failing on Oracle where ids are assigned by default from 1000
64a5865
Guillermo Iguaran guilleiguaran Allow multiple sources in Sprockets helpers 6e9714c
José Valim josevalim Merge pull request #1557 from guilleiguaran/multiple-sources-sprocket…
…s-3-1

Multiple sources in sprockets helpers (backported from master)
caa0b1d
Paul Gallagher tardate Make escape_javascript happy to handle SafeBuffers
* see GH#1553
* allow for the fact that gsub on SafeBuffer does not pass match variables $1, $2 etc to a block
4663893
José Valim josevalim Merge pull request #1561 from sikachu/3-1-escapejs
Make escape_javascript happy to handle SafeBuffers
abc029d
thoefer2 thoefer2 Brought back alternative convention for namespaced models in i18n. 3451bcb
José Valim josevalim Merge pull request #1562 from sikachu/3-1-i18n-convention
Brought back alternative convention for namespaced models in i18n.
a40833c
Prem Sichanugrist sikachu Update CHANGELOG to mention the new SafeBuffer change d2b0605
Bhavin bhavinkamani fix connection not established error while running rake task
db:schema:dump
(cherry picked from commit e9a2ff8)
696a94b
Aaron Patterson tenderlove Merge pull request #1566 from sikachu/3-1-stable-changelog
Update CHANGELOG to mention the new SafeBuffer change
5c498fa
Marian Rudzynski fx use association_primary_key in AssociationScope#add_constraints
(cherry picked from commit 1f7c3d0)
31023da
Aaron Patterson tenderlove bumping to 3.1.0.rc3 aefd703