Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

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

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: rails/rails
...
head fork: rails/rails
Checking mergeability… Don't worry, you can still create the pull request.
This comparison is big! We're only showing the most recent 250 commits
Commits on May 31, 2011
@pixeltrix pixeltrix Make MemCacheStore work with Ruby 1.9 and -Ku 91f6fba
Commits on Jun 01, 2011
@arunagw arunagw Adding comment bddf9ad
@jonleighton jonleighton Merge pull request #1430 from vatrai/jruby_test_fix
test fixes for jruby
7bd8012
@jonleighton jonleighton Fix broken test. You know, the merge button will be the end of us... 4c0bed0
Commits on Jun 02, 2011
@sikachu sikachu Revert "Fix broken test. You know, the merge button will be the end o…
…f us..."

The fix was intentionaly for this branch, but was applied to another
branches by mistake. This should fix the CI.

This reverts commit 4c0bed0.
4b8b16b
@NZKoz NZKoz Merge pull request #1454 from sikachu/revert_failing_commit
Revert failing commit
9f50123
Commits on Jun 04, 2011
@jonleighton jonleighton Force RAILS_ENV=development in rackup_test.rb. This fixes a problem o…
…n the CI server. For some reason the RAILS_ENV on the CI server is production, which means that the ActionDispatch::Static middleware is not used, and so the request in 'config.ru can be racked up' returns a 404 rather than a 200.
11da7d3
@jonleighton jonleighton Refactor Active Record test connection setup. Please see the RUNNING_…
…UNIT_TESTS file for details, but essentially you can now configure things in test/config.yml. You can also run tests directly via the command line, e.g. ruby path/to/test.rb (no rake needed, uses default db connection from test/config.yml). This will help us fix the CI by enabling us to isolate the different Rails versions to different databases.
93447be
@jonleighton jonleighton Bring back oracle specific crap 9675ad6
Commits on Jun 05, 2011
@jonleighton jonleighton Fix typo 6764449
@jonleighton jonleighton Fix adapter_test.rb to make no assumptions about the database name 6c1b7dc
@jonleighton jonleighton load_path_test.rb is also dependent on RAILS_ENV=development 1debebc
Commits on Jun 06, 2011
@arunagw arunagw framework_test.rb also dependent on RAILS_ENV=development 55b52ee
@arunagw arunagw loading_test.rb with RAILS_ENV=development db9ad5e
@arunagw arunagw Fix for CI server. Dependent on RAILS_ENV=development 101f0a6
@josevalim josevalim Merge pull request #1506 from arunagw/3-0-stable
Cherry-picked from master to fix the build
e9b025e
@jonleighton jonleighton Solve the RAILS_ENV problem in the railties tests in a more generic way 6512af2
@vijaydev vijaydev fixes Rake::GemPackageTask deprecation warnings from rake 0.9.0 13c8ed3
@vijaydev vijaydev fixes Rake::RDocTask deprecation warnings from rake 0.9.0 (cherry picked
b921679 for 3-0-stable)
91bdd36
@vijaydev vijaydev cherry picked 24b28a2 for 3-0-stable. Original Author: amatsuda 81b01b7
@vijaydev vijaydev cherry picked 05adf52 for 3-0-stable. Original Author: amatsuda bbfd652
@tenderlove tenderlove Merge pull request #1511 from vijaydev/rake_rdoc_fixes_cherry_picks_3_0
Rake rdoc fixes cherry picks for 3-0-stable
d55cf30
@jonleighton jonleighton Fix another CIfail :zap: :fire: Deleting RAILS_ENV from ENV doesn't produce th…
…e desired result if RACK_ENV is still defined. And in any case it's better to be explicit here, so just set RALS_ENV=development.
5ffd03f
@jonleighton jonleighton Fix double definition of #teardown. Thanks @mike-burns :+1: 7497d27
@jonleighton jonleighton Make sure that the build/drop database rake tasks take account of the…
… test/config.yml config
0a4eb26
@tenderlove tenderlove please use ruby -I lib:test path/to/test.rb, or export RUBY_OPT 1241997
@tenderlove tenderlove add test to the include path 29c7258
@tenderlove tenderlove updating configs for oracle e6c2d54
@tenderlove tenderlove do not muck with the load path, that is the test task responsibility 3f3648c
@tenderlove tenderlove more oracle fixes f0cb0ed
@tenderlove tenderlove set the environment variable from the rake file f8301eb
@tenderlove tenderlove oops! add parens so the block is properly bound 1f02e3e
Commits on Jun 07, 2011
@tenderlove tenderlove make sure AR isolated tests set the environment variable b3b747d
@NZKoz NZKoz Ensure that the strings returned by SafeBuffer#gsub and friends aren'…
…t considered html_safe?

Also make sure that the versions of those methods which modify a string in place such as gsub! can't be called on safe buffers at all.
53a2c0b
@nono nono Do not modify a safe buffer in helpers
Signed-off-by: Michael Koziarski <michael@koziarski.com>
ed37964
@tenderlove tenderlove bumping to 3.0.8 b341e45
@tenderlove tenderlove Merge branch '3-0-8' into 3-0-stable
* 3-0-8:
  bumping to 3.0.8
  Do not modify a safe buffer in helpers
  Ensure that the strings returned by SafeBuffer#gsub and friends aren't considered html_safe?
54d262f
Commits on Jun 08, 2011
@arunagw arunagw Fixed mailto for SafeBuffer#gsub cdf617e
@arunagw arunagw Cache helper fixed for SafeBuffer 059692a
@tenderlove tenderlove Merge pull request #1541 from arunagw/3-0-stable
Fixed for SafeBuffer
bdc80dd
@sikachu sikachu Adapt [059692a] to make sure we perform correct cloning before manipu…
…lation on `OutputBuffer`.

This has been adapted from [823aa22]. However, after the fragment rendering, `Builder` returns the `String` object instead of `ActionView::OutputBuffer`. Somehow the same procedure which was in [823aa22] does not play nice with the String, and result in the fragment got lost.
114b5e4
@tenderlove tenderlove Merge pull request #1545 from sikachu/30testbuffer
Fix test on 3-0-stable regarding SafeBuffer
2111509
@rsim rsim Fix for Oracle adapter to count SELECT queries for assert_queries ass…
…ertion

Needed just in 3-0-stable branch, query counting is refactored in 3-1-stable and master branches and do not need this patch anymore.
d909693
@jonleighton jonleighton Merge pull request #1554 from rsim/assert_queries_oracle_fix_for_3_0
Assert queries oracle fix for 3 0
eff72b2
@tardate tardate Make escape_javascript happy to handle SafeBuffers
* see GH#1553
* allow for the fact that gsub on SafeBuffer does not pass match variables $1, $2 etc to a block
75ecdfb
@josevalim josevalim Merge pull request #1558 from tardate/3-0-stable
Fix for issue 1553 - escape_javascript to support SafeBuffer strings
910b34d
@sikachu sikachu Update CHANGELOG to mention the new SafeBuffer change 4252a35
@tenderlove tenderlove Merge pull request #1565 from sikachu/3-0-stable-changelog
Update CHANGELOG to mention the new SafeBuffer change
02e65ef
@sikachu sikachu Revert "Fixed mailto for SafeBuffer#gsub"
It was fixing it in a bad way by changing test.

This reverts commit cdf617e.
f57c707
@sikachu sikachu Add proper fix to `mail_to` helper.
* Fix the problem on manipulating on the `ActiveSupport::SafeBuffer`
4b1309e
@tenderlove tenderlove Merge pull request #1568 from sikachu/3-0-stable-mailto
Add proper fix to mail_to helper
1ae9b29
@tenderlove tenderlove bumping to 3.0.9.rc1 0c1608c
Commits on Jun 09, 2011
@bradrobertson bradrobertson modified table_exists? to always use current search_path or schema if…
… explicitly set
0252376
@sikachu sikachu Make sure `escape_javascript` return `SafeBuffer` if the incoming arg…
…ument is already html_safe
3d82d81
@tenderlove tenderlove Merge pull request #1611 from sikachu/3-0-stable-javascript
Make sure `escape_javascript` return `SafeBuffer` if the incoming argumen
b6a2157
@chopmo chopmo Fix issue #1598 by adding a dependency to the RDoc gem. caa9779
@chopmo chopmo Fix issue #1598 by adding a dependency to the RDoc gem. b002181
@sikachu sikachu Make sure `escape_javascript` return `SafeBuffer` if the incoming arg…
…ument is already html_safe
8fcdc15
@tenderlove tenderlove ensuring that json_escape returns html safe strings when passed an ht…
…ml safe string
88413ef
@tenderlove tenderlove ensuring that json_escape returns html safe strings when passed an ht…
…ml safe string
cce7085
@tenderlove tenderlove bumping to 3.0.9.rc2 0e1ecb2
@tenderlove tenderlove bumping to rc3 since syck is not playing nicely 66ec7e8
Commits on Jun 10, 2011
@pixeltrix pixeltrix Ensure number helpers can handle HTML safe strings - closes #1597. 9b80f8d
@sikachu sikachu Update CHANGELOG to mention the json_escape change c4fbb21
@sikachu sikachu Make sure that we don't perform in-place mutation on SafeBuffer string
This will make sure `render :inline` is working.

Closes #1633
104e200
@pixeltrix pixeltrix Ensure number helpers can handle HTML safe strings - closes #1597. 60d4dc1
@sikachu sikachu Update CHANGELOG to mention the json_escape change 564a655
@sikachu sikachu Make sure that we don't perform in-place mutation on SafeBuffer string
This will make sure `render :inline` is working.

Closes #1633
fb706c7
@tenderlove tenderlove Merge pull request #1639 from sikachu/3-0-stable-render-inline
Render inline fix for 3-0-stable
70b4ea9
@tenderlove tenderlove Merge pull request #1640 from sikachu/3-0-9-render-inline
Render inline fix for 3-0-9
f169dab
Commits on Jun 11, 2011
Santiago Pastorino and José Ignacio Costa Revert "Make sure that we don't perform in-place mutation on SafeBuff…
…er string"

This reverts commit 104e200.
0019379
@arunagw arunagw Adding JDBCmysql template for Jruby in 3-0-stable. 4448988
@arunagw arunagw Tests added for activerecord-jdbcmysql 0e0be35
@arunagw arunagw Adding JDBCsqlite3 template for Jruby in 3-0-stable. 871a0fc
@arunagw arunagw Adding jdbcsqlite3 in comment 680e5d2
@arunagw arunagw Adding JDBCpostgresql template for Jruby in 3-0-stable. bcd9145
@arunagw arunagw Adding Jruby-openssl in gemfile for 3-0-stable. 7f4bf01
@arunagw arunagw Fixed error when running db:create with jdbcmysql d5b9ea3
@arunagw arunagw Allow database.rake tasks to perform opreation with jdbcpostgresql 9da2a10
@arunagw arunagw Modified database.rake file to run with jdbcsqlite3 2b4a7ca
@arunagw arunagw Using different constant. 110de0f
Commits on Jun 12, 2011
@pixeltrix pixeltrix Define ActiveSupport#to_param as to_str - closes #1663 a64b5dd
@jonleighton jonleighton Add support for using an ARCONFIG environment variable to specify the…
… location of the config.yml file for running the tests
968816a
@tenderlove tenderlove Merge branch '3-0-stable' into 3-0-9
* 3-0-stable:
  Add support for using an ARCONFIG environment variable to specify the location of the config.yml file for running the tests
  Define ActiveSupport#to_param as to_str - closes #1663
  Revert "Make sure that we don't perform in-place mutation on SafeBuffer string"
  Make sure that we don't perform in-place mutation on SafeBuffer string
  Update CHANGELOG to mention the json_escape change
  Ensure number helpers can handle HTML safe strings - closes #1597.
  ensuring that json_escape returns html safe strings when passed an html safe string
  Fix issue #1598 by adding a dependency to the RDoc gem.
  Make sure `escape_javascript` return `SafeBuffer` if the incoming argument is already html_safe

Conflicts:
	actionpack/CHANGELOG
d5e28c3
@tenderlove tenderlove bumping to rc4 f283194
@tenderlove tenderlove Merge branch '3-0-9' of github.com:rails/rails into 3-0-9
* '3-0-9' of github.com:rails/rails:
  Make sure that we don't perform in-place mutation on SafeBuffer string
  Update CHANGELOG to mention the json_escape change
  Ensure number helpers can handle HTML safe strings - closes #1597.
d958428
@tenderlove tenderlove Preparing for 3.0.9.rc5 release 6824c5d
Commits on Jun 13, 2011
@pixeltrix pixeltrix Remove obsolete compatibility module 271bccb
@jonleighton jonleighton Add Gemfile dependency for require_relative on mri18. This is a depen…
…dency of linecache which is a dependency of ruby-debug. However, the latest release of linecache (0.45) omits the dependency from its gemspec, causing the build to fail. I have emailed the maintainer so we should remove this when it's fixed upstream.
4a96ab4
Commits on Jun 15, 2011
@pixeltrix pixeltrix Make MissingTranslation exception handler respect :rescue_format 190101e
@dmathieu dmathieu simplify to only one condition
Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
6cfd1c7
@dmathieu dmathieu encode the uploaded file's name in the default external encoding - Cl…
…oses #869
991e388
@dmathieu dmathieu all requests are utf-8. Don't use the external encoding. 71d7610
@daeltar daeltar Use assert_equal instead of assert in uploaded file test. b869b8c
@josevalim josevalim Merge pull request #1714 from dmathieu/3-0-cherry
Cherry picking encoding for 3.0
95905c5
Commits on Jun 16, 2011
@tenderlove tenderlove avoid false positives caused by release candidates fad08a6
@tenderlove tenderlove Preparing for 3.0.9 release 15e2b58
@tenderlove tenderlove Merge branch '3-0-9' into 3-0-stable
* 3-0-9:
  Preparing for 3.0.9 release
  avoid false positives caused by release candidates
  Preparing for 3.0.9.rc5 release
  bumping to rc4
  Make sure that we don't perform in-place mutation on SafeBuffer string
  Update CHANGELOG to mention the json_escape change
  Ensure number helpers can handle HTML safe strings - closes #1597.
  bumping to rc3 since syck is not playing nicely
  bumping to 3.0.9.rc2
  ensuring that json_escape returns html safe strings when passed an html safe string
  Make sure `escape_javascript` return `SafeBuffer` if the incoming argument is already html_safe
  Fix issue #1598 by adding a dependency to the RDoc gem.
  bumping to 3.0.9.rc1
5e61d0b
Commits on Jun 17, 2011
@jonleighton jonleighton Add require 'pathname' as it has not already been required in some ci…
…rcumstances
8742a97
@spastorino spastorino Bump mysql2 up fccacae
Commits on Jun 19, 2011
@arunagw arunagw Removing require_relative gem. Linecache new version 0.46 is out and
it's loading rbx-require-relative > 0.0.4
48fcd22
@josevalim josevalim Merge pull request #1772 from arunagw/require_rel_remove-3-0-stable
Require rel remove 3 0 stable
8d9bc64
@bensie bensie Add option to omit creating an instance reader method on class_attribute ad06ddd
@josevalim josevalim Merge pull request #1775 from bensie/class-attr-3-0-stable
Instance reader method on class_attribute - 3-0-stable
22cc1e9
Commits on Jun 20, 2011
@josevalim josevalim Fix SafeBuffers by adding a dirty flag. bc070ba
@josevalim josevalim Removed file added by accident. 8467ea3
Commits on Jun 21, 2011
@arunagw arunagw For more specific for jdbc postgresql databases. 3e7af42
@arunagw arunagw More specific for jdbc-sqlite 14bfe83
@arunagw arunagw Only mysql and jdbcmysql. 3b05231
@arunagw arunagw Fixed for sqlite3 checking with jdbc 4bfbdd1
Commits on Jun 22, 2011
@arunagw arunagw Remove superfluous pg driver install instructions 25e5ad2
@arunagw arunagw Add generic 'jdbc' database option 2aeabdc
@arunagw arunagw Convert database names to ones appropriate for JRuby 2fc22bf
@arunagw arunagw Tests added for jdbc option fb495cd
@arunagw arunagw Modified .yml files according to master changes. As this will also work. ecddc65
@arunagw arunagw Test added to check default option with jruby. It should generate
sqlite3 bases app
2771b91
Commits on Jun 23, 2011
Jeroen Jacobs Tests only after filters in cache sweepers 8ebc17f
Jeroen Jacobs Fixes an issue where cache sweepers with only after filters would hav…
…e no controller object

It would raise undefined method controller_name for nil
2f9bd25
@mikegehard mikegehard Fix issue where assigning a empty string to the _type column of a pol…
…ymorphic association throws an error. Now it returns nil for the association as one would expect.

[Fixes #1824]
5a44c70
@spastorino spastorino Merge pull request #1834 from jeroenj/cachesweeper-fix-3-0
Fixes an issue where cache sweepers
3add2ea
@spastorino spastorino Add CHANGELOG entry 19392cf
Commits on Jun 24, 2011
@fxn fxn updates the contributing guide 59f19a9
Commits on Jun 28, 2011
@tenderlove tenderlove Merge pull request #1649 from arunagw/jruby_3_0_stable
Jruby 3 0 stable
a6495af
Maxime RETY Fix JSON decoding of newline character with Yaml backend [#3479 state…
…:resolved]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
b3e3c50
@arunagw arunagw Using not effected timezone in tests. 0ed8dea
Commits on Jun 29, 2011
@vatrai vatrai 3-0-stable fix test when running Jruby. If Jruby Platform is availabl…
…e the gem will change.
557d788
@guilleiguaran guilleiguaran Avoid extra call to Cache#read in case of a fragment cache hit e54d9c1
@tenderlove tenderlove Merge pull request #1896 from guilleiguaran/issue-1893
Avoid extra call to Cache#read in case of a fragment cache hit (3-0-stable)
a657a4b
@arunagw arunagw It should be in Json format to work with JsonGem a13317d
Commits on Jun 30, 2011
@spastorino spastorino Merge pull request #1901 from arunagw/json_parse
It should be in Json format to work with JsonGem
39d5350
@spastorino spastorino Update CI config 3d0fde5
@spastorino spastorino Allow CI to use the latest rubygems version 9663fad
Commits on Jul 01, 2011
@bogdan bogdan Fixed ActionView::FormOptionsHelper#select with :multiple => false
(cherry picked from commit 0fdac01)

Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
c314203
Commits on Jul 04, 2011
@simonbaird simonbaird Fix charset/collate in mysql recreate_database
See new method mysql_creation_options. It is used by both
create_database and recreate_database so they are consistent.
3ba3125
@pixeltrix pixeltrix The rails gem doesn't have a lib directory. 3001728
@pixeltrix pixeltrix Revert "The rails gem doesn't have a lib directory."
RubyGems requires at least one require_path.

This reverts commit 3001728.
1b03f7f
Commits on Jul 06, 2011
@spastorino spastorino Merge pull request #1894 from arunagw/fix_test_for_jruby_db-3-0-stable
Fix test for jruby db 3 0 stable
7ff32e2
@spastorino spastorino Merge pull request #1952 from simonbaird/3-0-stable
rake db:test:purge creates mysql database with wrong charset & collation
2f3eb7a
@spastorino spastorino Merge pull request #1837 from msgehard/3-0-stable
Fix for empty string assigned to _type column of polymorphic association
9e4d156
Commits on Jul 07, 2011
@knapo knapo Make `ActiveRecord::Batches#find_each` to not return `self`.
This caused that `find_each` was producing extra db call taking all the records from db, and was less efficient than `ActiveRecord::Base#all`.
e2d90bf
@spastorino spastorino Merge pull request #2004 from knapo/3-0-stable
Backport of #1997
e9f2c67
@guilleiguaran guilleiguaran Update to latest rails.js for fix some bugs under IE 8226dfc
Commits on Jul 08, 2011
Tomas D'Stefano Destroy association habtm record before destroying the record itself.…
… Fixes issue #402.
28f057c
Commits on Jul 11, 2011
@kuahyeow kuahyeow Fix for 3-0-stable - Conditions specified on through association shou…
…ldn't clobber asssociation join condition.

This fix refactors processing of association join conditions so that both the join condition and the custom condition will be used when called by query_methods.rb, which expects a 1 or 2-sized array (depending on the type of association). Previously, a custom condition specified would create a 2 or 3-sized array which will clobber the association join condition.
caec639
@jonleighton jonleighton Merge pull request #1797 from kuahyeow/3-0-stable
Through association condition clobbers join condition
fc4bce1
Commits on Jul 12, 2011
@tenderlove tenderlove Merge pull request #1607 from bradrobertson/pg_adapter
fix table_exists? in postgresql adapter to always use current search_path
9a4d2b2
Commits on Jul 15, 2011
@lhahne lhahne fixed CacheHelper to properly support html_safe output buffers c476a6b
Commits on Jul 16, 2011
@elight elight Fixes #2064
Backport of cache_key fix from master
b1b5d18
@spastorino spastorino Merge pull request #2064 from elight/3-0-stable
Backports cache_key fix from master
247a50b
@dyba dyba Changed Commands module to RailsCommands.
This is to avoid a conflict that occurs when you add Rake to
your Gemfile. There is a Commands Object in Rake that conflicts
with the Commands module in plugin.rb. See rails issue #1866.
c2d3a43
Commits on Jul 17, 2011
@lhahne lhahne Added tests for the output_buffer returned by CacheHelper
The output_buffer returned by CacheHelper should be html_safe if the original buffer is html_safe.
bc5ccd0
@lhahne lhahne made sure that the possible new output_buffer created by CacheHelper …
…is of the same type as the original
39a4f67
@sikachu sikachu Fix a wrong assertion on url_helper_test, and refactor `html_safe` te…
…st to be in its method
2cb29fa
@spastorino spastorino Merge pull request #2047 from sikachu/3-0-stable-test_fix
Fix a wrong assertion on url_helper_test, and add missing `#html_safe?` a
1220b16
Commits on Jul 18, 2011
@dyba dyba Substituted RailsCommands for Rails::Commands 71c010d
@jstorimer jstorimer Ensure that status codes are logged properly
Needed to move AC::Metal::Instrumentation before AM::Metal::Rescue
so that status codes rendered from rescue_from blocks are logged
properly.
5e64538
@spastorino spastorino Merge pull request #2134 from jstorimer/ensure-status-codes-are-logge…
…d-properly-3-0-stable

Ensure status codes are logged properly (for 3-0-stable)
a6139b9
@joshk joshk This fixes an issue when bundling to a local path (eg. /vendor/bundle).
If you bundle to a local path bundler is not included in it, so
calling "gem 'bundler'" will fail.

Conflicts:

	load_paths.rb
9ade587
@joshk joshk Added a .travis.yml config and travis specific ci script.
Don't install ruby-debug if running the test suite on Travis,
linecache19 is the main offender, very very slow.

And do not install pg if Travis is bundling the gems, pg will be setup
on Travis soon.

Conflicts:

	Gemfile
047b979
Commits on Jul 21, 2011
@fxn fxn I actually love well-formed Gemfiles 80b1f9e
Commits on Jul 22, 2011
@Karunakar Karunakar Duplicate tests removed. bd804d7
@spastorino spastorino Merge pull request #2183 from castlerock/3-0-stable-duplicate_test
3 0 stable duplicate test
c39bd5f
Commits on Jul 23, 2011
@arunagw arunagw fixed task for rake test:uncommitted b490fd8
@spastorino spastorino Merge pull request #2205 from arunagw/test_un_3_0_stable
rake test:uncommitted for 3-0-stable
19d9689
Commits on Jul 24, 2011
@spastorino spastorino Merge pull request #2080 from lhahne/3-0-stable
Fix improper detection and handling of html_safe buffer in CacheHelper
eead13f
Commits on Jul 25, 2011
@arunagw arunagw Fix rake rails:template to tell user to pass LOCATION variable. edfcf47
@spastorino spastorino Merge pull request #2249 from arunagw/rake_template_path_fix
Rake template path fix
56c663b
Commits on Jul 26, 2011
@joshk joshk enable Travis CI irc notifications to #rails-contrib on irc.freenode.org 64c269a
@spastorino spastorino Merge pull request #2289 from joshk/3-0-stable
More Irc notifications (from Travis with love, again)
e18e896
@spastorino spastorino Remove cruise files 43e6f82
Commits on Jul 27, 2011
@fxn fxn contrib app minor tweak e93cff8
Commits on Jul 28, 2011
@amatsuda amatsuda callback methods are Class methods a8aa666
@spastorino spastorino Merge pull request #2320 from amatsuda/callback_deprecation_message
callback methods are Class methods
a33fe79
Commits on Jul 29, 2011
@tenderlove tenderlove dump IO encoding value along with schema.rb so the file can be reload…
…ed. fixes #1592
6c0beb5
@bhavinkamani bhavinkamani fix connection not established error while running rake task
db:schema:dump
5d7ed7a
@tenderlove tenderlove default writing the schema file as utf-8 3676af4
@tenderlove tenderlove updating changelog with schema.rb changes 6631abd
@tenderlove tenderlove delay backtrace scrubbing until we actually raise an exception. fixes #… b9f6798
@tenderlove tenderlove updating the CHANGELOG 553d9ea
Commits on Jul 31, 2011
@arunagw arunagw skiping magic comment test. checking encoding_aware?
Loading AS encoding.
b0334db
@spastorino spastorino Merge pull request #2374 from arunagw/30_schema_dumper_test_fix
3-0-stable schema dumper test fix
cb36585
@vijaydev vijaydev fixes #2368. rake about not showing the middleware, db adapter and db…
… schema version
773d219
@spastorino spastorino Merge pull request #2381 from vijaydev/rakeaboutfix3.0
Fix #2368 (3-0-stable)
564d39e
Commits on Aug 01, 2011
@spastorino spastorino Merge pull request #2393 from bdurand/fix_cache_read_multi
Fix ArgumentError in ActiveSupport::Cache::CacheStore.read_multi
a173bb3
Commits on Aug 03, 2011
@jonleighton jonleighton Quote these dates to prevent intermittent test failure. Suppose local…
… time is 00:50 GMT+1. Without the quoting, the YAML parser would parse this as 00:50 UTC, into the local time of 01:50 GMT+1. Then, it would get written into the database in local time as 01:50. When it came back out the UTC date from the database and the UTC date of two weeks ago would be compared. The former would be 23:50, and the latter would be 00:50, so the two dates would differ, causing the assertion to fail. Quoting it prevents the YAML parser from getting involved.
e42c544
Commits on Aug 04, 2011
@tenderlove tenderlove we should not ignore all gems in here df6b1e2
@tenderlove tenderlove updating CHANGELOGs f54d0cf
Commits on Aug 05, 2011
@fxn fxn backports doc fix 9f9446f e0b0da2
@tenderlove tenderlove more changelog updates 9d17458
@tenderlove tenderlove bumping to 3.0.10.rc1 521c9aa
Commits on Aug 06, 2011
@spastorino spastorino Merge pull request #2450 from guilleiguaran/activesupport-gzip-1.8
Fix ActiveSupport::Gzip under Ruby 1.8.7. Closes #2416
65a648b
Commits on Aug 08, 2011
@jasoncodes jasoncodes Fix marshal round-tripping of fractional seconds (Time#subsec). 1f63606
Commits on Aug 11, 2011
Gonzalo Rodriguez and Leonardo Capillera Remove 'parameters_for_url' from 'form_tag' method signature 11f6531
@spastorino spastorino Merge pull request #2494 from grzuy/3-0-stable
Porting changes on form_tag method signature to 3-0-stable
f45c372
Commits on Aug 15, 2011
@jonleighton jonleighton Update travis config on @joshk's instructions 4c8a211
Commits on Aug 16, 2011
@tenderlove tenderlove Properly escape glob characters. e0c03f8
@tenderlove tenderlove prevent sql injection attacks by escaping quotes in column names fb4747b
@tenderlove tenderlove Tags with invalid names should also be stripped in order to prevent
XSS attacks.  Thanks Sascha Depold for the report.
3480d97
@tenderlove tenderlove properly subsituting bad utf8 characters b45dfc7
@tenderlove tenderlove bumping rails to 3.0.10 4f15f39
@tenderlove tenderlove Merge branch '3-0-10' into 3-0-stable
* 3-0-10:
  bumping rails to 3.0.10
  properly subsituting bad utf8 characters
  Tags with invalid names should also be stripped in order to prevent XSS attacks.  Thanks Sascha Depold for the report.
  prevent sql injection attacks by escaping quotes in column names
  Properly escape glob characters.
  bumping to 3.0.10.rc1
  more changelog updates
  updating CHANGELOGs
0b37704
Commits on Aug 21, 2011
@josevalim josevalim Edited .travis.yml via GitHub 0ebdef2
Commits on Aug 22, 2011
@spastorino spastorino Merge pull request #2524 from JonathonMA/fix_ecd37084b28a05f05251
Use mysql_creation_options inside rescue block
c8ec8f7
Commits on Aug 23, 2011
@tenderlove tenderlove Merge pull request #1995 from guilleiguaran/prototype-ujs-fix
Prototype rails.js fixes for 3-0-stable
d7d0c25
Commits on Aug 30, 2011
@arunagw arunagw MySQL2 Bump to 0.2.13 941a9d0
@tenderlove tenderlove Merge pull request #2744 from arunagw/mysql2_bump
Mysql2 bump
0195846
Commits on Aug 31, 2011
@tenderlove tenderlove use String#start_with? rather than creating regexps or comparing char…
…acter values
b550ecc
Commits on Sep 01, 2011
@tenderlove tenderlove * Psych errors with poor yaml formatting are proxied. Fixes #2645, #2731
f2aa46b
Commits on Sep 04, 2011
@spastorino spastorino * is not allowed in windows file names. Closes #2574 #2847 59a64a8
Commits on Sep 07, 2011
@akaspick akaspick fix assert_select_email to work on non-multipart emails as well as co…
…nverting the Mail::Body to a string to prevent errors.
8094d29
@akaspick akaspick assert_select_email entry cf0ea79
@akaspick akaspick fix exists? to return false if passed nil (which may come from a miss…
…ing URL param)
15dcdf6
@akaspick akaspick entry for fixing exists? 3e00e49
@jonleighton jonleighton Merge pull request #2919 from akaspick/exists_fix_3_0
fix exists? to return false if passed nil (backport to 3-0-stable)
9ef9f98
@akaspick akaspick more descriptive CHANGELOG entry c7f3429
@jonleighton jonleighton Merge pull request #2918 from akaspick/assert_select_email_fix_3_0
assert_select_email fix for 3-0-stable
3a3344a
@dmitriy-kiriyenko dmitriy-kiriyenko Do not use default_scope in ActiveRecord::Persistence#touch. 4364157
@dmitriy-kiriyenko dmitriy-kiriyenko This way asserting that updated_at was changed in touch look more obv…
…ious.
d93213f
@porras porras Update changelog for 'Backport "ActiveRecord::Persistence#touch shoul…
…d not use default_scope" (pull request #1519)'
de178df
Commits on Sep 08, 2011
@akaspick akaspick when calling url_for with a hash, additional (likely unwanted) values…
… (such as :host) would be returned in the hash... calling #dup on the hash prevents this
45b7731
@akaspick akaspick fix url_for to not add additional unwanted options when called with a…
… hash
a8cfc99
@josevalim josevalim Merge pull request #2939 from akaspick/url_for_fix_3_0
fix url_for when passing a hash to prevent unwanted additional values being added to the hash (backport to 3-0-stable)
f863af9
@guilleiguaran guilleiguaran Updating changelogs in 3-0-stable 5c10a53
@vijaydev vijaydev Merge pull request #2682 from guilleiguaran/3-0-stable-changelogs
Update changelogs (3-0-stable)
9c2ff32
Commits on Sep 09, 2011
@tenderlove tenderlove Exceptions from database adapters should not lose their backtrace. a748c60
Commits on Sep 10, 2011
@vijaydev vijaydev fix assert message 813e288
Commits on Sep 11, 2011
@misfo misfo prevent errors when passing a frozen string as a param to ActionContr…
…oller::TestCase#process

since ActionDispatch::Http::Parameters#encode_params will force encoding on all params strings (when using an encoding aware Ruby), dup all strings passed into process.  This prevents modification of params passed in and, more importantly, doesn't barf when a frozen string is passed
thanks and high fives to kinsteronline
78a4aea
Commits on Sep 12, 2011
@lifo lifo Dont use association proxy#reload to load the target for the first time 378ce0e
Commits on Sep 27, 2011
@parndt parndt Fixes #3087 by removing autoload for non-existant DeprecatedBlockHelpers 0dd7411
@josevalim josevalim Merge pull request #3142 from parndt/3-0-stable
Fixes #3087
1000ada
Commits on Oct 03, 2011
@jeremy jeremy Merge pull request #2801 from jeremyevans/patch-1
Fix obviously breakage of Time.=== for Time subclasses
87bbf48
Commits on Oct 05, 2011
Ben Holley Fix spelling in doc:app rake task 346973e
@amatsuda amatsuda override unsafe methods only if defined on String 984d031
@amatsuda amatsuda ruby193: String#prepend is also unsafe 543b587
Commits on Oct 06, 2011
@vijaydev vijaydev Merge pull request #3233 from benolee/fix_spelling_in_doc_app_rake_task
Fix spelling in doc:app rake task
e2c03bf
Commits on Oct 14, 2011
@arunagw arunagw activerecord/sqlnet.log into gitignore when running with oracle. 68ae66d
Commits on Oct 17, 2011
@vijaydev vijaydev Merge pull request #3330 from arunagw/ignore_sqlnet_3-0-stable
Ignore sqlnet 3 0 stable
fd67735
Commits on Nov 01, 2011
@joshk joshk Remove a circular require in AS deprecations. This is safe as AS depr…
…ecations is autoloaded as needed.
394dd6f
Commits on Nov 16, 2011
mhuffnagle Added a missing parameter to relative_url_root= that was causing an A…
…rgumentError: wrong number of arguments (1 for 0) to be thrown at actionpack-3.0.10/lib/action_controller/railtie.rb:54.
328ae5b
@wycats wycats Merge pull request #3646 from mhuffnagle/3-0-stable
Fix for relative_url_root= missing parameter (issue 3645)
6122924
@tenderlove tenderlove Merge pull request #2122 from dyba/3-0-stable
Issue #1866: Changed Commands module to RailsCommands.
b81c3f7
@tenderlove tenderlove Revert "Merge pull request #2122 from dyba/3-0-stable"
This reverts commit b81c3f7, reversing
changes made to 6122924.
2ba0309
Commits on Nov 17, 2011
@arunagw arunagw Mysql2 version bump!
I saw one bug fixed here 

brianmario/mysql2@e60599b
4e72f59
@josevalim josevalim Merge pull request #3655 from arunagw/mysql_bump_3-0-stable
Mysql bump 3 0 stable
de44773
@jonleighton jonleighton Use broken YAML that will fail with Syck as well as Psych. Fixes test…
…_broken_yaml_exception in fixtures_test.rb on Ruby 1.8.7.

Cherry-pick from 3-1-stable: b8d4692

Conflicts:

	activerecord/test/cases/fixtures_test.rb
961b4a0
@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
a03f018
@lest lest _html translation should escape interpolated arguments
Conflicts:

	actionpack/CHANGELOG.md
ba2d850
@tenderlove tenderlove removing stubs. 1.9.3 implements Date.today in C so mocking the retur…
…n value of Time.now does nothing
0e9910e
@tenderlove tenderlove fixing test case test on 1.9.3dev 618300e
Commits on Nov 18, 2011
@jonleighton jonleighton Preparing for 3.0.11 release 66a4beb