Skip to content
This repository
  • 978 commits
  • 500 files changed
  • 38 comments
  • 44 contributors
This comparison is big! We're only showing the most recent 250 commits
Jul 26, 2011
Santiago Pastorino spastorino Merge pull request #2288 from joshk/3-1-stable
Irc notifications (from Travis with love)
8aa49ad
Santiago Pastorino spastorino Remove cruise files 8f67029
Dan Gebhardt dgeb fixed problem in which options[:html][:remote] would be overridden in…
… form_for() - fixes #2094
75366cb
Dan Gebhardt dgeb added test case for fix to issue #2094 b589f0c
Santiago Pastorino spastorino Merge pull request #2279 from jdelStrother/load_missing_constant
Constantize a regexp in Dependencies#load_missing_constant
8220777
Jonathan del Strother jdelStrother Replace unnecessary regexp in Dependencies#load_missing_constant 626798a
Jul 27, 2011
lsylvester lsylvester fix some types in schema_test.rb 8dade49
Jon Leighton 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
Jon Leighton jonleighton Update deprecation messages to point out the availability of proxy_as…
…sociation. Fixes #1148.
e13e25d
Christos Zisopoulos christos Improve performance and memory usage for options_for_select with Ruby…
… 1.8.7
74a450d
Xavier Noria 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
José Valim josevalim Merge pull request #2287 from dgeb/3-1-mailers-in-plugins
Ensure that app/mailers gets created in new plugins
a9dea60
Joshua Peek josh Make Rails.application.assets available in initializers 1edfadf
Xavier Noria fxn contrib app minor tweak 6f745f4
Jul 28, 2011
thedarkone Handle the empty array correctly. 09dd71c
Santiago Pastorino spastorino Merge pull request #2319 from thedarkone/errors-include-3-1
Backport #2305 into 3-1-stable
ac24a53
Santiago Pastorino spastorino Merge pull request #2295 from dgeb/mo-better-plugins
Improve dependency management and gemspec file for plugins
bba9c8d
Santiago Pastorino spastorino Tidy up a bit plugin new gemspec f2c8309
Tasveer Singh tazsingh Do not add files in assets/ directories to Sprockets b4ca7d3
Santiago Pastorino spastorino Merge pull request #2326 from castlerock/plugin_generator_fix
pluging generator test fix
b4cf291
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 Make use of the inherited initializer. 34c5089
José Valim josevalim Merge pull request #2332 from thedarkone/resources-router-fix-3-1
Backport #2330 into 3-1-stable
7f5dc98
Santiago Pastorino spastorino Generated apps with --dev or --edge flags depend on git versions of s…
…ass-rails and coffee-rails
f2ade6f
Jul 29, 2011
Aaron Patterson tenderlove dump IO encoding value along with schema.rb so the file can be reload…
…ed. fixes #1592
4e1f6ab
Aaron Patterson tenderlove default writing the schema file as utf-8 d13df74
Aaron Patterson tenderlove delay backtrace scrubbing until we actually raise an exception. fixes #… 61c5c3d
Jul 30, 2011
Jon Leighton 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
Jul 31, 2011
Brad Ediger 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
Jon Leighton jonleighton Merge pull request #2372 from bradediger/issue-2346-3-1-stable
Issue 2346 3-1-stable port
3c8d805
Arun Agrawal arunagw skiping magic comment test. checking encoding_aware?
Loading AS encoding.
3248c5d
José Valim josevalim Merge pull request #2373 from arunagw/31_schema_dumper_test_fix
3-1-stable schema dumper test fix
030bb71
Santiago Pastorino spastorino Merge pull request #2382 from vijaydev/rakeaboutfix3.1
Fix #2368 (3-1-stable)
7ee15e8
Aug 01, 2011
Vijay Dev vijaydev fixes #2368. rake about not showing the middleware, db adapter and db…
… schema version
c05ceac
thoefer2 thoefer2 modified fix #1872 according to jose valim´s suggestions 7b39dda
José Valim 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
Santiago Pastorino spastorino Merge pull request #2393 from bdurand/fix_cache_read_multi
Fix ArgumentError in ActiveSupport::Cache::CacheStore.read_multi
17b0d2c
Santiago Pastorino 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
Aaron Patterson tenderlove use File.directory? as Dir.exists? is only 1.9.2+ ebfad37
Aug 02, 2011
Christopher Meiklejohn cmeiklejohn Support backwards compatible interface for migration down/up with rai…
…ls 3.0.x.
55eadcc
Christopher Meiklejohn cmeiklejohn Ensure that .up and .down work as well. 96fc074
Aaron Patterson tenderlove add a migrate class method and delegate to the new instance 3e56758
Aug 03, 2011
Santiago Pastorino spastorino This dep is already defined in activerecord.gemspec 1f1bfaf
Santiago Pastorino spastorino Don't require assets group in production by default, you can change t…
…his default in the application.rb anyways
0c57ae1
Aaron Patterson tenderlove fixing deprecation notice for dynamic finders that use hashes. fixes #… c1b85ed
Aaron Patterson tenderlove make assert_difference error message not suck e63d3f7
Santiago Pastorino spastorino Fix a bit precompile and lazy compile comments 5f05642
Aug 04, 2011
Jon Leighton 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
Aaron Patterson tenderlove fixing assert_difference issues on ruby 1.8 3727232
Aaron Patterson tenderlove we should not ignore all gems in here b0b7070
Vijay Dev vijaydev move the note after the scaffold files listing d2c9c9e
Hendy Tanata htanata Fix two spaces between sententes on README.rdoc. 5b51e58
Alberto Perdomo albertoperdomo Association and Callbacks guide: Added section on shortcut syntax 'va…
…lidates'.
d836413
Pete 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
Vijay Dev vijaydev document meta method 7e494f0
Arun Agrawal arunagw Extra "l" removed before h2. 8cefafb
Waynn Lue waynn Superfluous "the". f21e8e0
Bratish Goswami bratish '/' was outside of anchor tag. e231c49
Vishnu Atrai vatrai Active Resouce guide initial load dcb965b
Vishnu Atrai vatrai Introduction for active resource 35a028d
Vishnu Atrai vatrai configuration for active resource d240ce8
Vishnu Atrai vatrai usages of active resouce 88c101b
Vijay Dev vijaydev make the warning clear about the effect of using validates_associated…
… on both sides on an association.
c93adf8
Vijay Dev vijaydev remove some parts of the section on shortcut helpers, document custom…
… validators
bac54a0
Vijay Dev vijaydev prefer to use if..end unless the condition is simple/compact 2fb540e
Vijay Dev vijaydev 3.1 release notes draft d016102
Vijay Dev vijaydev 3.1 release notes - added AP and Railties sections 08f4a8c
Waynn Lue waynn "blog" is more common than "weblog" these days. 478dc71
Arun Agrawal arunagw Rack::Sendfile is no more default middleware. 9232033
Arun Agrawal arunagw Adding more info as rake about is fixed e3e1109
Vijay Dev vijaydev 3.1 release notes Active Record changes, Architectural changes and
organizing sections.
ed246f5
Waynn Lue waynn typo in "wont" 20251c8
Vishnu Atrai vatrai Active Resource - guide for reading and writing data 35eb96f
Vishnu Atrai vatrai Active Resource - guide for create 814e05e
Vishnu Atrai vatrai Active Resource - guide for update/save 566d2b9
Vishnu Atrai vatrai Active Resource - guide for destroy 6b361aa
Perry Flinn pbflinn Fix typo 'console' -> 'constant' 690eae7
Vijay Dev vijaydev fixed incorrect tags 8207d0c
Vijay Dev vijaydev minor changes in migrations guide 19eb720
Vijay Dev vijaydev typo fix b0cf7ea
Thillai Arasu judearasu grammatical changes 346cd04
Waynn Lue waynn The trailing '/' isn't being picked up by Github anyway, and the link…
… works as is.
3694a6c
Rashmi Yadav raysrashmi The trailing '/' isn't being picked up by Github anyway, and the link…
… works as is.
34d69b3
Xavier Noria fxn 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 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
Aug 05, 2011
Guillermo Iguaran guilleiguaran Fix AR test suite error under Rubinius 2.0 b1be622
Santiago Pastorino spastorino Fix test for Rubinius 8118e41
Santiago Pastorino spastorino Revert "to_key on a destroyed model should return nil". Closes #2440
This reverts commit c544872.
216d79e
Santiago Pastorino spastorino Avoid generating app/views/layouts/application.html.erb on mountable …
…engines, just generate the namespaced one
7af63a9
Aug 06, 2011
Santiago Pastorino spastorino Use rake >= 0.9.3.beta.1 in Ruby 1.9.3 741151c
Santiago Pastorino spastorino 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 josevalim Test against 1.9.3 as well. 33d02f1
Santiago Pastorino 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
Santiago Pastorino spastorino Merge pull request #2455 from vijaydev/patch-7
Edit changelog to mention about x_sendfile_header default change
5435787
Gregg Pollack Gregg Added irregular zombie inflection, so zombies no longer gets singular…
…ized into zomby
dfcecde
Xavier Noria fxn guides generation: apparently this workaround for RedCloth is not nee…
…ded anymore
ed85772
Aug 08, 2011
Joshua Peek 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
Santiago Pastorino spastorino Initialize config.assets.version the same way it's done in Sprockets d008c99
Jon Leighton 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
Jon Leighton jonleighton Fully marshal AR::Base objects. Fixes #2431. c202c10
Jon Leighton jonleighton Bump arel version
Conflicts:

	activerecord/activerecord.gemspec
f1c90ce
Aaron Patterson tenderlove reduce file stats by improving our dir glob pattern 4c49286
Aug 09, 2011
Jon Leighton jonleighton Remove TODO comment I didn't mean to commit 6e2e060
Jon Leighton jonleighton Okay, the new incompatible arel is now called 2.2 and the sun shines …
…upon thee once more
561e8a7
Santiago Pastorino spastorino rake assets:precompile defaults to production env 004bb66
Aug 10, 2011
Aaron Patterson tenderlove add the gem requirement for sqlite3 47c6a77
Aaron Patterson 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
Aug 11, 2011
Santiago Pastorino spastorino Merge pull request #2489 from grzuy/master
Remove parameters_for_url from form_tag method header
83d9398
Santiago Pastorino 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
Aug 12, 2011
Santiago Pastorino spastorino 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 arunagw We actually don't need a reverse_merge! here. dup removed was giving …
…error with nil class.
d761ec4
Jon Leighton 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
Jon Leighton jonleighton Fix default scope thread safety. Thanks @thedarkone for reporting. af96a91
Jon Leighton jonleighton Perf: don't mess around with thread local vars unless we actually nee…
…d to
cf013a6
Myron Marston 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
Santiago Pastorino spastorino 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 arunagw Bringing back the jquery-rails. One test is dependent. 322b978
Arun Agrawal arunagw Need to use initializers true here to pass the test. 5a5171b
Santiago Pastorino spastorino Merge pull request #2522 from arunagw/railties_test_fix
Railties test fix
17154e3
José Valim josevalim Ensure changing RAILS_GROUPS will load the proper dependencies. 0e19c7c
Aug 15, 2011
Jon Leighton jonleighton Deprecate the use of non-public methods by Module#delegate aa1d1e4
Jon Leighton jonleighton Fix deprecation warnings due to private methods which are delegated to. 1aab850
Jon Leighton jonleighton Fix the line number in the backtrace when Module#delegate raises 75d5195
Jon Leighton jonleighton Removing unnecessary require, solve 'circular require considered harm…
…ful' warning.
68cb618
Arun Agrawal arunagw Including delegation 801cd66
Jon Leighton jonleighton Merge pull request #2535 from arunagw/delegation_fix
Delegation fix
7a9da9c
Jon Leighton jonleighton Ensure empty has_many :through association preloaded via joins is mar…
…ked as loaded. Fixes #2054.
6bb6519
Jon Leighton jonleighton Update travis config on @joshk's instructions 81151eb
Santiago Pastorino spastorino rake assets:precompile executes in production environment as default …
…if RAILS_ENV was not provided
28e250e
Jon Leighton jonleighton Merge pull request #2538 from arunagw/notifications_test_fix
Notifications test fix
e749abc
Jon Leighton jonleighton 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 jonleighton Support for multi-table updates with limits, offsets and orders
Conflicts:

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

Conflicts:

	activesupport/lib/active_support/core_ext/module/delegation.rb
	activesupport/test/core_ext/module_test.rb
1b819d3
Jon Leighton jonleighton Revert "Deprecate the use of non-public methods by Module#delegate"
This reverts commit aa1d1e4.

Conflicts:

	activesupport/lib/active_support/core_ext/module/delegation.rb
	activesupport/test/core_ext/module_test.rb
b0d9548
Santiago Pastorino spastorino Merge pull request #2581 from guilleiguaran/debug-assets-in-dev
Debug assets by default in development and test environments
c09dbf2
Santiago Pastorino spastorino Merge pull request #2581 from guilleiguaran/debug-assets-in-dev
Debug assets by default in development and test environments
a7afb84
Aug 20, 2011
Santiago Pastorino spastorino Merge pull request #2603 from vijaydev/guides
Minor change in the 3.1 release notes
d29eec6
Santiago Pastorino spastorino Merge pull request #2603 from vijaydev/guides
Minor change in the 3.1 release notes
a263cb8
Aaron Patterson tenderlove Merge pull request #2602 from ernie/fix_predicate_builder_primary_key…
…_assumption

Fix assumption of primary key name in PredicateBuilder subquery.
bf4714f
Santiago Pastorino spastorino Merge pull request #2604 from vijaydev/params_wrapper_docs
Minor edit in the params wrapper api docs
f8f1e18
Santiago Pastorino spastorino Merge pull request #2604 from vijaydev/params_wrapper_docs
Minor edit in the params wrapper api docs
3655e7b
Aaron Patterson tenderlove Merge pull request #2605 from ernie/3-1-stable-2602-backport
3-1-stable 2602 backport
1d354fa
Santiago Pastorino spastorino Merge pull request #2597 from dharmatech/patch-2
actionpack/lib/action_controller/base.rb: docs typo
52e1e45
Santiago Pastorino spastorino Merge pull request #2595 from smartinez87/assets-guide
Document debugging assets set by default for dev and test envs on guides
b82bd6c
Santiago Pastorino spastorino Merge pull request #2596 from dharmatech/patch-1
ActionController::Redirecting : fix docs typo
9b7f493
Santiago Pastorino spastorino Merge pull request #2597 from dharmatech/patch-2
actionpack/lib/action_controller/base.rb: docs typo
a7ea1ff
Santiago Pastorino spastorino Merge pull request #2595 from smartinez87/assets-guide
Document debugging assets set by default for dev and test envs on guides
a0cb706
Santiago Pastorino spastorino Merge pull request #2596 from dharmatech/patch-1
ActionController::Redirecting : fix docs typo
088f6f0
Aug 21, 2011
Siong siong1987 remove extra space since comment_if already returns the space.
(cherry picked from commit 5e73a2f)
365ebdb
Santiago Pastorino spastorino Merge pull request #2615 from cesario/cherry_picks_on_rc6
Cherry picked "remove extra space since comment_if already returns the space." on rc6, already apply on master.
fe7282e
Santiago Pastorino spastorino Merge pull request #2615 from cesario/cherry_picks_on_rc6
Cherry picked "remove extra space since comment_if already returns the space." on rc6, already apply on master.
cc36385
Santiago Pastorino spastorino Merge pull request #2609 from guilleiguaran/bump-sprockets-beta14
Bump sprockets to 2.0.0.beta.14
a79530a
Santiago Pastorino spastorino Merge pull request #2609 from guilleiguaran/bump-sprockets-beta14
Bump sprockets to 2.0.0.beta.14
7a6b220
Phil Lee asmega Use typewriter styling on url_for in documentation 1fd3c26
Phil Lee asmega Use typewriter styling on url_for in documentation 61fa600
Franck Verrot franckverrot This is a test on --skip-sprockets, not --skip-active-record
(cherry picked from commit 0c79098)
f63a134
Franck Verrot franckverrot Add a trailing space to the comment_if method 2173e04
Joshua Peek josh Fix sprockets warnings
Fixes #2598
d7bef0a
Santiago Pastorino spastorino Merge pull request #2620 from cesario/3-1-0
Fix CI and rename 1 misleading test case.
9d1fc08
Santiago Pastorino spastorino Merge pull request #2620 from cesario/3-1-0
Fix CI and rename 1 misleading test case.
d81fe8d
Aug 22, 2011
Guillermo Iguaran guilleiguaran Fix Sprockets rewrite_asset_path 812d1ae
Santiago Pastorino spastorino Merge pull request #2524 from JonathonMA/fix_ecd37084b28a05f05251
Use mysql_creation_options inside rescue block
9a26ba3
Santiago Pastorino spastorino Merge pull request #2524 from JonathonMA/fix_ecd37084b28a05f05251
Use mysql_creation_options inside rescue block
c2ab1b1
Santiago Pastorino spastorino Merge pull request #2216 from martinisoft/remove_generated_whitespace
Remove generated whitespace
5ec3430
David Workman workmad3 Simple fix for correctly inverting an add_index migration when a name…
… has been provided
54866b0
David Workman workmad3 Neatened up the invert_add_index method as per suggeston 9934c97
David Workman workmad3 Using .try to test for the existence of a method option in a nil-resi…
…stent manner. Inlined the determination of the options hash for reversing using a ternary operator. Shortens the method in a way that keeps the code neat
00c8151
David Workman workmad3 Added a test to check for correct behaviour with no options in add_in…
…dex command recorder
2f20c6c
Aaron Patterson tenderlove Merge branch '3-1-stable' into 3-1-0
* 3-1-stable: (21 commits)
  Added a test to check for correct behaviour with no options in add_index command recorder
  Using .try to test for the existence of a method option in a nil-resistent manner. Inlined the determination of the options hash for reversing using a ternary operator. Shortens the method in a way that keeps the code neat
  Neatened up the invert_add_index method as per suggeston
  Simple fix for correctly inverting an add_index migration when a name has been provided
  Merge pull request #2524 from JonathonMA/fix_ecd37084b28a05f05251
  Fix Sprockets rewrite_asset_path
  Merge pull request #2620 from cesario/3-1-0
  Fix sprockets warnings
  Use typewriter styling on url_for in documentation
  Merge pull request #2609 from guilleiguaran/bump-sprockets-beta14
  remove extra space since comment_if already returns the space. (cherry picked from commit 5e73a2f)
  Merge pull request #2596 from dharmatech/patch-1
  Merge pull request #2595 from smartinez87/assets-guide
  Merge pull request #2597 from dharmatech/patch-2
  Merge pull request #2604 from vijaydev/params_wrapper_docs
  Merge pull request #2602 from ernie/fix_predicate_builder_primary_key_assumption
  Merge pull request #2603 from vijaydev/guides
  Merge pull request #2581 from guilleiguaran/debug-assets-in-dev
  Revert "Deprecate the use of non-public methods by Module#delegate"
  mailer guide: fixes indentation, and use fixed width fonts wherever necessary
  ...
1f1d4aa
Santiago Pastorino spastorino Merge pull request #2411 from ai/debug_assets_by_config
Debug assets by config
b113089
Aug 23, 2011
Joost Baaij tilsammans removed the link to my blog to help stop endless comments 0d9363d
Anand luckydev added missing require array/wrap in serialization 25f60cc
Aug 24, 2011
Santiago Pastorino spastorino Merge pull request #2647 from dmathieu/no_rescue
remove useless rescue
125b1b0
Santiago Pastorino spastorino Merge pull request #2390 from arunagw/test_for_environment_file
Test added to check development.rb, test.rb and production.rb content
8c0d89e
Santiago Pastorino spastorino Merge pull request #2668 from guilleiguaran/debug-assets-media-type
Debug assets shouldn't ignore media type for stylesheets. Closes #2625
8ac61f5
Santiago Pastorino spastorino Merge pull request #2644 from guilleiguaran/allow-assets-debugging
Add config.allow_debugging option
19c1403
Joshua Peek josh Bring in sprockets precompile task 4327e21
Andrew White pixeltrix Add failing test case for #2654 257061d
David Majda dmajda Make ActionController::TestCase#recycle! set @protocol to nil
This ensures that the protocol does not get carried over when there are
two or more requests in functional tests. This was a problem when e.g.
the first request was HTTP and the second request was HTTPS.

Closes #2654.

Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
621fe98
Aaron Patterson tenderlove bumping bcrypt-ruby requirement d7dc94a
Aaron Patterson tenderlove require needs to return true or false. thank you Ryan "zenspider" Davis b359628
Aaron Patterson tenderlove `load` should also return the value from `super` 93a9cad
Xavier Noria fxn the command line guide is good to go 5978fae
Aug 25, 2011
Andrew White pixeltrix Don't modify params in place - fixes #2624 283f597
Aug 27, 2011
Xavier Noria fxn use sdoc to generate the API 772173a
Xavier Noria fxn deletes spurious arrow 7748327
Santiago Pastorino spastorino assert_no_match cd00e3b
Aug 28, 2011
Aaron Patterson tenderlove clear and disable query cache when an exception is raised from called…
… middleware
a045033
Santiago Pastorino spastorino Bump rack-cache, rack-test, rack-mount and sprockets up c13216b
Guillermo Iguaran guilleiguaran Update Rails 3.1 CHANGELOGs c677461
Santiago Pastorino spastorino Merge pull request #2723 from guilleiguaran/3-1-0-changelogs
Update changelogs for Rails 3.1.0
3b13fb7
Santiago Pastorino spastorino bumping to 3.1.0.rc7 e4fc8e2
Aug 29, 2011
Santiago Pastorino spastorino bumping to 3.1.0.rc8 c4ce550
Igor Zubkov biow0lf Documentation fixes 6094672
Xavier Noria fxn let SDoc add a link to the source code in GitHub for each method fa1e3b2
Guillermo Iguaran guilleiguaran Read digests of assets from manifest.yml if config.assets.manifest is on af0f14e
Aaron Patterson tenderlove Merge pull request #2741 from guilleiguaran/assets-manifest-yml
Read digests of assets from manifest.yml if config.assets.manifest is on
4a60a9e
Aug 30, 2011
Guillermo Iguaran guilleiguaran Configuration changes for asset pipeline: remove config.assets.allow_…
…debugging, add config.assets.compile and config.assets.digest
f443f9c
Aaron Patterson tenderlove Merge pull request #2747 from guilleiguaran/manifest-on-by-default
Manifest is generated by default when assets are precompiled
94e3059
Waynn Lue waynn incorporate feedback from vijaydev and dasch to rephrase this to soun…
…d more natural, and some grammar fixes.
54c9a43
Xavier Noria fxn adds the asset pipeline guide to the index 5e293bc
Aaron Patterson tenderlove Merge pull request #2748 from guilleiguaran/assets-version-config
Add config.assets.version to config/application.rb
1db0f20
Aaron Patterson tenderlove Merge branch '3-1-0' of github.com:rails/rails into 3-1-0
* '3-1-0' of github.com:rails/rails:
  adds the asset pipeline guide to the index
  incorporate feedback from vijaydev and dasch to rephrase this to sound more natural, and some grammar fixes.
6376e66
Aaron Patterson tenderlove Merge pull request #2756 from guilleiguaran/manifest-location
Change manifest.yml location with config.assets.manifest
aa94342
Santiago Pastorino spastorino Revert "Merge pull request #2647 from dmathieu/no_rescue"
This reverts commit 125b1b0.
69c7213
Santiago Pastorino spastorino Depend on sass-rails and coffee-rails 3.1.0 48cdecd
Santiago Pastorino spastorino Bump sprockets up c970818
Aaron Patterson tenderlove bumping to 3.1.0 505e845