Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

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

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: rails/rails
...
head fork: rails/rails
This comparison is big! We're only showing the most recent 250 commits
Commits on Oct 08, 2011
@josevalim josevalim Merge pull request #3248 from arunagw/query_cache_test_fix_3-1-stable
Query cache test fix 3 1 stable
5d624e3
@arunagw arunagw Sqlnet.log should be ignored 574a25d
@josevalim josevalim Merge pull request #3253 from arunagw/gitignore_sqlnet_file
Gitignore sqlnet file
8199b99
@arunagw arunagw Sqlnet.log should also be ignored into the app gitignore d11769c
@spastorino spastorino Merge pull request #3255 from arunagw/app_gitignore_sqlnet_log_3-1-st…
…able

App gitignore sqlnet log 3 1 stable
d12af7a
@spastorino spastorino Revert "Merge pull request #3255 from arunagw/app_gitignore_sqlnet_lo…
…g_3-1-stable"

This reverts commit d12af7a, reversing
changes made to 8199b99.
f03556b
@jeremy jeremy Add comments to our generated .gitignore, including a note about when…
… to use a global gitignore. Remove .sass-cache since we use /tmp/sass-cache, which is already ignored.
7319f14
@ileitch ileitch Postgres: Do not attempt to deallocate a statement if the connection …
…is no longer active.
fc55fa7
@jeremy jeremy Disable 1.9.3 builds until upgraded from -preview1 to -rc1 a1fb214
@jeremy jeremy Don't notify IRC on every single build, just failures and first succe…
…ss after a string of failures
51550ed
@jeremy jeremy Skip broken asset precompilation test on Macs. Issues with NFD vs NFC…
… normalization on the asset filename. Major red flag with asset lookups!
5d18346
@jeremy jeremy The generator invokes rake with either the :env option, ENV['RAILS_EN…
…V'], or development. So if Travis has exported RAILS_ENV=test, it'll be used instead of development, breaking these brittle expectations.
e051375
@guilleiguaran guilleiguaran Test utf8 assets filenames with request instead of manifest lookup e63c05f
@guilleiguaran guilleiguaran Isolate rake action tests that should be run under default env 09bb9de
Commits on Oct 09, 2011
@avakhov avakhov Fix params hash example in AC::Base comment 4805a65
@roytomeij roytomeij Add note about how Sass & Sprockets don't match 0834102
@roytomeij roytomeij Fix a typo that was mysteriously entered in previous commit b2858e6
@spastorino spastorino Add 3.1.1 release date df03e1d
Commits on Oct 10, 2011
@mcdd mcdd ActiveRecordStore is now called SessionStore. 5bf183c
@radar radar Fix rails/generators/base.rb documentation for generator lookup 1b6886a
Commits on Oct 12, 2011
@josevalim josevalim Fix wrong identation and remove extra spaces. f23f5ec
@josevalim josevalim Provide failing test case for #3298 #2509 86a5271
@bzanchet bzanchet swallow error when can't unmarshall object from session
Signed-off-by: José Valim <jose.valim@gmail.com>
4d986c4
@josevalim josevalim Add some implementation docs. closes #3298. closes #2509. 4cdc31c
Commits on Oct 14, 2011
@avakhov avakhov Add ActionController#head example b336254
@rahul100885 rahul100885 Fixed typos in active_support_core_extensions.textile 077dffa
@dolzenko dolzenko Use .add instead of << to add errors 78bab03
Stephen Pike Runtime conditions for associations should use procs
The association guide previously recommended using a trick with single
quote delaying of string interpolation in order to handle setting association
conditions that would be evaluated at runtime. Using a proc is the new way as
this no longer works.
2a73d00
@amatsuda amatsuda status is a number in Rails 3 a27f6ec
Steve Bourne change activerecord query conditions example to avoid 'type' as colum…
…n name

'Type' is a reserved column for STI.  Changed conditions example to
avoid using that column name as an example.  The example isn't
STI-related (and mentioning STI here is needless clutter), so changing
to avoid accidentally encouraging users to use 'type' as a column name
for other purposes.
840246c
@dcrec1 dcrec1 improved ActiveResource's .element_path and .new_element_path methods…
… documentation by specifing how .site should be declared in order to use prefix_options
dd27e2e
Commits on Oct 18, 2011
@tenderlove tenderlove reset prepared statement when schema changes imapact statement result…
…s. fixes #3335
818d285
@josevalim josevalim Update actionpack/CHANGELOG a5d3b90
@spastorino spastorino Use again Rack's ContentLength middleware 97b3d10
Commits on Oct 19, 2011
@jeremy jeremy Use toplevel Rack::ContentLength 960882f
Commits on Oct 20, 2011
@tenderlove tenderlove Merge pull request #3258 from ileitch/3-1-stable
Postgres: Do not attempt to deallocate a statement if the connection is no longer active.
88ac481
@martinsvalin martinsvalin Fixed misleading docs for String#to_formatted_s(:db) 195fcd2
@alindeman alindeman Fixes the defaults for config.cache_classes 2ab011a
@plindelauf plindelauf Clarified that the config.assets.initialize_on_precompile directive n…
…eeds to be set in application.rb
9bc6a4e
@avakhov avakhov HTMl -> HTML: html scanner comment fix d103161
Commits on Oct 22, 2011
@arunagw arunagw rake about information updated for 3.1 branch 7cd5448
@vijaydev vijaydev Merge pull request #3403 from arunagw/rack_doc_update
middleware doc updated
e6b9db5
@arunagw arunagw No need to check ruby version here
As rake 0.9.2.2 is out with the same
fix as 0.9.3.beta having
ebe64f8
Pepe Hipolito Fixed typo.
a long the way => along the way
3063afa
Pepe Hipolito Fixed typo.
Ruby will know to look for this file at => Ruby will know how to look for this file at
8203338
@sikachu sikachu Use new migration style in HABTM join table
Yes, we're on Rails 3.1 now.
d044069
@sikachu sikachu Add some note on adding index to HABTM table 8ce3ff3
@guilleiguaran guilleiguaran Lock turn version to 0.8.2 if Ruby version is 1.9.2 6f7d4ae
@vijaydev vijaydev Merge pull request #3409 from guilleiguaran/lock-turn-version
Lock turn version to 0.8.2 if Ruby version is 1.9.2
2032304
Commits on Oct 26, 2011
@bradrobertson bradrobertson correct documentation on initialize method to accept a single parameter 26b9e71
@vijaydev vijaydev minor fixes in the composed_of doc c90a1d2
Commits on Oct 27, 2011
@joevandyk joevandyk Added failing test case for changing schema in migration not clearing…
… the prepared statement cache
9317752
@tenderlove tenderlove clear statement cache when tables are altered 74fbbca
Commits on Oct 29, 2011
@jeremy jeremy Removing db/seeds.rb is fine. Don't blow up. 5275b5d
Commits on Oct 30, 2011
@spastorino spastorino Merge pull request #3463 from kennyj/fix_document_for_cache
fix a document for race_condition_ttl. ActiveSupport::Cache::MemoryCache isn't exist.
aa34ab7
@bruceadams bruceadams note that after_initialize is run for rake tasks 1acb0eb
@henare henare Fix a little typo 0275946
@mjy mjy Adds missing closing regex slashes. 58b0d50
Commits on Oct 31, 2011
@cmeiklejohn cmeiklejohn Ensure that the format isn't applied twice to the cache key, else it …
…becomes impossible to target with expire_action.
b23cd21
@tenderlove tenderlove this should never return nil, so no use for "try" 8e6f86e
Commits on Nov 01, 2011
@spastorino spastorino Merge pull request #1796 from jdeseno/master
link_to doesn't allow rel attribute when also specifying method
816f0b6
Commits on Nov 02, 2011
@jeremy jeremy Revert "Disable 1.9.3 builds until upgraded from -preview1 to -rc1"
This reverts commit a1fb214.
7c36934
Commits on Nov 03, 2011
@jonleighton jonleighton Fix #3247.
Fixes creating records in a through association with a polymorphic source
type.

Conflicts:

	activerecord/CHANGELOG
01eae34
@jonleighton jonleighton Fix adding multiple instances of the same record to a has_many :through.
Fixes #3425.
175c02d
@jonleighton jonleighton Remove all revelant through records.
If a record is removed from a has_many :through, all of the join records
relating to that record should also be removed from the through
association's target.

(Previously the records were removed in the database, but only one was
removed from the in-memory target array.)
e8ce2a5
@jonleighton jonleighton Fix #3271.
Building the conditions of a nested through association could
potentially modify the conditions of the through and/or source
association.

This is a Bad Thing.

Conflicts:

	activerecord/test/cases/reflection_test.rb
d5e63b1
@jonleighton jonleighton Stub find_template so that when handle_render_error is called in Acti…
…onView::Template, we get to see the actual underlying error rather than a NoMethodError.

This shows an encoding bug on Ruby 1.9.3.
75ae4b3
Commits on Nov 04, 2011
@jmazzi jmazzi Preserve SELECT columns on the COUNT for finder_sql when possible.
Pull request #3503
bad2d6f
@jeremy jeremy Merge pull request #3507 from jmazzi/issue-3503
Preserve SELECT columns on the COUNT for finder_sql when possible
bd56b5a
@jonleighton jonleighton Convert CHANGELOGs to Markdown format.
Reasons:

 * Markdown reads well as plain text, but can also be formatted.
 * It will make it easier for people to read on the web as Github
   formats the Markdown nicely.
 * It will encourage a level of consistency when people are writing
   CHANGELOG entries.

The script used to perform the conversion is at
https://gist.github.com/1339263
43486e0
@franckverrot franckverrot Add the MIT-LICENSE to the Active Record gemspec
(cherry picked from commit 64d9773)
e3609d6
@franckverrot franckverrot Add the MIT-LICENSE to the Active Resource gemspec
(cherry picked from commit 85283f0)
04c15b7
@franckverrot franckverrot Add the MIT-LICENSE to the Active Support gemspec
(cherry picked from commit 4633772)
09811a0
@franckverrot franckverrot Synchronize the gemspecs since CHANGELOG has been renamed to CHANGELO…
…G.md

(cherry picked from commit 1679aa5)
fbc2fde
@jonleighton jonleighton Merge pull request #3518 from cesario/gemspec-3-1-stable
Resynchronizing the gemspecs
e3ba072
@sskirby sskirby fixes bug with PostgreSQLAdapter#indexes
When the search path has multiple schemas, spaces were not being stripped
from the schema names after the first.
58f2fbc
Commits on Nov 05, 2011
@arunagw arunagw Doc Fix It should be :git not :path in Gmefile Fix #3527 eb5391c
@fxn fxn Merge pull request #3528 from arunagw/doc_fix
Doc fix
194d7a4
@avakhov avakhov Update routing guides, root route should be at the top of the file 1389ebf
@avakhov avakhov Fix typo in constraints method documentation 740655c
@radar radar [config guide] mention that config methods are to be called on Railti…
…e subclasses
8261230
@henrikhodne henrikhodne Added bundle exec to rake test.
This is in response to rails/rails#3504.
d753596
@avakhov avakhov Fix javascript_include_tag examples in documentation 64122c7
@vijaydev vijaydev Fixed after_initialize/after_find guide
Defining after_initialize and after_find as ordinary methods like
documented in the guide doesn't work with Rails 3.1.1; now macro-style
is used here, too.

Conflicted while cherry picking from master (Original Author: Florian Walch)
3cd33ea
@kennyj kennyj Barckport to 3-1-stable: fixed an issue id false option is ignored on…
… mysql/mysql2 (fix #3440)
fb73423
Commits on Nov 06, 2011
@jonleighton jonleighton Merge pull request #3533 from kennyj/fix_3440-2
Barckport to 3-1-stable: fixed an issue id false option is ignored on mysql/mysql2 (fix #3440)
311a21b
@jonleighton jonleighton Implement a workaround for a bug in ruby-1.9.3p0.
The bug is that an error would be raised while attempting to convert a
template from one encoding to another.

Please see http://redmine.ruby-lang.org/issues/5564 for more details.

The workaround is to load all conversions into memory ahead of time,
and will only happen if the ruby version is *exactly* 1.9.3p0. The
hope is obviously that the underlying problem will be resolved in
the next patchlevel release of 1.9.3.

Conflicts:

	actionpack/CHANGELOG.md
83e9446
@jonleighton jonleighton RUBY_ENGINE is not defined on 1.8 eef4679
@tenderlove tenderlove Merge pull request #3521 from nulogy/fix_postgres_adapter_to_handle_s…
…paces_between_schemas

Fix postgres adapter to handle spaces between schemas
a018403
@avakhov avakhov Docs cosmetic fixes in Action View form_helper.rb 12df79c
Commits on Nov 08, 2011
@bfolkens bfolkens Fix trouble using :subdomain in development environment when using nu…
…meric addresses.

Otherwise the following occurs:

TypeError: can't convert nil into String
    /Users/bfolkens/dev/bfolkens-rails-core/actionpack/lib/action_dispatch/http/url.rb:75:in host_or_subdomain_and_domain'
    /Users/bfolkens/dev/bfolkens-rails-core/actionpack/lib/action_dispatch/http/url.rb:37:in url_for'
    /Users/bfolkens/dev/bfolkens-rails-core/actionpack/lib/action_dispatch/routing/url_for.rb:147:in test_subdomain_may_be_accepted_with_numeric_host'
    /Users/bfolkens/dev/bfolkens-rails-core/activesupport/lib/active_support/testing/setup_and_teardown.rb:67:in run'
    /Users/bfolkens/dev/bfolkens-rails-core/activesupport/lib/active_support/callbacks.rb:426:in send'
    /Users/bfolkens/dev/bfolkens-rails-core/activesupport/lib/active_support/callbacks.rb:81:in run'
92955d0
@bfolkens bfolkens Fixed ' and ' should be ' && ' 0fdcd54
@josevalim josevalim Merge pull request #3561 from bfolkens/3-1-stable-url_subdomain_with_…
…numeric_host

3 1 stable url subdomain with numeric host
dbecc52
@dalibor dalibor Fixed stale doc in AbstractController::Layouts df43c98
@amatsuda amatsuda self.up, self.down => up, down 510e49b
@amatsuda amatsuda document fix: remove_column takes multiple column_names 23ca708
@avakhov avakhov Fix small typo in link_to_function doc cd14cbd
@tilsammans tilsammans Replace example with SQL placeholder syntax.
This works just fine, is less code, and reduces the risk of someone implementing a SQL injection vulnerability.
1c61365
Commits on Nov 09, 2011
@arunagw arunagw CHANGELOG to CHANGELOG.md a0676b6
@vijaydev vijaydev Merge pull request #3576 from arunagw/changelog_changelog_md
Changelog changelog md
e7ec79d
Commits on Nov 12, 2011
@hasclass hasclass Properly cache value when it is "false" 551f313
Commits on Nov 13, 2011
@byroot byroot Fix a tiny typo in custom validators documentation c27c783
@avakhov avakhov Cosmetic fix in number_to_currency docs b015d92
Commits on Nov 14, 2011
@jonleighton jonleighton Revert "Properly cache value when it is "false""
This reverts commit 551f313.

Reason: see
#2010 (comment)
e52dc33
@jonleighton jonleighton Add missing CHANGELOG entries e6d8ed5
@jonleighton jonleighton Merge pull request #3625 from guilleiguaran/sprockets-2.1.0
Upgrade Sprockets to 2.1.0
Conflicts:

	actionpack/actionpack.gemspec
0d78459
@jonleighton jonleighton Preparing for 3.1.2.rc1 release 68ed8ea
@jonleighton jonleighton Put sass-rails 3.1.5.rc.2 in the default Gemfile.
Otherwise there will be dependency conflicts with sprockets.
307a9e2
@jonleighton jonleighton Put sass-rails 3.1.5.rc.2 in the default Gemfile.
Otherwise there will be dependency conflicts with sprockets.
4847cbe
@jonleighton jonleighton Preparing for 3.1.2.rc2 release e29f27a
@jonleighton jonleighton rake release should push the tag 798a3c1
@jonleighton jonleighton rake release should push the tag 5ea132b
Commits on Nov 15, 2011
@Juanmcuello Juanmcuello Backport #3232 to 3-1-stable.
Use the schema_search_path in prepared statements in postgres.

Only the tests are backported, the fix was already included by
commit 818d285.
b02daec
@jonleighton jonleighton Merge pull request #3633 from Juanmcuello/3-1-stable
Backport #3232 to 3-1-stable
ffd1519
@jonleighton jonleighton Merge pull request #3633 from Juanmcuello/3-1-stable
Backport #3232 to 3-1-stable
17c84c5
Commits on Nov 16, 2011
@jonleighton jonleighton Switch from marshal format to plain text for the encoding conversions…
… dump. This is for windows compatibility. Fixes #3644.
f754f3d
@jonleighton jonleighton Switch from marshal format to plain text for the encoding conversions…
… dump. This is for windows compatibility. Fixes #3644.
6f08621
Commits on Nov 17, 2011
@wildchild wildchild Fix impractical I18n lookup in nested fields_for 1d8c576
@fxn fxn warn the user values are directly interpolated into _html translation…
… strings
eb46afa
@fxn fxn Revert "warn the user values are directly interpolated into _html tra…
…nslation strings"

Reason: After another round of discussion, it has been
decided to let interpolation deal with unsafe strings
as it should do.

This reverts commit d57d809.
3bcb247
@josevalim josevalim Merge pull request #3665 from wildchild/label_i18n_3-1-stable
Fix impractical I18n lookup in nested fields_for (3-1-stable)
78f649e
@lest lest _html translation should escape interpolated arguments 1b527d7
@lest lest _html translation should escape interpolated arguments 2d5b105
Commits on Nov 18, 2011
@jonleighton jonleighton Preparing for 3.1.2 release 0e6b118
@sikachu sikachu Update variable's name in the test case to reflect the class we're te…
…sting
fc44737
@tenderlove tenderlove Merge pull request #3683 from christos/schema_introspection_speedup
Only used detailed schema introspection when doing a schema dump.
Conflicts:

	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
a31a805
@parndt parndt Fixed typo: expect -> expected b7fe7c3
capps "denoted" instead of "donated"
"parentheses" instead of "use brackets"
ae4974a
@vijaydev vijaydev Merge pull request #3682 from sikachu/3-1-stable-fix_test_variable
Update variable's name in the test case to reflect the class we're testing
a099116
@tenderlove tenderlove allow people to set a local .Gemfile so that things like ruby-debug a…
…re not required for regular development
8fedb5f
@tenderlove tenderlove fixing my bad merge. doh! 9848b47
Commits on Nov 19, 2011
@jonleighton jonleighton Merge branch '3-1-2' into 3-1-stable 8f4f8db
@jonleighton jonleighton Verify that #3690 has been closed by previous changes to the mysql
adapters.

These tests fail on the v3.1.2 tag.

Closes #3690.

Conflicts:

	activerecord/CHANGELOG.md
c5197d4
@kennyj kennyj Use `show index from`. We could fix `pk_and_sequence_for` method's pe…
…rformance problem (GH #3678)
1b2d546
@jonleighton jonleighton Bump sprockets to 2.1.1
Conflicts:

	actionpack/actionpack.gemspec
3b6087e
@jonleighton jonleighton Don't html-escape the :count option to translate if it's a Numeric. F…
…ixes #3685.

Conflicts:

	actionpack/CHANGELOG.md
1edef70
@jonleighton jonleighton Add missing CHANGELOG entry for #3678. Closes #3678. da327fc
@jonleighton jonleighton Perf fix
If we're deleting all records in an association, don't add a IN(..)
clause to the query.

Fixes #3672.
cb0c3e4
Commits on Nov 20, 2011
@jonleighton jonleighton Downgrade sprockets to 2.0.3. Closes #3686. 574ed06
@jonleighton jonleighton Fix sass-rails dependency. Closes #3704. 36cefec
@jonleighton jonleighton Preparing for 3.1.3 release e9474c8
Commits on Nov 21, 2011
@guilleiguaran guilleiguaran Added therubyrhino to default Gemfile under JRuby b710cea
@guilleiguaran guilleiguaran Update CHANGELOG with the addition of therubyrhino 8b8ff98
@jsl jsl Make the Rack::SSL middleware configurable dcafc76
@josevalim josevalim Merge pull request #3710 from dmathieu/cherry-pick-ssl-config
Cherry pick ssl config
3df6c73
Commits on Nov 22, 2011
@vijaydev vijaydev caching 'false' properly cd392fd
Commits on Nov 26, 2011
@spraints spraints Add config.active_record.identity_map to the configuration guide. 1506ef0
@avakhov avakhov Small docs fix in Active Model callbacks module 7aae61f
@bobbytables bobbytables Fix missing single quote that was messing up syntax highlighting. c7da693
@ugisozols ugisozols what's -> that's 7f6b1a5
Commits on Nov 28, 2011
@arunagw arunagw Bump Mysql2! c6e513b
Commits on Nov 30, 2011
@pimeys pimeys If the table behind has no primary key, do not ask again and just ret…
…urn nil.

Conflicts:

	activerecord/test/cases/attribute_methods_test.rb
5f27545
@jonleighton jonleighton don't alter global state in test 6fd9c1d
Commits on Dec 01, 2011
@jdelStrother jdelStrother Leave default_asset_host_protocol unset
When default_asset_host_protocol is left as nil, it will use absolute protocols when a request is present, and relative protocols otherwise (eg in asset generation)

Signed-off-by: José Valim <jose.valim@gmail.com>
0ce562c
@josevalim josevalim Update CHANGELOG. 7fc91aa
Commits on Dec 02, 2011
@rhulse rhulse [docs] removed last-modifed line from examples 9473f7d
Leandro Santos typo in the performance testing rails guide 2512192
Commits on Dec 03, 2011
@jenseng jenseng Restore performance of ERB::Util.html_escape
Revert html_escape to do a single gsub again, but add the "n" flag (no
language, i.e. not multi-byte) to protect against XSS via invalid utf8

Signed-off-by: José Valim <jose.valim@gmail.com>
1583dab
@jonleighton jonleighton Avoid postgres 9.X syntax c1e2c1a
@jonleighton jonleighton Enable postgres on the CI :heart: :beer: :sparkles: d2ab2b0
Commits on Dec 05, 2011
@sumbach sumbach Test return value of ActiveSupport::Dependencies::Loadable#require
- Add tests to protect from regressions in require's return value behavior
- See a10606c (require needs to return true or false) for the original bug fix
9a780f6
@sumbach sumbach Test return value of ActiveSupport::Dependencies::Loadable#load 31cead7
@sumbach sumbach Test that require and load raise LoadError if file not found 0f81554
@sumbach sumbach Simplify load and require tests
- These tests don't use autoloading so there's no need to add anything to autoload_paths
a070dd1
@tenderlove tenderlove Merge pull request #3860 from sumbach/test-return-value-from-require-…
…on-3-1-stable

Test return value from require on 3-1-stable
47bc206
@kennyj kennyj Use show create table.
Conflicts:

	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
8d55a6d
Commits on Dec 06, 2011
@spastorino spastorino Merge pull request #3428 from adrianpike/asset_path_conflicts
Issue #3427 - asset_path_conflicts
a2f4ef1
@spastorino spastorino Add CHANGELOG entry acfa6c7
Commits on Dec 08, 2011
@fxn fxn use our own fork of sdoc while Vijay's fix is not applied to voloko/sdoc 1e001da
@josevalim josevalim Improve cache on route_key lookup.
Conflicts:

	activemodel/lib/active_model/naming.rb
3952854
@josevalim josevalim Remove NilClass whiners feature.
Removing this feature causes boost in performance when using Ruby 1.9.

Ruby 1.9 started to do implicit conversions using `to_ary` and `to_str`
in some STDLIB methods (like Array#join). To do such implicit conversions,
Ruby 1.9 always dispatches the method and rescues the NoMethodError exception
in case one is raised.

Therefore, since the whiners feature defined NilClass#method_missing, such
implicit conversions for nil became much, much slower. In fact, just defining
NilClass#method_missing (even without the whiners feature) already causes a
massive slow down. Here is a snippet that shows such slow down:

    require "benchmark"
    Benchmark.realtime { 1_000.times { [nil,nil,nil].join } }

    class NilClass
      def method_missing(*args)
        raise NoMethodError
      end
    end

    Benchmark.realtime { 1_000.times { [nil,nil,nil].join } }
4f0ff15
@vijaydev vijaydev fix a bad url 92d24b7
@jonleighton jonleighton Fix #3890. (Calling proxy_association in scope chain.)
Conflicts:

	activerecord/test/models/post.rb
63293d1
@tenderlove tenderlove load the encoding converter to work around [ruby-core:41556] when swi…
…tching encodings
e568c67
Commits on Dec 10, 2011
@guilleiguaran guilleiguaran Add test to verify that therubyrhino isn't included when JRuby isn't …
…used
80b1d4d
@josevalim josevalim Merge pull request #3705 from guilleiguaran/3-1-stable-therubyrhino
Added therubyrhino to default Gemfile under JRuby
d06c3b3
@arunagw arunagw Fix broken encoding test 49bbdf2
@josevalim josevalim Merge pull request #3928 from arunagw/fix_template_test
Fix template test
25ac7e4
Commits on Dec 13, 2011
@tenderlove tenderlove use Array#join so that file encoding doesn't impact returned string.
Fixes #3957
4371be2
@dissolved dissolved Fixing typo in Routing Guide. 50ac4a3
@dissolved dissolved Replacing vague mention of an unspecified section above with a link t…
…o the actual section containing Asset Organization.
ed89235
@Mik-die Mik-die Typo in list dced6d6
Commits on Dec 14, 2011
@jonleighton jonleighton Fix #3672 again (dependent: delete_all perf)
Conflicts:

	activerecord/lib/active_record/associations/builder/has_many.rb
	activerecord/lib/active_record/associations/has_many_association.rb
b6ae05e
@fxn fxn let sdoc say which version of rdoc we depend on
Conflicts:

	Gemfile
60a91f1
Commits on Dec 15, 2011
@jonleighton jonleighton Fix #3987.
Conflicts:

	activerecord/lib/active_record/attribute_methods/primary_key.rb
	activerecord/test/cases/primary_keys_test.rb
df932c4
Commits on Dec 17, 2011
@spastorino spastorino Add campfire notifications for travis 2f7e701
Commits on Dec 18, 2011
@lest lest backport call scope within unscoped to prevent duplication of where v…
…alues
9f7fe5d
Commits on Dec 19, 2011
@jonleighton jonleighton Don't notify campfire when the build keeps passing b9aabc7
@spastorino spastorino Merge pull request #4025 from arunagw/travis_sync
Travis sync
0479789
Commits on Dec 20, 2011
@guilleiguaran guilleiguaran Skip assets options in environments files when --skip-sprockets is used
Conflicts:

	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
	railties/test/generators/app_generator_test.rb
47bef33
@drogus drogus Ensure that files that compile to js/css are not compiled by default …
…with `rake assets:precompile`

This case was not tested and documentation was a bit confusing
on that topic, so it was not obvious if current code
works properly or not.
80c0517
@guilleiguaran guilleiguaran Use ProcessedAsset#pathname in Sprockets helpers when debugging is on…
…. Closes #3333 #3348 #3361.

Is wrong use ProcessedAsset#to_s since it returns the content of the file.
d7fbd63
@drogus drogus Clarify the default assets.precompile matcher behavior 169137f
@guilleiguaran guilleiguaran Skip assets groups if --skip-sprockets option is given
Conflicts:

	railties/test/generators/app_generator_test.rb
c32be81
@josevalim josevalim Merge pull request #4058 from guilleiguaran/asset-pipeline-fixes
Backport multiple fixes for asset pipeline from master to 3-1-stable
c4b13a7
@guilleiguaran guilleiguaran Fix railties tests: I broke development.rb template during last merge d545642
@josevalim josevalim Merge pull request #4065 from guilleiguaran/fix-railties-tests
Fix railties tests: I broke development.rb template during last merge
5ca308b
@arunagw arunagw It should be README.rdoc fixes #4067 41803b2
@spastorino spastorino Merge pull request #4074 from arunagw/doc_fix
doc:rails fixed
2ddedac
Commits on Dec 21, 2011
@tenderlove tenderlove adding tests for #4029 040b794
Commits on Dec 22, 2011
@tenderlove tenderlove refactoring routing tests
Conflicts:

	actionpack/test/controller/routing_test.rb
3e00e1f
@tenderlove tenderlove rack bodies should be a list d538952
Commits on Dec 23, 2011
@arunagw arunagw [docs] Added missing "}" fixes #4126 939183a
Commits on Dec 31, 2011
@hsbt hsbt upgrade rack-1.3.6 16d4bc7
@josevalim josevalim Merge pull request #4244 from hsbt/upgrade-rack-dependency
Upgrade rack dependency
8efb9e7
Commits on Jan 03, 2012
@josevalim josevalim Override respond_to? since we are also overriding method_missing. 6d5a27a
@spastorino spastorino Pass extensions to javascript_path and stylesheet_path helpers. Closes b7c7f08
Commits on Jan 10, 2012
@drogus drogus Add ORIGINAL_FULLPATH to env
This behaves similarly to REQUEST_URI, but
we need to implement it on our own because
REQUEST_URI is not reliable.

Note that since PATH_INFO does not contain
information about trailing question mark,
this is not 100% accurate, for example
`/foo?` will result in `/foo` in ORIGINAL_FULLPATH
4d872d1
@drogus drogus Add original_fullpath and original_url methods to Request c2af40b
@drogus drogus Fix http digest authentication with trailing '/' or '?' (fixes #4038
…and #3228)
238d80c
Commits on Jan 11, 2012
@spastorino spastorino Merge pull request #4412 from kennyj/fix_3743
Fix GH #3743. We must specify an encoding in rdoc_option explicitly.
efa215a
Commits on Jan 12, 2012
@tomstuart tomstuart Test ActiveRecord::Base#[]= as well as #write_attribute f22c36b
@tomstuart tomstuart Test that #[] and #[]= keep working when #read_attribute and #write_a…
…ttribute are overridden
cda5094
@tomstuart tomstuart Revert "Base#[] and Base#[]= are aliases so implement them as aliases…
… :)"

This reverts commit 21eadc1.
f707cda
@spastorino spastorino Merge pull request #4418 from tomstuart/read-and-write-attribute-alia…
…ses-3-1-stable

#[] and #[]= are no longer interchangeable with #read_attribute and #write_attribute (3-1-stable)
16f9511
@vijaydev vijaydev First attempt at providing a 'what to update' section for Rails 3.1 18d67f5
Commits on Jan 13, 2012
@guilleiguaran guilleiguaran Update actionpack Changelog in 3-1-stable 28b0050
@vijaydev vijaydev Merge pull request #4442 from guilleiguaran/3-1-changelogs
Update actionpack changelog in 3-1-stable
a677701
@josevalim josevalim config.force_ssl should mark the session as secure. d209325
@josevalim josevalim No AS::TestCase here. 98ac00c
Commits on Jan 16, 2012
@guilleiguaran guilleiguaran Mention how use config.assets.prefix to avoid conflicting with an exi…
…sting "/assets" route
f407ec5
Commits on Jan 21, 2012
@guilleiguaran guilleiguaran Add therubyracer gem commented in default Gemfile (3.1.x) bd5392c
@vijaydev vijaydev Merge pull request #4579 from guilleiguaran/add-js-runtime-to-gemfile
Add therubyracer gem commented in default Gemfile (3.1.x)
db9b1a7
Commits on Jan 23, 2012
@drogus drogus Add ActiveModel::Errors#delete, which was not available after move to…
… use delegation
f34e5a7
@pkondzior pkondzior Fix ActiveModel::Errors#dup
Since ActiveModel::Errors instance keeps all error messages as hash
we should duplicate this object as well.

Previously ActiveModel::Errors was a subclass of ActiveSupport::OrderedHash,
which results in different behavior on dup, this may result in regression for
people relying on it.

Because Rails 3.2 stills supports Ruby 1.8.7 in order to properly fix this
regression we need to backport #initialize_dup.
5da6b6e
Commits on Jan 24, 2012
@tenderlove tenderlove Merge pull request #4514 from brainopia/update_timezone_offets
Update time zone offset information
423241c
Commits on Jan 31, 2012
@kennyj kennyj Fix GH #4754. Remove double-quote characters around PK when using sql…
…_mode=ANSI_QUOTES
daa8686
@jonleighton jonleighton Merge pull request #4787 from kennyj/fix_4754-2
[Backport][3-1-stable] Fix GH #4754. Remove double-quote characters around PK when using sql_mode=ANSI_QUOTES
27357a6
Commits on Feb 17, 2012
@arunagw arunagw fixed failing test in ruby-1.8.7-p358 0bf4dc8
@spastorino spastorino Merge pull request #5072 from arunagw/fix_failing_test_ruby187_p358_3…
…1stable

Fix failing test ruby187 p358 31stable
fd2b275
@pixeltrix pixeltrix Fix ActionDispatch::Static to serve files with unencoded PCHAR
RFC 3986[1] allows sub-delim characters in path segments unencoded,
however Rack::File requires them to be encoded so we use URI's
unescape method to leave them alone and then escape them again.

Also since the path gets passed to Dir[] we need to escape any glob
characters in the path.

[1]: http://www.ietf.org/rfc/rfc3986.txt
5fcbb94
@pixeltrix pixeltrix Simplify regexp bea34a7
Commits on Feb 18, 2012
@arunagw arunagw fixed assets test 7782a70
@josevalim josevalim Merge pull request #5079 from arunagw/fix_assets_test
Fix assets test
03db636
Commits on Feb 20, 2012
@pixeltrix pixeltrix Remove fixture files with Windows incompatible filenames
Windows doesn't allow `\ / : * ? " < > |` in filenames so create
the fixture files at runtime and ignore the incompatible ones when
running on Windows.
a786236
@tenderlove tenderlove search private / protected methods in trunk ruby da7d0a2
@lest lest fix output safety issue with select options 1be2bbe
Commits on Feb 21, 2012
@amatsuda amatsuda add AS::SafeBuffer#clone_empty baf6903
@amatsuda amatsuda use AS::SafeBuffer#clone_empty for flushing the output_buffer 2d4cdb0
@tenderlove tenderlove Merge pull request #5096 from lawso017/master
Restoring ability to derive id/sequence from tables with nonstandard sequences for primary keys
Conflicts:

	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
	activerecord/test/cases/adapters/postgresql/schema_test.rb
f468d6e
@tenderlove tenderlove ruby 2.0 makes protected methods return false for respond_to, so pass…
… true as the second param
0032772
@tenderlove tenderlove more ruby 2.0 respond_to? changes 36c8521
@tenderlove tenderlove tag bind params with a bind param object 79f0a9b
Commits on Feb 22, 2012
@tenderlove tenderlove bumping up arel 995d792
@tenderlove tenderlove prepared statements can be disabled f290d6f
@tenderlove tenderlove fixing bad merge: adding bind substitution visitor 967b300
@tenderlove tenderlove updating RAILS_VERSION 8c677e9
Commits on Mar 01, 2012
@josevalim josevalim Ensure [] respects the status of the buffer. 3d86727
@tenderlove tenderlove Merge branch '3-1-stable-security' into 3-1-4
* 3-1-stable-security:
  Ensure [] respects the status of the buffer.
  use AS::SafeBuffer#clone_empty for flushing the output_buffer
  add AS::SafeBuffer#clone_empty
  fix output safety issue with select options
d1fc35f
@tenderlove tenderlove bumping to 3.1.4 1aabea6