Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
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: Backoo/rails
...
head fork: Backoo/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 24, 2011
@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
@jonleighton jonleighton Allow polymorphic has_one to work when the association is set before …
…the owner has been saved. Fixes #1524.
f5f020b
@jonleighton 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
@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
a06fec6
@tenderlove tenderlove bumping to rails 3.1.0.rc2 2664897
@cmeiklejohn cmeiklejohn Fragment caching needs to operate on the pure output, not the
safebuffer.
eb85169
@sikachu sikachu Fix `simple_format` helper to work correctly with the new SafeBuffer …
…rule.

This has been ported from `3-0-stable` [ed37964]
509aa66
@sikachu 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
@sikachu 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
@josevalim josevalim Merge pull request #1546 from sikachu/31safebuffer
Fix failing ActionPack tests on 3-1-stable
623c16f
@rsim 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
@guilleiguaran guilleiguaran Allow multiple sources in Sprockets helpers 6e9714c
@josevalim josevalim Merge pull request #1557 from guilleiguaran/multiple-sources-sprocket…
…s-3-1

Multiple sources in sprockets helpers (backported from master)
caa0b1d
@tardate 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
@josevalim 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
@josevalim josevalim Merge pull request #1562 from sikachu/3-1-i18n-convention
Brought back alternative convention for namespaced models in i18n.
a40833c
@sikachu sikachu Update CHANGELOG to mention the new SafeBuffer change d2b0605
@bhavinkamani bhavinkamani fix connection not established error while running rake task
db:schema:dump
(cherry picked from commit e9a2ff8)
696a94b
@tenderlove tenderlove Merge pull request #1566 from sikachu/3-1-stable-changelog
Update CHANGELOG to mention the new SafeBuffer change
5c498fa
@fx fx use association_primary_key in AssociationScope#add_constraints
(cherry picked from commit 1f7c3d0)
31023da
@tenderlove tenderlove bumping to 3.1.0.rc3 aefd703
@dhh dhh If you set a js_compressor, it means that you want shit compressed --…
… we dont need a second option to turn that on
da8ba39
@dhh dhh Indention style + whitespace for readability fa6b12a
Commits on Jun 09, 2011
@sikachu sikachu Make sure `escape_javascript` return `SafeBuffer` if the incoming arg…
…ument is already html_safe
66dbef6
@tenderlove tenderlove Merge pull request #1610 from sikachu/3-1-stable-javascript
Make sure `escape_javascript` return `SafeBuffer` if the incoming argumen
9e71825
@chopmo chopmo Fix issue #1598 by adding a dependency to the RDoc gem. 7cca6a2
@dmathieu dmathieu don't reinitialize the arel_table unless the table_name changes dc73c2c
@tenderlove tenderlove ensuring that json_escape returns html safe strings when passed an ht…
…ml safe string
58ac641
@tenderlove tenderlove bumping to 3.1.0.rc4 279781f
Commits on Jun 10, 2011
@pixeltrix pixeltrix Ensure number helpers can handle HTML safe strings - closes #1597. 21a8dc7
@BDQ BDQ Ensure engine migrations are copied in the same sequence that they ar…
…e required.
2d4d7cc
@flippingbits flippingbits Prepend bundle exec to get the correct Rake version 0fab87f
@BDQ BDQ Updated test to ensure correct sequence when copying engine/plugin mi…
…grations.
b48f809
@josevalim josevalim Merge pull request #1630 from BDQ/engine_migrations_3_1
Ensure engine migrations are copied in correct sequence for 3.1
55fd92f
@sikachu sikachu Update CHANGELOG to mention the json_escape change ff48edd
@sikachu sikachu Make sure that we don't perform in-place mutation on SafeBuffer string
This will make sure `render :inline` is working.

Closes #1633
317e7c8
@vijaydev vijaydev fix typo
Conflicts:

	actionmailer/lib/action_mailer/base.rb
3de9d6b
@vijaydev vijaydev fix incorrect validation examples
Conflicts:

	railties/guides/source/active_record_validations_callbacks.textile
290708c
@vijaydev vijaydev minor fixes from 5acf76d a1a1d62
@vijaydev vijaydev use git: rather than https: in git remote urls; else, github asks for…
… passwords everytime we push
ed863a0
@vijaydev vijaydev fix generators guide url cc1e983
@vijaydev vijaydev remove generators section from command line guide in favor of the sep…
…arate generator guide
9ce59ac
@vijaydev vijaydev minor corrections in configuring guide 0ac6f8a
@bratish bratish Added acronym and reference link for Model–view–controller
Conflicts:

	README.rdoc
3e29f6a
@r00k r00k Describe the user name 'variable' in a way that doesn't confuse the t…
…extile parser.
f0d7aa2
@softwaregravy softwaregravy update palmist link on performance_testing e17d4e0
@ganeshkumar ganeshkumar shallow_path example updated b3ade0c
@thoefer2 thoefer2 Fixed minor typo: 'Arraw' to 'Array' dfca4d1
@fxn fxn shell out to run bundler on app generation, see rationale in the comment 467772b
@fxn fxn s/Bundle/Bundler/ 0127cf6
@tenderlove tenderlove Merge pull request #1641 from sikachu/3-1-stable-render-inline
Render inline fix for 3-1-stable
e88508e
Commits on Jun 11, 2011
Santiago Pastorino and José Ignacio Costa Revert "Make sure that we don't perform in-place mutation on SafeBuff…
…er string"

This reverts commit 317e7c8.
41b73fe
@josevalim josevalim Get rid of the alternate namespace lookup. 83efad0
@josevalim josevalim Add a deprecation for nested i18n namespace lookup. c19bd4f
@josevalim josevalim Update CHANGELOG. 0bbc145
Commits on Jun 12, 2011
@fxn fxn revises the pattern that excludes generator templates in API generation
With the previous pattern RDoc processed

    railties/lib/rails/generators/rails/plugin_new/templates/test/%name%_test.rb

and that resulted in a spurious "<" class.
7c4625a
@josevalim josevalim Make i18n tests more robust. edc0b2b
@fxn fxn backslash insertion for RDoc main page ignores code blocks, also adds…
… comments to explain what's this hack about
e51b8fb
@pixeltrix pixeltrix Define ActiveSupport#to_param as to_str - closes #1663 c1938d1
@benedikt benedikt Don't wrap operations on collection associations in transactions when…
… they are not needed, so the connection adapter does not send empty BEGIN COMMIT transactions blocks to the database.
b17fd25
@jonleighton jonleighton Move BEGIN and COMMIT into IGNORED_SQL rather than having them as a s…
…pecial case in assert_queries
5f43a2a
@jonleighton jonleighton Refactor tests to be less brittle bdd549a
@jonleighton jonleighton Replace inline lambdas with named methods df63c99
@jonleighton jonleighton Add support for using an ARCONFIG environment variable to specify the…
… location of the config.yml file for running the tests
fb1fd61
@thoefer2 thoefer2 Make sure to have a Hash under the i18n keys 'activerecord.attributes…
…' and 'activerecord.models' as this might not always be the case. See issue #1662.
1863f12
Commits on Jun 13, 2011
@josevalim josevalim Merge pull request #1675 from thoefer/3-1-stable
Fix for startup problems due to deprecation warning on nested models
00c12ff
@pixeltrix pixeltrix Rename tests to reflect associations 113466c
@pixeltrix pixeltrix Pass mass-assignment options to nested models - closes #1673. 45509ee
@pixeltrix pixeltrix Remove obsolete compatibility module a52b141
@jonleighton jonleighton Add Gemfile dependency for require_relative on mri18. This is a depen…
…dency of linecache which is a dependency of ruby-debug. However, the latest release of linecache (0.45) omits the dependency from its gemspec, causing the build to fail. I have emailed the maintainer so we should remove this when it's fixed upstream.
34d16e1
Commits on Jun 14, 2011
@jhtwong jhtwong Patch for rails#1460
[3.1.0.rc1] Plugins inside engines not eager-loaded properly and their
rake tasks ignored

Working with the new support for plugins inside engines in Rails 3.1,
I found that certain things that work for regular plugins don't work
for these new nested plugins. In particular, these methods in
Rails::Engine don't seem to understand that an engine could have
nested plugins:

#load_tasks
#load_generators
#load_console
#eager_load!

A solution which worked out for me is to move the calls to
railties.all { ... } from the overriding methods in Rails::Application
into Rails::Engine.
27d7083
@josh josh Fix appending sprockets paths 78587a5
@brianmario brianmario Turn off eager casting for mysql2, so ActiveRecord can lazily cast va…
…lues later. This should help performance for tables with complex types like DATETIME, TIMESTAMP
e56567c
@brianmario brianmario mysql2 casting changes require mysql2 >= 0.3.3 aeb7beb
@josevalim josevalim Merge pull request #1702 from brianmario/lazy-mysql2-casting
Turn off mysql2's eager-casting
5daef25
Commits on Jun 15, 2011
@pixeltrix pixeltrix Make MissingTranslation exception handler respect :rescue_format 8624996
@dmathieu dmathieu simplify to only one condition
Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
9267a43
@dmathieu dmathieu encode the uploaded file's name in the default external encoding - Cl…
…oses #869
f6fe174
@dmathieu dmathieu all requests are utf-8. Don't use the external encoding. fa55293
@daeltar daeltar Use assert_equal instead of assert in uploaded file test. 055a88d
@josevalim josevalim Merge pull request #1713 from dmathieu/3-1-cherry
Cherry picking encoding for 3.1
1f813d9
@ryanb ryanb namespace engine assets 40dd641
@spastorino spastorino Merge pull request #1716 from ryanb/namespace_engine_assets_3_1
Namespace engine assets for 3-1-stable
b4b27a3
@ryanb ryanb properly require javascript libraries when generating mountable engin…
…e (from baf2a9c)
7f96566
@spastorino spastorino Merge pull request #1719 from ryanb/fix_generated_engine_javascript
Fix generated JavaScript for mountable engine in 3-1-stable
677df61
@josevalim josevalim load_generators from engine should also handle self automatically. a7039df
Commits on Jun 16, 2011
@brianmario brianmario on second thought, lets keep casting on by default. it can be disable…
…d in database.yml by setting 'cast: false'
7b04e50
@brianmario brianmario bump mysql2 version d2b1340
@spastorino spastorino Merge pull request #1724 from brianmario/lazy-mysql2-casting
re-enable eager-casting for mysql2
014008d
@arunagw arunagw Mysql bump bf588c6
@vijaydev vijaydev fix merge errors eb89729
@josevalim josevalim Merge pull request #1460 from SAP-Oxygen/27d7083addd1bc8ecf0ef258a50c…
…5e36eb980060

[3.1.0.rc1] Plugins inside engines not eager-loaded properly and their rake tasks ignored
60a3190
@josevalim josevalim Merge pull request #1726 from arunagw/mysql_bump_3-1-stable
Mysql bump to 0.3.5
c5930b4
@spastorino spastorino Merge pull request #1728 from vijaydev/doc-merge-fix
Doc merge fixes (3-1-stable)
efa9695
@wycats wycats Make the API for compression consistent between JS and CSS. By defaul…
…t, users just need to say whether they want compression or not, and a default will be chosen by a Railtie. In the case of CSS, this default is already chosen by the sass-rails gem.

Users can still explicitly choose a compressor in their application.rb if they have a preference, but will usually want to let plugins choose defaults in their Railties.
f4db3d7