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 Jul 23, 2011
@grzuy grzuy Fix ActiveSupport::Cache::FileStore#file_path_key does not work if in…
…itialized with Pathname
48e134b
@spastorino spastorino Merge pull request #2213 from grzuy/3-1-stable
ActiveSupport::Cache::FileStore#file_path_key does not work if initialized with Pathname
66610db
@tenderlove tenderlove remove unused gems from Gemfile b2285ba
@kommen kommen Fix fragment cache helper regression on cache miss introduced with 03…
…d01ec.

Contains following patches cherry-picked from @lhahne's 3-0-stable branch:

* Added tests for the output_buffer returned by CacheHelper (c476a6b)
The output_buffer returned by CacheHelper should be html_safe if the original buffer is html_safe.

* made sure that the possible new output_buffer created by CacheHelper is of the same type as the original (39a4f67)
15c8bf1
@spastorino spastorino Merge pull request #2219 from kommen/fix_fragment_caching_squashed
Fix fragment caching (squashed commits)
f41a98e
@spastorino spastorino Remove jquery-rails from Gemfile ae65c0b
@spastorino spastorino Merge pull request #2194 from cldwalker/after_initialize
Fix after_initialize and Base.create edge case
1983007
@gramos gramos - added test case for issue:
  #1951
  Namespaced model partial_path is wrong in namespaced controllers
1f3f9f1
@spastorino spastorino Revert "Merge pull request #2194 from cldwalker/after_initialize"
This reverts commit 1983007, reversing
changes made to ae65c0b.
434bbb0
Commits on Jul 24, 2011
@dmathieu dmathieu rake assets:precompile should always perform caching - Closes #2199 038e493
@tenderlove tenderlove simplify singleton_class? method be48abb
@gramos gramos - added ActionView::PartialRenderer#merge_path_into_partial(path, par…
…tial)

  fix issues/1951
8d0e3c9
@Empact Empact Simple fix to the NoMethodError noted in #2177.
Unfortunately #respond_to?(:controller) won't work as suggested, nor will respond_to?(:params), as #controller is present and #params is delegated to #controller. #delegate makes respond_to? return true regardless whether the target responds to it.
dbca49b
@tenderlove tenderlove Merge pull request #2229 from gramos/fix-issue-1951
Fix issue 1951 Namespaced model partial_path is wrong in namespaced controllers
7f7ed15
@tenderlove tenderlove just use normal ruby for stubbing 5b88219
@rdoddaka rdoddaka Improve rails:template undefined LOCATION variable error message fixed fb6a76c
@spastorino spastorino Merge pull request #2235 from arunagw/location_var_fix_cherry-pick
Location var fix cherry pick from master to 3-1-stable
b2eaf96
@gnagno gnagno now the documentation reflects the actual returned value for a missin…
…g translation
fdc0468
@joefiorini joefiorini Tests now require MySQL2 adapter in order to run 9a16cc0
@evanfarrar evanfarrar Replaced ‘ with ' in the guides. 505a43b
@evanfarrar evanfarrar Changed several instances of British English to be American English e593f8c
@carols10cents carols10cents Changing Textile emphasis underscores to em tags; the link with under…
…scores that follows is causing the emphasis underscores to be parsed incorrectly.

This appears to be a bug with RedCloth; parsing with official Textile creates the HTML that I expect. I have filed ticket # 226 on RedCloth's lighthouse project and I will attempt to fix the problem with RedCloth.

This commit is a workaround for the RedCloth bug that will give this guide the right formatting.
582a621
@oem oem Changed a few instances of of words in the API docs written in Britis…
…h English to

American English(according to Weber)

Conflicts:

	actionpack/lib/action_controller/metal/request_forgery_protection.rb
	railties/lib/rails/engine.rb
8b30f1d
@oem oem Missed a few instances of British English spelling in the last commit
oh and obviously I meant according to Webster, not Weber
2793bcd
@fxn fxn Revert "Tests now require MySQL2 adapter in order to run"
Reason: Setting up MySQL and Postgres needs installing servers
and libraries that perhaps you don't need in your machine. We
think fixing a bug in Active Support without running the suite
of Active Record for all possible drivers is OK. That's why
we explain first --without db, and after that we cover AR
specifically. mysql2 is no different than mysql or pg in that
sense.

This reverts commit 50d5e0f.
d9b6f89
@mikehoward mikehoward Changed wording of paragraph 2.1.1 Models to clarify table/model
relationship.

changed wording 'one table ... corresponds to one model' to 'each table
...'
998a3ef
@mikehoward mikehoward Clarified notes in 3.2 Creating the Blog Application
Changed descriptino of Gemfile to add reference to Bundler
Changed description of README to add 'You should edit ...'
Changed description of Rakefile to reflect dynamic nature of Rakefile
and point to app/lib/tasks/ as the place to add app-specific rake tasks.
f53c7fb
@jasonnoble jasonnoble Added some context for rack apps, linked to the Rails on Rack guide. fa0751a
Ken Ip Update "Getting Started" for Rails 3.1
Add additional files generated by rails 3.1 generator.
b14b643
@jasonnoble jasonnoble Added explanation to Components of Rails to help users not get hung u…
…p on details
d62e846
@jasonnoble jasonnoble Added link to the RubyGems User's Guide 2d689d5
@jasonnoble jasonnoble Update guide to be based on Rails 3.1. 75f0298
@jasonnoble jasonnoble Modified the content based on vijaydev's comment 27f4d73
@jasonnoble jasonnoble Add link to the Layouts and Rendering guide to explain more on view t…
…emplates
24cbee0
@jasonnoble jasonnoble Moved ActionController, ActionView and ActionDispatch sections under …
…ActionPack
6950561
@fxn fxn little details seen while reviewing eea9ca8
@pixeltrix pixeltrix Use top level Rails constant 4b1b9ac
Commits on Jul 25, 2011
@dchelimsky dchelimsky Paramify param values in controller tests. 7fd726d
@josevalim josevalim Merge pull request #2253 from dchelimsky/stringify-parameter-values-i…
…n-tests-branched-off-3-1-stable

Stringify parameter values in tests branched off 3-1-stable
46141eb
@thedarkone thedarkone Make polymorphic_url calls go through application helpers again.
This brings back the ability to overwrite/extend url generating methods in application heleprs.
9395e89
@josevalim josevalim Merge pull request #2256 from thedarkone/polymorphic-url-helper-3-1
Backport #2252 into 3-1-stable
1d97a7c
@thedarkone thedarkone Bring back the ability to provide :order for update_all. 787194e
@spastorino spastorino Merge pull request #2257 from thedarkone/udpate-all-order-3-1
Backport #2251 into 3-1-stable
5bc0020
@davidtrogers davidtrogers Ensure the constraints block is only applied to the correct route
addresses issue #1907 - any routes that follow a route with a constraints
  block are inheriting the previous route's constraints.
8a55108
@spastorino spastorino Merge pull request #2260 from davidtrogers/3-1-stable
3 1 stable
05503f1
@sferik sferik Allow a route to have :format => true
When format is true, it is mandatory (as opposed to :format => false).
This is currently not possible with resource routes, which automatically
make format optional by default.
c41ecd7
@sferik sferik Add documentation for :format => true 78d151d
@josevalim josevalim Merge pull request #2263 from sferik/format_true
Allow a route to have :format => true
19a3c9b
@bmarini bmarini Fix example code for #validates_with instance method d4832f1
@vrish88 vrish88 Provide consistant indentation for the example code 3cbf9a6
@jasonnoble jasonnoble Wrapped text content to 120 chars 5d7343f
@vrish88 vrish88 Rewrite apart of the REST section to be in the present tense
Conflicts:

	railties/guides/source/getting_started.textile
ceee7ce
@jasonnoble jasonnoble Reformatted to 80 chars. be584c4
@jasonnoble jasonnoble Add a note about the fact that the Windows prompt will look different…
… than the linux/osx prompt
d80ac95
@jasonnoble jasonnoble Fix TIP formatting issue 290849c
John Fixed Typo 12faf80
@jasonnoble jasonnoble Remove "bundle install" section, as rails new ______ runs bundle inst…
…all for you
41c024d
@jasonnoble jasonnoble Update wording of TIP about --database option for rails new b2fc1e8
@jasonnoble jasonnoble Updated rails_welcome.png to latest Rails welcome page. e737b76
@jasonnoble jasonnoble Make the rails not found tip more explanatory. 9e34a41
@mikehoward mikehoward Updated migrations.textile to clarify Using Models in Your Migrations
Rewrote entire section including example code, error message, and work
around.
8fe7fda
@vrish88 vrish88 Update the TIP formatter to handle multiline tips
- includes 3 tests
75e0406
@jasonnoble jasonnoble Extend description of rails generate scaffold and what it's options a…
…ccomplish
0405394
@jasonnoble jasonnoble Fix two spaces after end of sentence. 4eb030e
@jasonnoble jasonnoble Add in a tip about opening two command prompt windows d4e8479
@mcmire mcmire Improve ch. 1 of the Form Helpers guide b3c06a2
@vijaydev vijaydev Revert "Update the TIP formatter to handle multiline tips"
This reverts commit e3dbe66.

Reason: Code changes are not allowed in docrails.
ebb4540
@vijaydev vijaydev Revert "Add in a tip about opening two command prompt windows"
This reverts commit 1e5fa59.

Reason: It's somewhat a grey area. We don't really want to tell the
users how they want to use the terminal.
ba19ddf
@fxn fxn let TIP and friends handle a multiline paragraph
Normally I would have done this in master, but there was already
a guide with wrapped content, so worked here. I am going to
cross-merge now.
81789b7
@spastorino spastorino Don't use Rack::Sendfile middleware if x_sendfile_header is not present e10dd20
@spastorino spastorino Remove unused use_sprockets config 0018402
@tenderlove tenderlove updating sprockets to beta 12 64cb34d
@tenderlove tenderlove bumping up arel version 6dcdcdc
@tenderlove tenderlove bumping to rc5 a518833
Commits on Jul 26, 2011
@spastorino spastorino Bump rack up. Closes #2107 ec2cac2
@spastorino spastorino Check that Rack::Sendfile is not included unless config.action_dispat…
…ch.x_sendfile_header is set
e83250a
@dmathieu dmathieu use sprocket's append_path and assert_match f44f412
@spastorino spastorino Merge pull request #2278 from dmathieu/fix_actionpack_3-1
Fix actionpack 3 1
bfc0b32
@tenderlove tenderlove fixing whitespace errors 5f6accf
@tenderlove tenderlove fixing tests on ruby trunk 1768b6c
@dgeb dgeb Include empty app/mailers directory in mountable and full plugins 9d93a44
@joshk joshk enable Travis CI irc notifications to #rails-contrib on irc.freenode.org 0094cab
@spastorino spastorino Merge pull request #2288 from joshk/3-1-stable
Irc notifications (from Travis with love)
8aa49ad
@spastorino spastorino Remove cruise files 8f67029
@dgeb dgeb fixed problem in which options[:html][:remote] would be overridden in…
… form_for() - fixes #2094
75366cb
@dgeb dgeb added test case for fix to issue #2094 b589f0c
@spastorino spastorino Merge pull request #2279 from jdelStrother/load_missing_constant
Constantize a regexp in Dependencies#load_missing_constant
8220777
@jdelStrother jdelStrother Replace unnecessary regexp in Dependencies#load_missing_constant 626798a
Commits on Jul 27, 2011
@lsylvester lsylvester fix some types in schema_test.rb 8dade49
@jonleighton jonleighton Add a proxy_association method to association proxies, which can be c…
…alled by association extensions to access information about the association. This replaces proxy_owner etc with proxy_association.owner.

Conflicts:

	activerecord/lib/active_record/associations/collection_proxy.rb
	activerecord/test/cases/associations_test.rb
7bf9b9a
@jonleighton jonleighton Update deprecation messages to point out the availability of proxy_as…
…sociation. Fixes #1148.
e13e25d
@christos christos Improve performance and memory usage for options_for_select with Ruby…
… 1.8.7
74a450d
@fxn fxn Merge pull request #2302 from christos/performant_options_for_select
Improve performance and memory usage for options_for_select with Ruby 1.8
348cd23
@josevalim josevalim Merge pull request #2287 from dgeb/3-1-mailers-in-plugins
Ensure that app/mailers gets created in new plugins
a9dea60
@josh josh Make Rails.application.assets available in initializers 1edfadf
@fxn fxn contrib app minor tweak 6f745f4
Commits on Jul 28, 2011
@thedarkone thedarkone Handle the empty array correctly. 09dd71c
@spastorino spastorino Merge pull request #2319 from thedarkone/errors-include-3-1
Backport #2305 into 3-1-stable
ac24a53
@spastorino spastorino Merge pull request #2295 from dgeb/mo-better-plugins
Improve dependency management and gemspec file for plugins
bba9c8d
@spastorino spastorino Tidy up a bit plugin new gemspec f2c8309
@tazsingh tazsingh Do not add files in assets/ directories to Sprockets b4ca7d3
@spastorino spastorino Merge pull request #2326 from castlerock/plugin_generator_fix
pluging generator test fix
b4cf291
@thedarkone thedarkone There is no need to be destructive with the passed-in options.
This fixes a bug that is caused by Resource/SingletonResource mangling resource options when using inline "multi"-resource declarations.
0753d0b
@thedarkone thedarkone Make use of the inherited initializer. 34c5089
@josevalim josevalim Merge pull request #2332 from thedarkone/resources-router-fix-3-1
Backport #2330 into 3-1-stable
7f5dc98
@spastorino spastorino Generated apps with --dev or --edge flags depend on git versions of s…
…ass-rails and coffee-rails
f2ade6f
Commits on Jul 29, 2011
@tenderlove tenderlove dump IO encoding value along with schema.rb so the file can be reload…
…ed. fixes #1592
4e1f6ab
@tenderlove tenderlove default writing the schema file as utf-8 d13df74
@tenderlove tenderlove delay backtrace scrubbing until we actually raise an exception. fixes #… 61c5c3d
Commits on Jul 30, 2011
@jonleighton jonleighton Revert "Replace inline lambdas with named methods" and "Don't wrap op…
…erations 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."

This reverts commits df63c99 and b17fd25.

The change had unintended side effects, please see #2337.

Conflicts:

	activerecord/test/cases/associations/has_many_associations_test.rb
048215a
Commits on Jul 31, 2011
@bradediger bradediger remove_possible_method: test if method exists
This speeds up remove_possible_method substantially since it doesn't
have to rescue a NameError in the common case.

Closes #2346.
f2657b0
@jonleighton jonleighton Merge pull request #2372 from bradediger/issue-2346-3-1-stable
Issue 2346 3-1-stable port
3c8d805
@arunagw arunagw skiping magic comment test. checking encoding_aware?
Loading AS encoding.
3248c5d
@josevalim josevalim Merge pull request #2373 from arunagw/31_schema_dumper_test_fix
3-1-stable schema dumper test fix
030bb71
@vijaydev vijaydev fixes #2368. rake about not showing the middleware, db adapter and db…
… schema version
c05ceac
@spastorino spastorino Merge pull request #2382 from vijaydev/rakeaboutfix3.1
Fix #2368 (3-1-stable)
7ee15e8
Commits on Aug 01, 2011
@thoefer2 thoefer2 modified fix #1872 according to jose valim´s suggestions 7b39dda
@josevalim josevalim Merge pull request #2307 from thoefer/3-1-stable-fix1872
Fix the issue where default_url_options is being cached on test cases. Closes #1872. Closes #2031.
86b792d
@spastorino spastorino Merge pull request #2393 from bdurand/fix_cache_read_multi
Fix ArgumentError in ActiveSupport::Cache::CacheStore.read_multi
17b0d2c
@spastorino spastorino Merge pull request #2324 from zenapsis/3-1-stable
Rails 3.1 throws a Errno::ENOTDIR if files are put in assets directories
1711731
Commits on Aug 02, 2011
@tenderlove tenderlove use File.directory? as Dir.exists? is only 1.9.2+ ebfad37
Commits on Aug 03, 2011
@cmeiklejohn cmeiklejohn Support backwards compatible interface for migration down/up with rai…
…ls 3.0.x.
55eadcc
@cmeiklejohn cmeiklejohn Ensure that .up and .down work as well. 96fc074
@tenderlove tenderlove add a migrate class method and delegate to the new instance 3e56758
@spastorino spastorino This dep is already defined in activerecord.gemspec 1f1bfaf
@spastorino spastorino Don't require assets group in production by default, you can change t…
…his default in the application.rb anyways
0c57ae1
@tenderlove tenderlove fixing deprecation notice for dynamic finders that use hashes. fixes #… c1b85ed
@tenderlove tenderlove make assert_difference error message not suck e63d3f7
@jonleighton jonleighton Quote these dates to prevent intermittent test failure. Suppose local…
… time is 00:50 GMT+1. Without the quoting, the YAML parser would parse this as 00:50 UTC, into the local time of 01:50 GMT+1. Then, it would get written into the database in local time as 01:50. When it came back out the UTC date from the database and the UTC date of two weeks ago would be compared. The former would be 23:50, and the latter would be 00:50, so the two dates would differ, causing the assertion to fail. Quoting it prevents the YAML parser from getting involved.

Conflicts:

	activerecord/test/fixtures/pirates.yml
26c410e
Commits on Aug 04, 2011
@spastorino spastorino Fix a bit precompile and lazy compile comments 5f05642
@tenderlove tenderlove fixing assert_difference issues on ruby 1.8 3727232
@tenderlove tenderlove we should not ignore all gems in here b0b7070
@vijaydev vijaydev move the note after the scaffold files listing d2c9c9e
@htanata htanata Fix two spaces between sententes on README.rdoc. 5b51e58
@albertoperdomo albertoperdomo Association and Callbacks guide: Added section on shortcut syntax 'va…
…lidates'.
d836413
@campbell campbell Explicitly included hashes in sentence regarding SQL-injection-safe f…
…orms
f9bd8b2
ejy Removed trailing slash of 'Download and installation' Github URL as p…
…er convention
740e531
@vijaydev vijaydev document meta method 7e494f0
@arunagw arunagw Extra "l" removed before h2. 8cefafb
@waynn waynn Superfluous "the". f21e8e0
@bratish bratish '/' was outside of anchor tag. e231c49
@vatrai vatrai Active Resouce guide initial load dcb965b
@vatrai vatrai Introduction for active resource 35a028d
@vatrai vatrai configuration for active resource d240ce8
@vatrai vatrai usages of active resouce 88c101b
@vijaydev vijaydev make the warning clear about the effect of using validates_associated…
… on both sides on an association.
c93adf8
@vijaydev vijaydev remove some parts of the section on shortcut helpers, document custom…
… validators
bac54a0
@vijaydev vijaydev prefer to use if..end unless the condition is simple/compact 2fb540e
@vijaydev vijaydev 3.1 release notes draft d016102
@vijaydev vijaydev 3.1 release notes - added AP and Railties sections 08f4a8c
@waynn waynn "blog" is more common than "weblog" these days. 478dc71
@arunagw arunagw Rack::Sendfile is no more default middleware. 9232033
@arunagw arunagw Adding more info as rake about is fixed e3e1109
@vijaydev vijaydev 3.1 release notes Active Record changes, Architectural changes and
organizing sections.
ed246f5
@waynn waynn typo in "wont" 20251c8
@vatrai vatrai Active Resource - guide for reading and writing data 35eb96f
@vatrai vatrai Active Resource - guide for create 814e05e
@vatrai vatrai Active Resource - guide for update/save 566d2b9
@vatrai vatrai Active Resource - guide for destroy 6b361aa
@pbflinn pbflinn Fix typo 'console' -> 'constant' 690eae7
@vijaydev vijaydev fixed incorrect tags 8207d0c
@vijaydev vijaydev minor changes in migrations guide 19eb720
@vijaydev vijaydev typo fix b0cf7ea
@judearasu judearasu grammatical changes 346cd04
@waynn waynn The trailing '/' isn't being picked up by Github anyway, and the link…
… works as is.
3694a6c
@raysrashmi raysrashmi The trailing '/' isn't being picked up by Github anyway, and the link…
… works as is.
34d69b3
@fxn fxn Revert "grammatical changes"
Reason: As discussed in GitHub, it is debatable, and present tense
is fine (and simple, and preferred).

This reverts commit 54ccda9f0a5e4a5e72a4c159dc8787faaf65e8a2.
ab87475
@fxn fxn Revert "Explicitly included hashes in sentence regarding SQL-injectio…
…n-safe forms"

Reason: The hash form is secure, and preferred over the array form if possible.

This reverts commit 6dc7495.
9efc57f
Commits on Aug 05, 2011
@guilleiguaran guilleiguaran Fix AR test suite error under Rubinius 2.0 b1be622
@spastorino spastorino Fix test for Rubinius 8118e41
@spastorino spastorino Revert "to_key on a destroyed model should return nil". Closes #2440
This reverts commit c544872.
216d79e
Commits on Aug 06, 2011
@spastorino spastorino Avoid generating app/views/layouts/application.html.erb on mountable …
…engines, just generate the namespaced one
7af63a9
@spastorino spastorino Use rake >= 0.9.3.beta.1 in Ruby 1.9.3 741151c
@spastorino spastorino Merge pull request #2450 from guilleiguaran/activesupport-gzip-1.8
Fix ActiveSupport::Gzip under Ruby 1.8.7. Closes #2416
704e9c8
Commits on Aug 07, 2011
@josevalim josevalim Test against 1.9.3 as well. 33d02f1
@spastorino spastorino x_sendfile_header now defaults to nil and production.rb env file doesn't
set a particular value for it. This allows servers to set it through
X-Sendfile-Type, read
https://github.com/rack/rack/blob/master/lib/rack/sendfile.rb for more
info. Anyways you can force this value in your production.rb
eff7fdd
@spastorino spastorino Merge pull request #2455 from vijaydev/patch-7
Edit changelog to mention about x_sendfile_header default change
5435787
@Gregg Gregg Added irregular zombie inflection, so zombies no longer gets singular…
…ized into zomby
dfcecde
@fxn fxn guides generation: apparently this workaround for RedCloth is not nee…
…ded anymore
ed85772
Commits on Aug 08, 2011
@josh josh Merge pull request #2448 from igrigorik/master
Asset pipeline fixes: clear out tmp cache and use environment in digest generation
Conflicts:

	railties/test/application/assets_test.rb
509a98a
@spastorino spastorino Initialize config.assets.version the same way it's done in Sprockets d008c99
@jonleighton jonleighton Make it the responsibility of the connection to hold onto an ARel vis…
…itor for generating SQL. This improves the code architecture generally, and solves some problems with marshalling. Adapter authors please take note: you now need to define an Adapter.visitor_for method, but it degrades gracefully with a deprecation warning for now.

Conflicts:

	activerecord/lib/active_record/relation/finder_methods.rb
	activerecord/test/cases/adapter_test.rb
dd944cb
@jonleighton jonleighton Fully marshal AR::Base objects. Fixes #2431. c202c10
@jonleighton jonleighton Bump arel version
Conflicts:

	activerecord/activerecord.gemspec
f1c90ce
@jonleighton jonleighton Remove TODO comment I didn't mean to commit 6e2e060
Commits on Aug 09, 2011
@tenderlove tenderlove reduce file stats by improving our dir glob pattern 4c49286
@jonleighton jonleighton Okay, the new incompatible arel is now called 2.2 and the sun shines …
…upon thee once more
561e8a7
@spastorino spastorino rake assets:precompile defaults to production env 004bb66
Commits on Aug 10, 2011
@tenderlove tenderlove add the gem requirement for sqlite3 47c6a77
@tenderlove tenderlove Revert "Ensure original exception message is present in both Template…
…::Error#message and Template::Error#inspect."

This reverts commit 403b06e.

The call to `message` calls `inspect` on our exception.  The exception
holds a reference to the environment, and the controller.  This string
becomes very large, and the call to `super` dups the string (in tern
doubling the memory used).  I'm reverting this for 3.1 but leaving the
commit on master.  We should stop holding references to so many objects
and reduce the size of our inspect.
cdf6251
Commits on Aug 11, 2011
@spastorino spastorino Merge pull request #2489 from grzuy/master
Remove parameters_for_url from form_tag method header
83d9398
@spastorino spastorino Merge pull request #2497 from akaspick/url_for_fix
When calling url_for with a hash, additional (likely unwanted) values (such as :host) would be returned in the hash
d9d78d4
Commits on Aug 13, 2011
@arunagw arunagw We actually don't need a reverse_merge! here. dup removed was giving …
…error with nil class.
d761ec4
@spastorino spastorino Merge pull request #2512 from arunagw/cant_dup_on_nil_3-1-stable
Cant dup on nil 3 1 stable
5b6ac34
@jonleighton jonleighton Work around for lolruby bug. (Read on for explanation.)
We were experiencing CI test failures, for example:

* 3-1-stable: http://travis-ci.org/#!/rails/rails/builds/79473/L407
* master: http://travis-ci.org/#!/rails/rails/builds/79507/L80

These failures only happened on 1.8.7-p352, and we were only able to
reproduce on the Travis CI VM worker. We even tried creating a new 32
bit Ubuntu VM and running the tests on that, and it all worked fine.

After some epic trial and error, we discovered that replacing the
following:

  fuu = Marshal.load(Marshal.dump(fuu))

with:

  marshalled = Marshal.dump(fuu)
  fuu = Marshal.load(marshalled)

seemed to prevent the failure.

We have NO IDEA why this is. If anyone has some great insight to
contribute then that is welcome. Otherwise, hopefully this will just
help us get the CI green again.

Many thanks to @joshk for help with sorting this out.
2db0455
@jonleighton jonleighton Fix default scope thread safety. Thanks @thedarkone for reporting. af96a91
@jonleighton jonleighton Perf: don't mess around with thread local vars unless we actually nee…
…d to
cf013a6
@myronmarston myronmarston Allow ActiveRecord observers to be disabled.
We have to use Observer#update rather than Observer#send since the enabled state is checked in #update before forwarding the method call on.
fea7359
@spastorino spastorino Merge pull request #2518 from myronmarston/fix_active_record_observer…
…_disabling_3-1

Fix active record observer disabling for 3-1-stable
41ce161
Commits on Aug 14, 2011
@arunagw arunagw Bringing back the jquery-rails. One test is dependent. 322b978
@arunagw arunagw Need to use initializers true here to pass the test. 5a5171b
@spastorino spastorino Merge pull request #2522 from arunagw/railties_test_fix
Railties test fix
17154e3
@josevalim josevalim Ensure changing RAILS_GROUPS will load the proper dependencies. 0e19c7c
Commits on Aug 15, 2011
@jonleighton jonleighton Deprecate the use of non-public methods by Module#delegate aa1d1e4
@jonleighton jonleighton Fix deprecation warnings due to private methods which are delegated to. 1aab850
@jonleighton jonleighton Fix the line number in the backtrace when Module#delegate raises 75d5195
@jonleighton jonleighton Removing unnecessary require, solve 'circular require considered harm…
…ful' warning.
68cb618
@arunagw arunagw Including delegation 801cd66
@jonleighton jonleighton Merge pull request #2535 from arunagw/delegation_fix
Delegation fix
7a9da9c
@jonleighton jonleighton Ensure empty has_many :through association preloaded via joins is mar…
…ked as loaded. Fixes #2054.
6bb6519
@jonleighton jonleighton Update travis config on @joshk's instructions 81151eb
@spastorino spastorino rake assets:precompile executes in production environment as default …
…if RAILS_ENV was not provided
28e250e
@arunagw arunagw Notification Test Fix f4e535e
@jonleighton jonleighton Merge pull request #2538 from arunagw/notifications_test_fix
Notifications test fix
e749abc
@jonleighton jonleighton Support updates with joins. Fixes #522.
Conflicts:

	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
	activerecord/test/cases/relations_test.rb
044fb8c
@jonleighton jonleighton Support for multi-table updates with limits, offsets and orders
Conflicts:

	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
e81e508
@jonleighton jonleighton Refactor building the update manager 24ade58
@jonleighton jonleighton Use a SelectCore rather than a full SelectManager e85c644
@jonleighton jonleighton use update.key instead of update.ast.key. make better use of select m…
…anager.
eff8aee
@jonleighton jonleighton Use new SelectManager#projections= method c701b3f
@jonleighton jonleighton Use new SelectManager#source method c6bf713
@jonleighton jonleighton Bump arel dependency c388a95
Commits on Aug 16, 2011
@jonleighton jonleighton Don't refer to ActionController::Base in the wrap_parameters initiali…
…zer - use config object instead. Cuts about 15% off the load time. (#734)
6cf15ae
@jonleighton jonleighton Be more lazy about creating time zone objects. Decreases startup time…
… by about 10%. (#734)
72de6ab
@jonleighton jonleighton Fix wrap_parameters initializer template 4b70376
@jonleighton jonleighton Fix tzinfo require (it broke test_raises_when_an_invalid_timezone_is_…
…defined_in_the_config in railties)
3594102
@jonleighton jonleighton Don't reference ActiveRecord::Base in initializers/wrap_parameters.rb…
…. Use config.active_record instead. This yields about a 20% decrease in startup time because it means that the connection is not created immediately on startup. Of course, this is only useful if you are not going to immediately use the database after startup.
458128d
@jonleighton jonleighton Fix assets tests in railties 0ab65e8
@vijaydev vijaydev fix misleading comment (originally made by Tate Johnson, we lost this…
… commit while porting to the rails repo)
388f09c
@vijaydev vijaydev document alias for rails runner 9e9b127
@vijaydev vijaydev rephrase how the verbose methods in a migration work 073d9ff
@raul raul Action Mailer guide update: the :to parameter now supports both Strin…
…g and Array values to indicate recipients.
92d3b51
@raul raul Action Mailer guide: mention how to use :cc and :bcc parameters. 282ee95
@raul raul Typo dbd72be
@cameel cameel Fix a typo in 'Configuring Rails Applications' guide
- The initializer is called `set_autoload_paths`, not `set_autoload_path`. See https://github.com/rails/rails/blob/master/railties/lib/rails/engine.rb#L506
4eac844
@vijaydev vijaydev minor changes in app templates guide 0c3bdc0
@vijaydev vijaydev assets guide - add info about require_directory, minor rephrasings d8c6bab
@jem jem Fixed mistakes in layouts/rendering guide about yield
yield(:unspecified_block) actually returns true even if :unspecified_block never
exists. This means you can't use the form yield(:unspecified_block) or yield.
927d3c2
@smartinez87 smartinez87 Document Hash#extract!. ebf0cc4
@vijaydev vijaydev document Array#append and Array#prepend methods in AS guide f3f5a8f
@JDutil JDutil Fix formatting of active_record_validations_callbacks.textile so guid… 4b4e67f
@jonleighton jonleighton Use lazy load hooks to set parameter wrapping configuration. This mea…
…ns that it doesn't force Action Controller / Active Record to load, but it doesn't fail if they have already loaded. Thanks @josevalim for the hint.
29d0ce0
@fxn fxn syncs the 3.1 release notes and asset pipeline guide with master ae69c4c
@fxn fxn Merge branch '3-1-stable' of github.com:rails/rails into 3-1-stable 2330c0c
@jonleighton jonleighton Fix non-public method warning in Module#delegate. Fixes #2548. c238ba0
@tenderlove tenderlove Properly escape glob characters. 09ad48f
@tenderlove tenderlove prevent sql injection attacks by escaping quotes in column names f9b642c
@tenderlove tenderlove Tags with invalid names should also be stripped in order to prevent
XSS attacks.  Thanks Sascha Depold for the report.
66c3e31
@tenderlove tenderlove properly escape html to avoid invalid utf8 causing XSS attacks a19ee5c
@tenderlove tenderlove bumping to 3.1.0.rc6 633a569