Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: rails/rails
...
head fork: rails/rails
Checking mergeability… Don't worry, you can still create the pull request.
This comparison is big! We're only showing the most recent 250 commits
Commits on May 19, 2011
@guilleiguaran guilleiguaran Prefer each instead of for in ec1993c
@josevalim josevalim Merge pull request #1135 from arunagw/for_to_each
README updated for for => each
b5fec0f
@josevalim josevalim Merge pull request #1136 from arunagw/actionmailer_readme
Actionmailer readme
5281c29
@josevalim josevalim Merge pull request #1137 from guilleiguaran/each_syntax_in_activemodel
Prefer 'each' instead of 'for in'
95bd199
@stevenbristol stevenbristol fixing sym and string cookie name, two cookies to browser bug. 7c000af
@stevenbristol stevenbristol adding test 2d50887
@joshk joshk renamed the wrap_parameters :only and :except options to :include and…
… :exclude to make it consistent with controller filters
968596f
@josh josh Merge pull request #1150 from stevenbristol/master
The cookie jar does not to_s cookie names (keys)
4cf4c7f
@josevalim josevalim Merge pull request #1151 from joshk/wrap_params_options_change
renamed the wrap_parameters :only and :except options to :include and :ex
bcdb681
@NZKoz NZKoz Merge pull request #1118 from amatsuda/pp_console
always enable `pp` on the Rails console
feddf31
@NZKoz NZKoz Merge pull request #1097 from kirillrdy/master
Improved "treat  0000-00-00 00:00:00 as nil Date"
2c08a74
@josevalim josevalim Use Rack::ContentLength. e4ebded
@arunagw arunagw Sprockets version update. 36e330b
@spastorino spastorino Merge pull request #1153 from arunagw/sprockets_update
Sprockets version update.
c037499
@jonleighton jonleighton Implement proxy_owner, proxy_target and proxy_reflection methods on C…
…ollectionProxy with deprecations. Fixes #1148.
0afd585
@smartinez87 smartinez87 Remove extra white spaces. b91c907
Commits on May 20, 2011
@josh josh Use sprockets prepend_path if its available 54823fe
@guilleiguaran guilleiguaran Syntax cleanup: for in => each e7d600d
@guilleiguaran guilleiguaran for => each in model migration template 1592130
@guilleiguaran guilleiguaran Allow pluralize_table_names for individual model 6a3b3fb
@guilleiguaran guilleiguaran Refactoring test_has_many_with_pluralize_table_names_false test 23e94a6
@fxn fxn Merge pull request #1161 from guilleiguaran/each_syntax_in_activerecord
Syntax cleanup:  for in => each on ActiveRecord
5b8bc46
@arunagw arunagw Not updating rubyforge for new versions. Result of "gem list -d rails…
…" is not useful.
f72f591
@fxn fxn Merge pull request #1157 from smartinez87/extra_whitespaces
Remove extra white spaces.
499825e
@senny 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
@josevalim 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
@josevalim josevalim Temporarily ship with ContentLength middleware. 5eadb4d
Commits on May 21, 2011
@bilts bilts Make Rake::DSL methods available within Railtie rake_tasks block
Fixes incompatibility introduced by Rake 0.9.0
e290835
@guilleiguaran guilleiguaran AliasTracker.pluralize use pluralize_table_names of model e0e8918
@joshk joshk attr_accessor_with_default is deprecated, so lets not use it in Activ…
…eResource
1bfe9ec
@josevalim josevalim Merge pull request #1175 from joshk/active_resource_correction
attr_accessor_with_default removed from ActiveResource
fa3f273
@joshk joshk fixed some ruby 19 warnings, including circular requires and variable…
… name reuse
c659505
@josevalim josevalim Merge pull request #1177 from joshk/ruby19_warnings
Fixed some ruby 19 warnings
e4bcd5e
@joshk joshk corrected a minor ruby19 variable name reuse warning c9b5d64
@josevalim josevalim Merge pull request #1178 from joshk/ruby19_warning
Corrected a minor ruby19 variable name reuse warning
ea548c8
@pixeltrix pixeltrix Correct example and expand on description of :shallow option for reso…
…urces
89d7133
@raghunadhd raghunadhd fixed failing tests of ActiveSupport for deprecation test cd6ae26
@Karunakar Karunakar Documentation Error Fixed for ticket #839 b134e0f
@josevalim josevalim Merge pull request #1179 from castlerock/activesupport_test
fixed failing tests of ActiveSupport for deprecation test
7288682
@ganeshkumar ganeshkumar ActionMailer deliver method Documentation corrected Ticket #761 3d789ea
@ganeshkumar ganeshkumar Merge remote branch 'upstream/master' into documentation_change 0a15928
@jonleighton jonleighton Merge pull request #1162 from guilleiguaran/singularize_individual_ta…
…ble_name

Singularize individual table name
d62a39a
@prakashmurthy prakashmurthy Check for Module.new.dup as well in https://github.com/rails/rails/bl… 6b0dc80
@josevalim josevalim Merge pull request #1165 from arunagw/rubyforge_remove
Not updating rubyforge for new versions.
26703f4
@josevalim 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
@pixeltrix pixeltrix Add support for passing mass assignment roles to dynamic finders. Clo…
…ses #1170.
09daaaa
@dhh dhh Bind to Rake 0.8.7 until a fix for Rake 0.9.0 is released f3c3a78
@dhh dhh Uglifier works properly now with 0.5.4 eba978c
@spastorino spastorino Merge pull request #1187 from thedarkone/polymorphic-class-fix
Handle polymorphic_type NOT NULL columns
da8469f
@dhh 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
@dhh dhh Now that we are compatible with Rake 0.9.0, lets allow it back in f62aba7
@fxn fxn Merge pull request #1180 from Karunakar/documentation_change
Documentation Error Fixed for ticket #839
eb02579
@josevalim josevalim Merge pull request #1188 from thedarkone/duplicable-duration
Fix AS::Duration#duplicable? on 1.8
f007885
@arunagw arunagw Removal require again from tests. 40e3377
@josevalim josevalim Merge pull request #1191 from arunagw/removal_extra
Removal require again from tests.
f674aed
@dmathieu dmathieu don't raise NoMethodError the tried method doesn't exists 29a5aea
@dmathieu dmathieu make sure missing method does not fail with arguments a85e00c
Commits on May 22, 2011
@dhh dhh Merge pull request #1195 from dmathieu/try_undefined_method
Don't raise NoMethodError the tried method doesn't exists
073f80e
@dhh dhh Bump versions for rc1 82857ad
@guilleiguaran guilleiguaran Adding pluralize_table_names change to CHANGELOG 6e5419a
@vatrai vatrai test fix jdom_engine_test 7bf9d6f
@arunagw arunagw Let's load jruby-openssl now for all. #jruby 69bad8f
@josevalim josevalim Merge pull request #1198 from guilleiguaran/changelog_pluralize_table…
…_names

Adding pluralize_table_names change to CHANGELOG
c932539
@josevalim josevalim Merge pull request #1199 from vatrai/jdon_engine_test_fix
test fix jdom_engine_test
f924dbe
@josevalim josevalim Merge pull request #1206 from arunagw/jruby_openssl_load
Let's load jruby-openssl now for all. #jruby
1ab556f
@dasch dasch Remove superfluous whitespace from ActiveModel::SecurePassword
Only one space is needed, yo!
93659a3
@josevalim josevalim Merge pull request #1208 from dasch/patch-1
Remove superfluous whitespace from ActiveModel::SecurePassword
a0eee5f
@josevalim josevalim Fix failing tests. a6e9455
@josevalim josevalim Fix I18n dependency as final is out. 9164dda
@josh josh Lock to stable sprockets beta cdc9c3c
@josh josh Add debug_asset support 27159df
Commits on May 23, 2011
@josh josh Require sprockets beta 8 7ad24a7
@josevalim josevalim Use Rack 1.3.0. 7236861
@josevalim josevalim Move content length to the server, this brings the same behavior as i…
…n rack 1.2.
65f54a6
@joshk joshk deprecate AS core_ext/kernel/requires in 3.1 d79e284
@josevalim josevalim Merge pull request #1235 from joshk/deprecate_kernel_requires
Deprecate kernel requires
b648286
@jonleighton jonleighton Replace references to ActiveSupport::SecureRandom with just SecureRan…
…dom, and require 'securerandom' from the stdlib when active support is required.
5a6927e
@jonleighton jonleighton Deprecate ActiveSupport::SecureRandom. Just use SecureRandom which is…
… provided by the standard library.
3cbfc8c
@jonleighton jonleighton Fix problem with loading polymorphic associations which have been def…
…ined in an abstract superclass. Fixes #552.
872a9c1
Commits on May 24, 2011
@dhh dhh The asset pipeline is always on for new apps, dont need the legacy js…
… ext stuff
da1ee0e
@dhh dhh Remove asserts for js ext stuff thats not used any more c77bdc0
@JoeyButler JoeyButler Add failing test case for issue 796 177666e
@tenderlove tenderlove do not bother with assert_nothing_raised, the test will fail and we g…
…et a better trace without it
d485633
@tenderlove tenderlove adding a test for create! with invalid associations b102e60
@tenderlove tenderlove add tests surrounding behavior of save and save! for associations tha…
…t have validation errors
1d864e8
@tenderlove 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
@wycats wycats Update generator config to support hiding namespaces and pass the app…
… into generator blocks
5d9eb1a
@wycats wycats Hide css:* and the default stylesheet from rails g 23820a2
@wycats wycats Update default Gemfile to point to sass-rails, not sass c08f845
@pixeltrix pixeltrix Failing tests for #1233. 0daf574
@jonleighton 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
@pixeltrix pixeltrix Ignore :includes on through associations 8a4263c
@jonleighton jonleighton Fix infinite recursion where a lazy default scope references a scope.…
… Fixes #1264.
b519b0c
@josevalim josevalim Everyone receives app as argument for consistency.
Conflicts:

	railties/lib/rails/application.rb
289f9ce
Commits on May 25, 2011
@wycats wycats Renaming helper in the Rake task, but why is this needed in the first…
… place? (paging JP)
9701014
@joshk joshk correction to the AR::Base#attributes= guard_protected_attributes dep…
…recation message
a1936b4
@josevalim josevalim Merge pull request #1313 from joshk/deprecation_message_correction
Deprecation message correction
3868624
Commits on May 27, 2011
@dmathieu dmathieu don't raise an exception if the format isn't recognized
Fixed while traveling to heuruko
9cb8a18
@tenderlove tenderlove adding a test for #1322 37b2104
@tenderlove tenderlove fixing test for mysql2 c0c9a33
@tenderlove tenderlove work around bug in the sqlite3 bindings. fixes #1289 18a2dfb
Commits on May 28, 2011
@jacott jacott fixed asset_paths when called from sprockets for relative_url_root db05478
@amatsuda amatsuda Disable IdentityMap by default for ActiveRecord testing
because enabling IM by default will possibly hide some bugs on 3.1 default behavior
37304e3
@tenderlove 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
@jonleighton jonleighton Implementing @dmathieu's cleaner fix from #1425. Unfortunately he del…
…eted the branch so I cannot just merge it.
9d17913
@farleyknight farleyknight Tests for issue #1360 842043e
@jonleighton jonleighton Only save the record once when calling create! on a collection associ…
…ation. Fixes #1360.
64d7348
@Fonsan Fonsan Failing test for aggregating on default_scope with select c22364b
@jonleighton jonleighton Ensure that calculations properly override the select value even if i…
…t's set in the default scope. Fixes #1395.
f4e3b70
@pixeltrix pixeltrix Make MemCacheStore work with Ruby 1.9 and -Ku de7fecb
@joshk 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
@jonleighton jonleighton Merge pull request #1437 from joshk/ar_collection_new_alias
Ar collection new alias
6687670
@jonleighton jonleighton Merge pull request #1437 from joshk/ar_collection_new_alias
Ar collection new alias
3c09ae7
@jonleighton jonleighton Merge pull request #1437 from joshk/ar_collection_new_alias
Ar collection new alias
5ca2e57
Commits on Jun 01, 2011
@pixeltrix 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
@winterchord winterchord Fix issue #1272
Set reverse_order_value when asked to reverse_order().
Do the actual reversal in build_arel.
8a4013d
@vatrai vatrai AttributeMethodTest test fix #jruby 26d0f42
@arunagw arunagw Adding comment 7f34d5b
@arunagw arunagw Loading files if PLATFORM available. 98cd7ca
@arunagw arunagw Using java_import instead of import. Need with rake 0.9.0 60c9b7b
@arunagw arunagw Fixing XMLMini_JDOM 88813e1
@arunagw arunagw Fixed tests for JDOM. File From Xml is working now 425c892
@arunagw arunagw Indented as required. 68fc6ba
@jonleighton jonleighton Merge pull request #1444 from arunagw/3-1-stable
Jruby fixes for 3 1 stable
df0e2db
@arunagw arunagw Import => java_import performance test #jruby 42b8fb1
@jonleighton jonleighton Merge pull request #1451 from arunagw/3-1-stable
3-1-stable import to java_import
1243683
@jonleighton jonleighton Fix broken test. You know, the merge button will be the end of us... 03d087d
Commits on Jun 02, 2011
@dhh 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
@wycats wycats Start moving some logic from being embedded in AV into the Rails Spro…
…ckets extensions
866889c
@wycats wycats Move javascript/css helpers into the Sprockets helper and just have t…
…hem override the old behavior
476d679
@wycats wycats Move the last pockets of Sprockets stuff into the Sprockets directory ee018be
@wycats wycats Make sure that Sprockets::Helpers::RailsHelper can be found 7a8d3d7
@wycats wycats Update generator config to support hiding namespaces and pass the app…
… into generator blocks
af83304
@wycats wycats Renaming helper in the Rake task, but why is this needed in the first…
… place? (paging JP)
b5ac04a
@wycats wycats Pull back in asset_path 5b300a9
Commits on Jun 03, 2011
@wycats wycats Remove explicit sprockets usage. This should have come over in the me…
…rge, but for some reason it didn't.
de63942
@pixeltrix pixeltrix Don't double assign attributes - closes #1467. 67f5c07
@wycats wycats Another missed piece of the merge. I screwed up this merge. I am sorr…
…y :(
80745f1
@lardawge lardawge Generate correct asset paths when using asset pipeline 9b55007
@lardawge lardawge Don't need asset_path twice 8b8e181
@lardawge lardawge Bring inline with master 3b75ec9
Commits on Jun 04, 2011
@wycats wycats Merge pull request #1473 from lardawge/fix_broken_asset_pipeline_paths
Fix broken asset pipeline paths
639dca4
@wycats wycats Restructure TemplateAssertions-related code to eliminate circular req…
…uires.

Also, no need to include dependencies in AS::Concerns inside included blocks.
63467a4
@vijaydev vijaydev fixes Rake::GemPackageTask deprecation warnings from rake 0.9.0 a81c2ec
@vijaydev vijaydev fixes Rake::RDocTask deprecation warnings from rake 0.9.0 b6040f4
@fxn fxn specify image dimensions for pictures in the guides credits page aedc627
@fxn fxn adds Ryan Bigg to the credits page of the guides, he is the author of…
… the new configuring guide
7bbcf53
@fxn fxn move Ryan up, since the list is ordered by surname 63eab0b
@fxn fxn adds Vijay Dev to the new Rails Guides Reviewers team 3939fbd
@jonleighton 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
@jonleighton 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
@jonleighton jonleighton Bring back oracle specific crap 550064c
Commits on Jun 05, 2011
@jonleighton jonleighton Fix typo 6925423
@jonleighton jonleighton Fix adapter_test.rb to make no assumptions about the database name 04d238b
@arunagw 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
@josevalim josevalim Merge pull request #1495 from arunagw/fixed_failing_isolated_test
Fixed failing isolated test
af1c020
@jonleighton jonleighton load_path_test.rb is also dependent on RAILS_ENV=development 3ac805b
Commits on Jun 06, 2011
@josevalim josevalim Merge pull request #1478 from arunagw/warning_cherry-picks
Some Cherry-picks for 1.9.2 warning removal
0c4fd88
@arunagw arunagw framework_test.rb also dependent on RAILS_ENV=development 710dfff
@arunagw arunagw loading_test.rb with RAILS_ENV=development 077ffe0
@arunagw arunagw Fix for CI server. Dependent on RAILS_ENV=development e909fa4
@josevalim josevalim Merge pull request #1505 from arunagw/3-1-stable
Cherry-picked from master to fix the build
ae534f2
@amatsuda 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
@amatsuda amatsuda Ensure RDoc::Task exists even if 'rdoc/task' was not required f3fa66f
@josevalim josevalim Merge pull request #1508 from vijaydev/rake_rdoc_fixes_cherry_picks
Rake deprecation fixes - cherry picks
1bc159f
@jonleighton jonleighton Solve the RAILS_ENV problem in the railties tests in a more generic way 1f59c57
@dhh dhh Depend on latest Sprockets beta 50a7e8e
@jonleighton 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
@jonleighton jonleighton Fix double definition of #teardown. Thanks @mike-burns :+1: 4a39581
@jonleighton jonleighton Make sure that the build/drop database rake tasks take account of the…
… test/config.yml config
dc4da12
@jonleighton jonleighton Don't ensure all keys in build_results are only written once, otherwi…
…se we get false positive builds reported.
d7edce2
@smartinez87 smartinez87 Fix fixed-fonts stlye on rails_on_rack guide. e5fb901
@smartinez87 smartinez87 Fix grammar mistake. Lets vs let's. 815dd81
@smartinez87 smartinez87 Revert this, commited by mistake. 20f1f9e
@narwen narwen On "contribute" guide: remove mention of LH 8c358d0
@narwen narwen Stop linking API Guidelines to GitHub wiki e856157
@narwen narwen Stop linking Rails guidelines to GitHub wiki 64db0ee
diego Added missing quote in grouped_options_for_select example 9d275a8
@smartinez87 smartinez87 Fix font styling on associations.rb c32ba39
@r00k r00k Don't you lie to me! 7dcbbae
@r00k r00k Improve 'Joining Tables' section with additional examples and explana…
…tion.
5eaf012
@r00k r00k Copy edits 64148ab (previous commit). Please squash at will. 97fd8c0
@r00k r00k Fix incorrect description of the returned results. 8b72166
@vijaydev vijaydev document aliases for commands and update rails versions 1d654cc
@vijaydev vijaydev fix typo 39e5cbc
@vijaydev vijaydev removed references to old remote_* helpers; add info about 3.1 adding…
… multipart option to a form with file_field automatically
5ab4b9e
@evanfarrar evanfarrar Typo and sentence restructuring 3a22027
@htanata htanata Update Rails coding conventions link. 2e7a039
@htanata htanata Fix punctuation. 7ff491c
@mjroghelia 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
@guilleiguaran guilleiguaran Removing trailing white-spaces 48b9096
@amatsuda amatsuda s/an/a/ 4c716e6
@amatsuda 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
@vijaydev vijaydev add alias info for runner command f51cea6
@r00k r00k Change hashrocket spacing to match conventions. f4a4d5f
@brianp 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
@vijaydev vijaydev fix indentation, fixed-width for nils 40e7682
@vijaydev vijaydev remove stray ( 69b3c9c
@linuxonrails linuxonrails FIXED: error with url_for & link_to when we have nested resources. f7ac354
ganesh updated Changelog 5e44184
@sikachu sikachu Revise documentation indentation from [7999050] eade591
@waynn waynn add a missing "the" and normalize the use of periods. d57cfc1
@vijaydev vijaydev use clearer variable name in examples 424d725
@rohit 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
@vijaydev vijaydev fix incorrect output 0e8857b
@vijaydev vijaydev some grammatical corrections dff7c62
@vijaydev vijaydev fix incorrect module name for wrap parameters 2974869
@vijaydev vijaydev minor corrections in generators guide b1919b1
@vijaydev vijaydev s/ActiveRecord/Active Record according to api guidelines 3432775
@vijaydev vijaydev correct code indendation in the initialization guide 670ae12
@guilleiguaran guilleiguaran Remove trailing white-spaces 527499c
@vijaydev vijaydev annotate class_eval method for active resource schema attributes 47670a5
@vijaydev vijaydev minor edits in migrations guide 5d4b73a
@guilleiguaran guilleiguaran Change http://api.rubyonrails.com to http://api.rubyonrails.org c1ce168
@Arsen7 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
@vijaydev vijaydev document assets related rake tasks 3962d94
@vijaydev vijaydev rearrange sections of the commandline guide giving more importance to…
… rake tasks
7262d92
@vijaydev vijaydev up and down are no longer class methods in a migration 59016b9
@vijaydev vijaydev comment the recorder methods fa1aad7
@vijaydev vijaydev add info about docrails policy on changelogs 95f3046
@tenderlove tenderlove please use ruby -I lib:test path/to/test.rb, or export RUBY_OPT e504101
@tenderlove tenderlove add test to the include path b8714ed
@tenderlove tenderlove updating configs for oracle 10eb479
@tenderlove tenderlove do not muck with the load path, that is the test task responsibility 50d331d
@tenderlove tenderlove more oracle fixes 606108a
@tenderlove tenderlove set the environment variable from the rake file 945b131
@tenderlove tenderlove oops! add parens so the block is properly bound 75fb26a
Commits on Jun 07, 2011
@tenderlove tenderlove make sure AR isolated tests set the environment variable 377b15a
@fxn fxn adds missing require 645f138
@guilleiguaran guilleiguaran Fixing Rails::Server#app under Rack::URLMap 8d758d8
@josevalim josevalim Merge pull request #1527 from guilleiguaran/3-1-stable
Rails::Server#app should be nice with Rack::URLMap (3.1 stable)
69b25eb
@chriseppstein chriseppstein Use the sass-rails release candidate until full release. 654514a
@tenderlove 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
@fxn fxn sprockets gzips assets now
Conflicts:

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

	railties/guides/source/configuring.textile
b7ea35d
@NZKoz 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
6766caf
@tenderlove tenderlove bumping to rails 3.1.0.rc2 d846f4b