Skip to content
This repository
  • 6,012 commits
  • 247 files changed
  • 37 comments
  • 56 contributors
This comparison is big! We're only showing the most recent 250 commits
Jul 23, 2011
Santiago Pastorino Remove jquery-rails from Gemfile ae65c0b
Santiago Pastorino Merge pull request #2194 from cldwalker/after_initialize
Fix after_initialize and Base.create edge case
1983007
Gastón Ramos - added test case for issue:
  #1951
  Namespaced model partial_path is wrong in namespaced controllers
1f3f9f1
Santiago Pastorino Revert "Merge pull request #2194 from cldwalker/after_initialize"
This reverts commit 1983007, reversing
changes made to ae65c0b.
434bbb0
Damien Mathieu rake assets:precompile should always perform caching - Closes #2199 038e493
Aaron Patterson simplify singleton_class? method be48abb
Ben Woosley 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
Aaron Patterson Merge pull request #2229 from gramos/fix-issue-1951
Fix issue 1951 Namespaced model partial_path is wrong in namespaced controllers
7f7ed15
Aaron Patterson just use normal ruby for stubbing 5b88219
Santiago Pastorino Merge pull request #2235 from arunagw/location_var_fix_cherry-pick
Location var fix cherry pick from master to 3-1-stable
b2eaf96
Jul 24, 2011
Gastón Ramos - added ActionView::PartialRenderer#merge_path_into_partial(path, par…
…tial)

  fix issues/1951
8d0e3c9
Raghunadh Improve rails:template undefined LOCATION variable error message fixed fb6a76c
Ignazio Mostallino now the documentation reflects the actual returned value for a missin…
…g translation
fdc0468
Joe Fiorini Tests now require MySQL2 adapter in order to run 9a16cc0
Evan Farrar Replaced ‘ with ' in the guides. 505a43b
Evan Farrar Changed several instances of British English to be American English e593f8c
Carol Nichols 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
Ömür Özkir 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
Ömür Özkir Missed a few instances of British English spelling in the last commit
oh and obviously I meant according to Webster, not Weber
2793bcd
Xavier Noria 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
Mike Howard 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
Mike Howard 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
Jason Noble Added some context for rack apps, linked to the Rails on Rack guide. fa0751a
Update "Getting Started" for Rails 3.1
Add additional files generated by rails 3.1 generator.
b14b643
Jason Noble Added explanation to Components of Rails to help users not get hung u…
…p on details
d62e846
Jason Noble Added link to the RubyGems User's Guide 2d689d5
Jason Noble Update guide to be based on Rails 3.1. 75f0298
Jason Noble Modified the content based on vijaydev's comment 27f4d73
Jason Noble Add link to the Layouts and Rendering guide to explain more on view t…
…emplates
24cbee0
Jason Noble Moved ActionController, ActionView and ActionDispatch sections under …
…ActionPack
6950561
Xavier Noria little details seen while reviewing eea9ca8
Andrew White Use top level Rails constant 4b1b9ac
Jul 25, 2011
David Chelimsky Paramify param values in controller tests. 7fd726d
José Valim 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
Make polymorphic_url calls go through application helpers again.
This brings back the ability to overwrite/extend url generating methods in application heleprs.
9395e89
José Valim Merge pull request #2256 from thedarkone/polymorphic-url-helper-3-1
Backport #2252 into 3-1-stable
1d97a7c
Bring back the ability to provide :order for update_all. 787194e
Santiago Pastorino Merge pull request #2257 from thedarkone/udpate-all-order-3-1
Backport #2251 into 3-1-stable
5bc0020
Dave Rogers 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
Santiago Pastorino Merge pull request #2260 from davidtrogers/3-1-stable
3 1 stable
05503f1
Erik Michaels-Ober 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
Erik Michaels-Ober Add documentation for :format => true 78d151d
José Valim Merge pull request #2263 from sferik/format_true
Allow a route to have :format => true
19a3c9b
Ben Marini Fix example code for #validates_with instance method d4832f1
Michael Lavrisha Provide consistant indentation for the example code 3cbf9a6
Jason Noble Wrapped text content to 120 chars 5d7343f
Michael Lavrisha Rewrite apart of the REST section to be in the present tense
Conflicts:

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

Reason: Code changes are not allowed in docrails.
ebb4540
Vijay Dev 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
Xavier Noria 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
Santiago Pastorino Don't use Rack::Sendfile middleware if x_sendfile_header is not present e10dd20
Santiago Pastorino Remove unused use_sprockets config 0018402
Aaron Patterson updating sprockets to beta 12 64cb34d
Aaron Patterson bumping up arel version 6dcdcdc
Aaron Patterson bumping to rc5 a518833
Santiago Pastorino Bump rack up. Closes #2107 ec2cac2
Jul 26, 2011
Santiago Pastorino Check that Rack::Sendfile is not included unless config.action_dispat…
…ch.x_sendfile_header is set
e83250a
Damien Mathieu use sprocket's append_path and assert_match f44f412
Santiago Pastorino Merge pull request #2278 from dmathieu/fix_actionpack_3-1
Fix actionpack 3 1
bfc0b32
Aaron Patterson fixing whitespace errors 5f6accf
Aaron Patterson fixing tests on ruby trunk 1768b6c
Dan Gebhardt Include empty app/mailers directory in mountable and full plugins 9d93a44
Josh Kalderimis enable Travis CI irc notifications to #rails-contrib on irc.freenode.org 0094cab
Santiago Pastorino Merge pull request #2288 from joshk/3-1-stable
Irc notifications (from Travis with love)
8aa49ad
Santiago Pastorino Remove cruise files 8f67029
Dan Gebhardt fixed problem in which options[:html][:remote] would be overridden in…
… form_for() - fixes #2094
75366cb
Dan Gebhardt added test case for fix to issue #2094 b589f0c
Santiago Pastorino Merge pull request #2279 from jdelStrother/load_missing_constant
Constantize a regexp in Dependencies#load_missing_constant
8220777
Jonathan del Strother Replace unnecessary regexp in Dependencies#load_missing_constant 626798a
Jul 27, 2011
lsylvester fix some types in schema_test.rb 8dade49
Jon Leighton 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
Jon Leighton Update deprecation messages to point out the availability of proxy_as…
…sociation. Fixes #1148.
e13e25d
Christos Zisopoulos Improve performance and memory usage for options_for_select with Ruby…
… 1.8.7
74a450d
Xavier Noria Merge pull request #2302 from christos/performant_options_for_select
Improve performance and memory usage for options_for_select with Ruby 1.8
348cd23
José Valim Merge pull request #2287 from dgeb/3-1-mailers-in-plugins
Ensure that app/mailers gets created in new plugins
a9dea60
Joshua Peek Make Rails.application.assets available in initializers 1edfadf
Xavier Noria contrib app minor tweak 6f745f4
Jul 28, 2011
Handle the empty array correctly. 09dd71c
Santiago Pastorino Merge pull request #2319 from thedarkone/errors-include-3-1
Backport #2305 into 3-1-stable
ac24a53
Santiago Pastorino Merge pull request #2295 from dgeb/mo-better-plugins
Improve dependency management and gemspec file for plugins
bba9c8d
Santiago Pastorino Tidy up a bit plugin new gemspec f2c8309
Tasveer Singh Do not add files in assets/ directories to Sprockets b4ca7d3
Santiago Pastorino Merge pull request #2326 from castlerock/plugin_generator_fix
pluging generator test fix
b4cf291
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
Make use of the inherited initializer. 34c5089
José Valim Merge pull request #2332 from thedarkone/resources-router-fix-3-1
Backport #2330 into 3-1-stable
7f5dc98
Santiago Pastorino Generated apps with --dev or --edge flags depend on git versions of s…
…ass-rails and coffee-rails
f2ade6f
Jul 29, 2011
Aaron Patterson dump IO encoding value along with schema.rb so the file can be reload…
…ed. fixes #1592
4e1f6ab
Aaron Patterson default writing the schema file as utf-8 d13df74
Aaron Patterson delay backtrace scrubbing until we actually raise an exception. fixes #… 61c5c3d
Jul 30, 2011
Jon Leighton 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
Jul 31, 2011
Brad Ediger 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
Jon Leighton Merge pull request #2372 from bradediger/issue-2346-3-1-stable
Issue 2346 3-1-stable port
3c8d805
Arun Agrawal skiping magic comment test. checking encoding_aware?
Loading AS encoding.
3248c5d
José Valim Merge pull request #2373 from arunagw/31_schema_dumper_test_fix
3-1-stable schema dumper test fix
030bb71
Santiago Pastorino Merge pull request #2382 from vijaydev/rakeaboutfix3.1
Fix #2368 (3-1-stable)
7ee15e8
Aug 01, 2011
Vijay Dev fixes #2368. rake about not showing the middleware, db adapter and db…
… schema version
c05ceac
thoefer2 modified fix #1872 according to jose valim´s suggestions 7b39dda
José Valim 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
Santiago Pastorino Merge pull request #2393 from bdurand/fix_cache_read_multi
Fix ArgumentError in ActiveSupport::Cache::CacheStore.read_multi
17b0d2c
Santiago Pastorino Merge pull request #2324 from zenapsis/3-1-stable
Rails 3.1 throws a Errno::ENOTDIR if files are put in assets directories
1711731
Aaron Patterson use File.directory? as Dir.exists? is only 1.9.2+ ebfad37
Aug 02, 2011
Christopher Meiklejohn Support backwards compatible interface for migration down/up with rai…
…ls 3.0.x.
55eadcc
Christopher Meiklejohn Ensure that .up and .down work as well. 96fc074
Aaron Patterson add a migrate class method and delegate to the new instance 3e56758
Aug 03, 2011
Santiago Pastorino This dep is already defined in activerecord.gemspec 1f1bfaf
Santiago Pastorino Don't require assets group in production by default, you can change t…
…his default in the application.rb anyways
0c57ae1
Aaron Patterson fixing deprecation notice for dynamic finders that use hashes. fixes #… c1b85ed
Aaron Patterson make assert_difference error message not suck e63d3f7
Santiago Pastorino Fix a bit precompile and lazy compile comments 5f05642
Aug 04, 2011
Jon Leighton 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
Aaron Patterson fixing assert_difference issues on ruby 1.8 3727232
Aaron Patterson we should not ignore all gems in here b0b7070
Vijay Dev move the note after the scaffold files listing d2c9c9e
Hendy Tanata Fix two spaces between sententes on README.rdoc. 5b51e58
Alberto Perdomo Association and Callbacks guide: Added section on shortcut syntax 'va…
…lidates'.
d836413
Pete Campbell Explicitly included hashes in sentence regarding SQL-injection-safe f…
…orms
f9bd8b2
Removed trailing slash of 'Download and installation' Github URL as p…
…er convention
740e531
Vijay Dev document meta method 7e494f0
Arun Agrawal Extra "l" removed before h2. 8cefafb
Waynn Lue Superfluous "the". f21e8e0
Bratish Goswami '/' was outside of anchor tag. e231c49
Vishnu Atrai Active Resouce guide initial load dcb965b
Vishnu Atrai Introduction for active resource 35a028d
Vishnu Atrai configuration for active resource d240ce8
Vishnu Atrai usages of active resouce 88c101b
Vijay Dev make the warning clear about the effect of using validates_associated…
… on both sides on an association.
c93adf8
Vijay Dev remove some parts of the section on shortcut helpers, document custom…
… validators
bac54a0
Vijay Dev prefer to use if..end unless the condition is simple/compact 2fb540e
Vijay Dev 3.1 release notes draft d016102
Vijay Dev 3.1 release notes - added AP and Railties sections 08f4a8c
Waynn Lue "blog" is more common than "weblog" these days. 478dc71
Arun Agrawal Rack::Sendfile is no more default middleware. 9232033
Arun Agrawal Adding more info as rake about is fixed e3e1109
Vijay Dev 3.1 release notes Active Record changes, Architectural changes and
organizing sections.
ed246f5
Waynn Lue typo in "wont" 20251c8
Vishnu Atrai Active Resource - guide for reading and writing data 35eb96f
Vishnu Atrai Active Resource - guide for create 814e05e
Vishnu Atrai Active Resource - guide for update/save 566d2b9
Vishnu Atrai Active Resource - guide for destroy 6b361aa
Perry Flinn Fix typo 'console' -> 'constant' 690eae7
Vijay Dev fixed incorrect tags 8207d0c
Vijay Dev minor changes in migrations guide 19eb720
Vijay Dev typo fix b0cf7ea
Thillai Arasu grammatical changes 346cd04
Waynn Lue The trailing '/' isn't being picked up by Github anyway, and the link…
… works as is.
3694a6c
Rashmi Yadav The trailing '/' isn't being picked up by Github anyway, and the link…
… works as is.
34d69b3
Xavier Noria Revert "grammatical changes"
Reason: As discussed in GitHub, it is debatable, and present tense
is fine (and simple, and preferred).

This reverts commit 54ccda9.
ab87475
Xavier Noria 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
Aug 05, 2011
Guillermo Iguaran Fix AR test suite error under Rubinius 2.0 b1be622
Santiago Pastorino Fix test for Rubinius 8118e41
Santiago Pastorino Revert "to_key on a destroyed model should return nil". Closes #2440
This reverts commit c544872.
216d79e
Santiago Pastorino Avoid generating app/views/layouts/application.html.erb on mountable …
…engines, just generate the namespaced one
7af63a9
Aug 06, 2011
Santiago Pastorino Use rake >= 0.9.3.beta.1 in Ruby 1.9.3 741151c
Santiago Pastorino Merge pull request #2450 from guilleiguaran/activesupport-gzip-1.8
Fix ActiveSupport::Gzip under Ruby 1.8.7. Closes #2416
704e9c8
Aug 07, 2011
José Valim Test against 1.9.3 as well. 33d02f1
Santiago Pastorino 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
Santiago Pastorino Merge pull request #2455 from vijaydev/patch-7
Edit changelog to mention about x_sendfile_header default change
5435787
Gregg Pollack Added irregular zombie inflection, so zombies no longer gets singular…
…ized into zomby
dfcecde
Xavier Noria guides generation: apparently this workaround for RedCloth is not nee…
…ded anymore
ed85772
Aug 08, 2011
Joshua Peek 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
Santiago Pastorino Initialize config.assets.version the same way it's done in Sprockets d008c99
Jon Leighton 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
Jon Leighton Fully marshal AR::Base objects. Fixes #2431. c202c10
Jon Leighton Bump arel version
Conflicts:

	activerecord/activerecord.gemspec
f1c90ce
Aaron Patterson reduce file stats by improving our dir glob pattern 4c49286
Aug 09, 2011
Jon Leighton Remove TODO comment I didn't mean to commit 6e2e060
Jon Leighton Okay, the new incompatible arel is now called 2.2 and the sun shines …
…upon thee once more
561e8a7
Santiago Pastorino rake assets:precompile defaults to production env 004bb66
Aug 10, 2011
Aaron Patterson add the gem requirement for sqlite3 47c6a77
Aaron Patterson 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
Aug 11, 2011
Santiago Pastorino Merge pull request #2489 from grzuy/master
Remove parameters_for_url from form_tag method header
83d9398
Santiago Pastorino 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
Aug 12, 2011
Santiago Pastorino Merge pull request #2512 from arunagw/cant_dup_on_nil_3-1-stable
Cant dup on nil 3 1 stable
5b6ac34
Aug 13, 2011
Arun Agrawal We actually don't need a reverse_merge! here. dup removed was giving …
…error with nil class.
d761ec4
Jon Leighton 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
Jon Leighton Fix default scope thread safety. Thanks @thedarkone for reporting. af96a91
Jon Leighton Perf: don't mess around with thread local vars unless we actually nee…
…d to
cf013a6
Myron Marston 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
Santiago Pastorino Merge pull request #2518 from myronmarston/fix_active_record_observer…
…_disabling_3-1

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

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

	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
e81e508
Jon Leighton Refactor building the update manager 24ade58
Jon Leighton Use a SelectCore rather than a full SelectManager e85c644
Jon Leighton use update.key instead of update.ast.key. make better use of select m…
…anager.
eff8aee
Jon Leighton Use new SelectManager#projections= method c701b3f
Jon Leighton Use new SelectManager#source method c6bf713
Jon Leighton Bump arel dependency c388a95
Aug 16, 2011
Arun Agrawal Notification Test Fix f4e535e
Jon Leighton 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
Jon Leighton Be more lazy about creating time zone objects. Decreases startup time…
… by about 10%. (#734)
72de6ab
Jon Leighton Fix wrap_parameters initializer template 4b70376
Jon Leighton Fix tzinfo require (it broke test_raises_when_an_invalid_timezone_is_…
…defined_in_the_config in railties)
3594102
Jon Leighton 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
Jon Leighton Fix assets tests in railties 0ab65e8
Vijay Dev fix misleading comment (originally made by Tate Johnson, we lost this…
… commit while porting to the rails repo)
388f09c
Vijay Dev document alias for rails runner 9e9b127
Vijay Dev rephrase how the verbose methods in a migration work 073d9ff
raul murciano Action Mailer guide update: the :to parameter now supports both Strin…
…g and Array values to indicate recipients.
92d3b51
raul murciano Action Mailer guide: mention how to use :cc and :bcc parameters. 282ee95
raul murciano Typo dbd72be
Kamil Śliwak 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
Vijay Dev minor changes in app templates guide 0c3bdc0
Vijay Dev assets guide - add info about require_directory, minor rephrasings d8c6bab
Jacob Mattingley 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
Sebastian Martinez Document Hash#extract!. ebf0cc4
Vijay Dev document Array#append and Array#prepend methods in AS guide f3f5a8f
Jeff Dutil Fix formatting of active_record_validations_callbacks.textile so guid… 4b4e67f
Jon Leighton 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
Xavier Noria syncs the 3.1 release notes and asset pipeline guide with master ae69c4c
Xavier Noria Merge branch '3-1-stable' of github.com:rails/rails into 3-1-stable 2330c0c
Jon Leighton Fix non-public method warning in Module#delegate. Fixes #2548. c238ba0
Aaron Patterson Properly escape glob characters. 09ad48f
Aaron Patterson prevent sql injection attacks by escaping quotes in column names f9b642c
Aaron Patterson Tags with invalid names should also be stripped in order to prevent
XSS attacks.  Thanks Sascha Depold for the report.
66c3e31
Aaron Patterson properly escape html to avoid invalid utf8 causing XSS attacks a19ee5c
Aaron Patterson bumping to 3.1.0.rc6 633a569
Aug 17, 2011
Xavier Noria fixes generation of the AR querying guide 2e45cfe
Jeff Dutil Fix spacing in plugins.textile to fix html rendering and remove extra…
… whitespace from security.textile
6f3bac4
Jeff Dutil Fix ruby typo to correctly render code block in initializer.textile 4b411c8
Aug 18, 2011
Xavier Noria minor details revised in a gsub
Regexps have a construct to express alternation of characters, which
is character classes. In addition to being the most specific idiom to
write this pattern, it reads better without the backslashes. Also, it
is better not to use a capture if none is needed. As a side-effect of
these changes, the gsub is marginally faster, but speed is not the
point of this commit.
0df00d9
Aug 19, 2011
Vijay Dev mailer guide: fixes indentation, and use fixed width fonts wherever n…
…ecessary
155f734