Skip to content
This repository
  • 8,447 commits
  • 216 files changed
  • 18 comments
  • 65 contributors
This comparison is big! We're only showing the most recent 250 commits
Oct 08, 2011
José Valim Merge pull request #3248 from arunagw/query_cache_test_fix_3-1-stable
Query cache test fix 3 1 stable
5d624e3
Arun Agrawal Sqlnet.log should be ignored 574a25d
José Valim Merge pull request #3253 from arunagw/gitignore_sqlnet_file
Gitignore sqlnet file
8199b99
Arun Agrawal Sqlnet.log should also be ignored into the app gitignore d11769c
Santiago Pastorino Merge pull request #3255 from arunagw/app_gitignore_sqlnet_log_3-1-st…
…able

App gitignore sqlnet log 3 1 stable
d12af7a
Santiago Pastorino 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 Kemper 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
Ian Leitch Postgres: Do not attempt to deallocate a statement if the connection …
…is no longer active.
fc55fa7
Jeremy Kemper Disable 1.9.3 builds until upgraded from -preview1 to -rc1 a1fb214
Jeremy Kemper Don't notify IRC on every single build, just failures and first succe…
…ss after a string of failures
51550ed
Jeremy Kemper 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 Kemper 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
Guillermo Iguaran Test utf8 assets filenames with request instead of manifest lookup e63c05f
Guillermo Iguaran Isolate rake action tests that should be run under default env 09bb9de
Oct 09, 2011
Alexey Vakhov Fix params hash example in AC::Base comment 4805a65
Roy Tomeij Add note about how Sass & Sprockets don't match 0834102
Roy Tomeij Fix a typo that was mysteriously entered in previous commit b2858e6
Santiago Pastorino Add 3.1.1 release date df03e1d
Oct 10, 2011
Dan McDonald ActiveRecordStore is now called SessionStore. 5bf183c
Ryan Bigg Fix rails/generators/base.rb documentation for generator lookup 1b6886a
Oct 12, 2011
José Valim Fix wrong identation and remove extra spaces. f23f5ec
José Valim Provide failing test case for #3298 #2509 86a5271
Bruno Zanchet swallow error when can't unmarshall object from session
Signed-off-by: José Valim <jose.valim@gmail.com>
4d986c4
José Valim Add some implementation docs. closes #3298. closes #2509. 4cdc31c
Oct 14, 2011
Alexey Vakhov Add ActionController#head example b336254
Rahul P. Chaudhari Fixed typos in active_support_core_extensions.textile 077dffa
Evgeniy Dolzhenko Use .add instead of << to add errors 78bab03
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
Akira Matsuda status is a number in Rails 3 a27f6ec
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
Diego Carrion 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
Oct 18, 2011
Aaron Patterson reset prepared statement when schema changes imapact statement result…
…s. fixes #3335
818d285
José Valim Update actionpack/CHANGELOG a5d3b90
Santiago Pastorino Use again Rack's ContentLength middleware 97b3d10
Oct 19, 2011
Jeremy Kemper Use toplevel Rack::ContentLength 960882f
Oct 20, 2011
Aaron Patterson 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
Martin Svalin Fixed misleading docs for String#to_formatted_s(:db) 195fcd2
Andy Lindeman Fixes the defaults for config.cache_classes 2ab011a
Pascal Lindelauf Clarified that the config.assets.initialize_on_precompile directive n…
…eeds to be set in application.rb
9bc6a4e
Alexey Vakhov HTMl -> HTML: html scanner comment fix d103161
Oct 22, 2011
Arun Agrawal rake about information updated for 3.1 branch 7cd5448
Vijay Dev Merge pull request #3403 from arunagw/rack_doc_update
middleware doc updated
e6b9db5
Arun Agrawal 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
Guillermo Iguaran Lock turn version to 0.8.2 if Ruby version is 1.9.2 6f7d4ae
Vijay Dev Merge pull request #3409 from guilleiguaran/lock-turn-version
Lock turn version to 0.8.2 if Ruby version is 1.9.2
2032304
Oct 23, 2011
Fixed typo.
a long the way => along the way
3063afa
Fixed typo.
Ruby will know to look for this file at => Ruby will know how to look for this file at
8203338
Prem Sichanugrist Use new migration style in HABTM join table
Yes, we're on Rails 3.1 now.
d044069
Prem Sichanugrist Add some note on adding index to HABTM table 8ce3ff3
Oct 26, 2011
Brad Robertson correct documentation on initialize method to accept a single parameter 26b9e71
Vijay Dev minor fixes in the composed_of doc c90a1d2
Oct 27, 2011
Joe Van Dyk Added failing test case for changing schema in migration not clearing…
… the prepared statement cache
9317752
Aaron Patterson clear statement cache when tables are altered 74fbbca
Oct 29, 2011
Jeremy Kemper Removing db/seeds.rb is fine. Don't blow up. 5275b5d
Santiago Pastorino Merge pull request #3463 from kennyj/fix_document_for_cache
fix a document for race_condition_ttl. ActiveSupport::Cache::MemoryCache isn't exist.
aa34ab7
Oct 30, 2011
Bruce Adams note that after_initialize is run for rake tasks 1acb0eb
Henare Degan Fix a little typo 0275946
Matt Adds missing closing regex slashes. 58b0d50
Oct 31, 2011
Christopher Meiklejohn Ensure that the format isn't applied twice to the cache key, else it …
…becomes impossible to target with expire_action.
b23cd21
Aaron Patterson this should never return nil, so no use for "try" 8e6f86e
Nov 01, 2011
Santiago Pastorino Merge pull request #1796 from jdeseno/master
link_to doesn't allow rel attribute when also specifying method
816f0b6
Jeremy Kemper Revert "Disable 1.9.3 builds until upgraded from -preview1 to -rc1"
This reverts commit a1fb214.
7c36934
Nov 03, 2011
Jon Leighton Fix #3247.
Fixes creating records in a through association with a polymorphic source
type.

Conflicts:

	activerecord/CHANGELOG
01eae34
Jon Leighton Fix adding multiple instances of the same record to a has_many :through.
Fixes #3425.
175c02d
Jon Leighton 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
Jon Leighton 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
Jon Leighton 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
Justin Mazzi Preserve SELECT columns on the COUNT for finder_sql when possible.
Pull request #3503
bad2d6f
Jeremy Kemper Merge pull request #3507 from jmazzi/issue-3503
Preserve SELECT columns on the COUNT for finder_sql when possible
bd56b5a
Nov 04, 2011
Jon Leighton 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
Franck Verrot Add the MIT-LICENSE to the Active Record gemspec
(cherry picked from commit 64d9773)
e3609d6
Franck Verrot Add the MIT-LICENSE to the Active Resource gemspec
(cherry picked from commit 85283f0)
04c15b7
Franck Verrot Add the MIT-LICENSE to the Active Support gemspec
(cherry picked from commit 4633772)
09811a0
Franck Verrot Synchronize the gemspecs since CHANGELOG has been renamed to CHANGELO…
…G.md

(cherry picked from commit 1679aa5)
fbc2fde
Jon Leighton Merge pull request #3518 from cesario/gemspec-3-1-stable
Resynchronizing the gemspecs
e3ba072
Sean Kirby 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
Nov 05, 2011
Arun Agrawal Doc Fix It should be :git not :path in Gmefile Fix #3527 eb5391c
Xavier Noria Merge pull request #3528 from arunagw/doc_fix
Doc fix
194d7a4
Alexey Vakhov Update routing guides, root route should be at the top of the file 1389ebf
Alexey Vakhov Fix typo in constraints method documentation 740655c
Ryan Bigg [config guide] mention that config methods are to be called on Railti…
…e subclasses
8261230
Henrik Hodne Added bundle exec to rake test.
This is in response to rails/rails#3504.
d753596
Alexey Vakhov Fix javascript_include_tag examples in documentation 64122c7
Vijay Dev 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
Nov 06, 2011
Toshinori Kajihara Barckport to 3-1-stable: fixed an issue id false option is ignored on…
… mysql/mysql2 (fix #3440)
fb73423
Jon Leighton 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
Jon Leighton 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
Jon Leighton RUBY_ENGINE is not defined on 1.8 eef4679
Aaron Patterson Merge pull request #3521 from nulogy/fix_postgres_adapter_to_handle_s…
…paces_between_schemas

Fix postgres adapter to handle spaces between schemas
a018403
Alexey Vakhov Docs cosmetic fixes in Action View form_helper.rb 12df79c
Nov 07, 2011
Brad Folkens 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
Nov 08, 2011
Brad Folkens Fixed ' and ' should be ' && ' 0fdcd54
José Valim Merge pull request #3561 from bfolkens/3-1-stable-url_subdomain_with_…
…numeric_host

3 1 stable url subdomain with numeric host
dbecc52
Dalibor Nasevic Fixed stale doc in AbstractController::Layouts df43c98
Akira Matsuda self.up, self.down => up, down 510e49b
Akira Matsuda document fix: remove_column takes multiple column_names 23ca708
Alexey Vakhov Fix small typo in link_to_function doc cd14cbd
Joost Baaij 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
Vijay Dev Merge pull request #3576 from arunagw/changelog_changelog_md
Changelog changelog md
e7ec79d
Nov 09, 2011
Arun Agrawal CHANGELOG to CHANGELOG.md a0676b6
Nov 12, 2011
Sebastian Burkhard Properly cache value when it is "false" 551f313
Nov 13, 2011
Jean Boussier Fix a tiny typo in custom validators documentation c27c783
Alexey Vakhov Cosmetic fix in number_to_currency docs b015d92
Nov 14, 2011
Jon Leighton Revert "Properly cache value when it is "false""
This reverts commit 551f313.

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

	actionpack/actionpack.gemspec
0d78459
Jon Leighton Preparing for 3.1.2.rc1 release 68ed8ea
Jon Leighton Put sass-rails 3.1.5.rc.2 in the default Gemfile.
Otherwise there will be dependency conflicts with sprockets.
307a9e2
Jon Leighton Put sass-rails 3.1.5.rc.2 in the default Gemfile.
Otherwise there will be dependency conflicts with sprockets.
4847cbe
Jon Leighton Preparing for 3.1.2.rc2 release e29f27a
Jon Leighton rake release should push the tag 798a3c1
Jon Leighton rake release should push the tag 5ea132b
Nov 15, 2011
Juan M. Cuello 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
Jon Leighton Merge pull request #3633 from Juanmcuello/3-1-stable
Backport #3232 to 3-1-stable
ffd1519
Jon Leighton Merge pull request #3633 from Juanmcuello/3-1-stable
Backport #3232 to 3-1-stable
17c84c5
Nov 16, 2011
Jon Leighton Switch from marshal format to plain text for the encoding conversions…
… dump. This is for windows compatibility. Fixes #3644.
f754f3d
Jon Leighton Switch from marshal format to plain text for the encoding conversions…
… dump. This is for windows compatibility. Fixes #3644.
6f08621
Nov 17, 2011
Alexander Uvarov Fix impractical I18n lookup in nested fields_for 1d8c576
Xavier Noria warn the user values are directly interpolated into _html translation…
… strings
eb46afa
José Valim Merge pull request #3665 from wildchild/label_i18n_3-1-stable
Fix impractical I18n lookup in nested fields_for (3-1-stable)
78f649e
Sergey Nartimov _html translation should escape interpolated arguments 1b527d7
Sergey Nartimov _html translation should escape interpolated arguments 2d5b105
Nov 18, 2011
Xavier Noria 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
Jon Leighton Preparing for 3.1.2 release 0e6b118
Prem Sichanugrist Update variable's name in the test case to reflect the class we're te…
…sting
fc44737
Aaron Patterson 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
Philip Arndt Fixed typo: expect -> expected b7fe7c3
"denoted" instead of "donated"
"parentheses" instead of "use brackets"
ae4974a
Vijay Dev 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
Aaron Patterson allow people to set a local .Gemfile so that things like ruby-debug a…
…re not required for regular development
8fedb5f
Aaron Patterson fixing my bad merge. doh! 9848b47
Nov 19, 2011
Jon Leighton Merge branch '3-1-2' into 3-1-stable 8f4f8db
Jon Leighton 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
Toshinori Kajihara Use `show index from`. We could fix `pk_and_sequence_for` method's pe…
…rformance problem (GH #3678)
1b2d546
Jon Leighton Bump sprockets to 2.1.1
Conflicts:

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

Conflicts:

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

Fixes #3672.
cb0c3e4
Nov 20, 2011
Jon Leighton Downgrade sprockets to 2.0.3. Closes #3686. 574ed06
Jon Leighton Fix sass-rails dependency. Closes #3704. 36cefec
Jon Leighton Preparing for 3.1.3 release e9474c8
Nov 21, 2011
Guillermo Iguaran Added therubyrhino to default Gemfile under JRuby b710cea
Guillermo Iguaran Update CHANGELOG with the addition of therubyrhino 8b8ff98
Justin S. Leitgeb Make the Rack::SSL middleware configurable dcafc76
José Valim Merge pull request #3710 from dmathieu/cherry-pick-ssl-config
Cherry pick ssl config
3df6c73
Nov 22, 2011
Vijay Dev caching 'false' properly cd392fd
Nov 26, 2011
Matt Burke Add config.active_record.identity_map to the configuration guide. 1506ef0
Alexey Vakhov Small docs fix in Active Model callbacks module 7aae61f
Robert Ross Fix missing single quote that was messing up syntax highlighting. c7da693
Uģis Ozols what's -> that's 7f6b1a5
Nov 28, 2011
Arun Agrawal Bump Mysql2! c6e513b
Nov 30, 2011
Julius de Bruijn 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
Jon Leighton don't alter global state in test 6fd9c1d
Dec 01, 2011
Jonathan del Strother 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
José Valim Update CHANGELOG. 7fc91aa
Dec 02, 2011
Richard Hulse [docs] removed last-modifed line from examples 9473f7d
typo in the performance testing rails guide 2512192
Dec 03, 2011
Jon Jensen 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
Jon Leighton Avoid postgres 9.X syntax c1e2c1a
Jon Leighton Enable postgres on the CI :heart::beer::sparkles: d2ab2b0
Dec 05, 2011
Sam Umbach 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
Sam Umbach Test return value of ActiveSupport::Dependencies::Loadable#load 31cead7
Sam Umbach Test that require and load raise LoadError if file not found 0f81554
Sam Umbach Simplify load and require tests
- These tests don't use autoloading so there's no need to add anything to autoload_paths
a070dd1
Aaron Patterson 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
Toshinori Kajihara Use show create table.
Conflicts:

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

	activemodel/lib/active_model/naming.rb
3952854
José Valim 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
Jon Leighton Fix #3890. (Calling proxy_association in scope chain.)
Conflicts:

	activerecord/test/models/post.rb
63293d1
Aaron Patterson load the encoding converter to work around [ruby-core:41556] when swi…
…tching encodings
e568c67
Dec 09, 2011
Vijay Dev fix a bad url 92d24b7
Guillermo Iguaran Add test to verify that therubyrhino isn't included when JRuby isn't …
…used
80b1d4d
Dec 10, 2011
José Valim Merge pull request #3705 from guilleiguaran/3-1-stable-therubyrhino
Added therubyrhino to default Gemfile under JRuby
d06c3b3
Arun Agrawal Fix broken encoding test 49bbdf2
José Valim Merge pull request #3928 from arunagw/fix_template_test
Fix template test
25ac7e4
Dec 12, 2011
Aaron Patterson use Array#join so that file encoding doesn't impact returned string.
Fixes #3957
4371be2
Dec 14, 2011
Ryan Sandridge Fixing typo in Routing Guide. 50ac4a3
Ryan Sandridge Replacing vague mention of an unspecified section above with a link t…
…o the actual section containing Asset Organization.
ed89235
Mikhail Dieterle Typo in list dced6d6
Jon Leighton 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
Xavier Noria let sdoc say which version of rdoc we depend on
Conflicts:

	Gemfile
60a91f1
Dec 15, 2011
Jon Leighton Fix #3987.
Conflicts:

	activerecord/lib/active_record/attribute_methods/primary_key.rb
	activerecord/test/cases/primary_keys_test.rb
df932c4
Dec 17, 2011
Santiago Pastorino Add campfire notifications for travis 2f7e701
Dec 18, 2011
Sergey Nartimov backport call scope within unscoped to prevent duplication of where v…
…alues
9f7fe5d
Dec 19, 2011
Jon Leighton Don't notify campfire when the build keeps passing b9aabc7
Santiago Pastorino Merge pull request #4025 from arunagw/travis_sync
Travis sync
0479789
Dec 20, 2011
Guillermo Iguaran 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
Piotr Sarnacki 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
Guillermo Iguaran 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
Piotr Sarnacki Clarify the default assets.precompile matcher behavior 169137f
Guillermo Iguaran Skip assets groups if --skip-sprockets option is given
Conflicts:

	railties/test/generators/app_generator_test.rb
c32be81
José Valim Merge pull request #4058 from guilleiguaran/asset-pipeline-fixes
Backport multiple fixes for asset pipeline from master to 3-1-stable
c4b13a7
Guillermo Iguaran Fix railties tests: I broke development.rb template during last merge d545642
José Valim Merge pull request #4065 from guilleiguaran/fix-railties-tests
Fix railties tests: I broke development.rb template during last merge
5ca308b
Arun Agrawal It should be README.rdoc fixes #4067 41803b2
Santiago Pastorino Merge pull request #4074 from arunagw/doc_fix
doc:rails fixed
2ddedac
Aaron Patterson adding tests for #4029 040b794
Dec 22, 2011
Aaron Patterson refactoring routing tests
Conflicts:

	actionpack/test/controller/routing_test.rb
3e00e1f
Aaron Patterson rack bodies should be a list d538952
Dec 24, 2011
Arun Agrawal [docs] Added missing "}" fixes #4126 939183a
Dec 31, 2011
SHIBATA Hiroshi upgrade rack-1.3.6 16d4bc7
José Valim Merge pull request #4244 from hsbt/upgrade-rack-dependency
Upgrade rack dependency
8efb9e7
Jan 03, 2012
José Valim Override respond_to? since we are also overriding method_missing. 6d5a27a
Santiago Pastorino Pass extensions to javascript_path and stylesheet_path helpers. Closes b7c7f08
Jan 10, 2012
Piotr Sarnacki 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
Piotr Sarnacki Add original_fullpath and original_url methods to Request c2af40b
Piotr Sarnacki Fix http digest authentication with trailing '/' or '?' (fixes #4038
…and #3228)
238d80c
Jan 11, 2012
Santiago Pastorino Merge pull request #4412 from kennyj/fix_3743
Fix GH #3743. We must specify an encoding in rdoc_option explicitly.
efa215a
Jan 12, 2012
Tom Stuart Test ActiveRecord::Base#[]= as well as #write_attribute f22c36b
Tom Stuart Test that #[] and #[]= keep working when #read_attribute and #write_a…
…ttribute are overridden
cda5094
Tom Stuart Revert "Base#[] and Base#[]= are aliases so implement them as aliases…
… :)"

This reverts commit 21eadc1.
f707cda
Santiago Pastorino 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
Guillermo Iguaran Update actionpack Changelog in 3-1-stable 28b0050
Vijay Dev Merge pull request #4442 from guilleiguaran/3-1-changelogs
Update actionpack changelog in 3-1-stable
a677701
Jan 13, 2012
Vijay Dev First attempt at providing a 'what to update' section for Rails 3.1 18d67f5
José Valim config.force_ssl should mark the session as secure. d209325
José Valim No AS::TestCase here. 98ac00c
Jan 16, 2012
Guillermo Iguaran Mention how use config.assets.prefix to avoid conflicting with an exi…
…sting "/assets" route
f407ec5
Jan 21, 2012
Guillermo Iguaran Add therubyracer gem commented in default Gemfile (3.1.x) bd5392c
Vijay Dev Merge pull request #4579 from guilleiguaran/add-js-runtime-to-gemfile
Add therubyracer gem commented in default Gemfile (3.1.x)
db9b1a7
Jan 23, 2012
Piotr Sarnacki Add ActiveModel::Errors#delete, which was not available after move to…
… use delegation
f34e5a7
Paweł Kondzior 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
Jan 24, 2012
Aaron Patterson Merge pull request #4514 from brainopia/update_timezone_offets
Update time zone offset information
423241c
Jan 31, 2012
Toshinori Kajihara Fix GH #4754. Remove double-quote characters around PK when using sql…
…_mode=ANSI_QUOTES
daa8686
Jon Leighton 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
Feb 17, 2012
Arun Agrawal fixed failing test in ruby-1.8.7-p358 0bf4dc8
Santiago Pastorino Merge pull request #5072 from arunagw/fix_failing_test_ruby187_p358_3…
…1stable

Fix failing test ruby187 p358 31stable
fd2b275
Andrew White 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
Andrew White Simplify regexp bea34a7
Feb 18, 2012
Arun Agrawal fixed assets test 7782a70
José Valim Merge pull request #5079 from arunagw/fix_assets_test
Fix assets test
03db636
Feb 20, 2012
Andrew White 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
Aaron Patterson search private / protected methods in trunk ruby da7d0a2
Sergey Nartimov fix output safety issue with select options 1be2bbe
Akira Matsuda add AS::SafeBuffer#clone_empty baf6903
Akira Matsuda use AS::SafeBuffer#clone_empty for flushing the output_buffer 2d4cdb0
Feb 21, 2012
Aaron Patterson 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
Aaron Patterson ruby 2.0 makes protected methods return false for respond_to, so pass…
… true as the second param
0032772
Aaron Patterson more ruby 2.0 respond_to? changes 36c8521
Aaron Patterson tag bind params with a bind param object 79f0a9b
Aaron Patterson bumping up arel 995d792
Feb 22, 2012
Aaron Patterson prepared statements can be disabled f290d6f
Aaron Patterson fixing bad merge: adding bind substitution visitor 967b300
Aaron Patterson updating RAILS_VERSION 8c677e9
Feb 29, 2012
José Valim Ensure [] respects the status of the buffer. 3d86727
Mar 01, 2012
Aaron Patterson 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
Aaron Patterson bumping to 3.1.4 1aabea6