Skip to content

Comparing changes

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

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
Commits on Jun 09, 2011
@bradrobertson bradrobertson modified table_exists? to always use current search_path or schema if…
… explicitly set
Commits on Jun 11, 2011
@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 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.
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 <>
@dmathieu dmathieu encode the uploaded file's name in the default external encoding - Cl…
…oses #869
@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
Commits on Jun 16, 2011
@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
Commits on Jun 17, 2011
@jonleighton jonleighton Add require 'pathname' as it has not already been required in some ci…
@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
@josevalim josevalim Merge pull request #1772 from arunagw/require_rel_remove-3-0-stable
Require rel remove 3 0 stable
@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
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
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
@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]
@spastorino spastorino Merge pull request #1834 from jeroenj/cachesweeper-fix-3-0
Fixes an issue where cache sweepers
@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
Maxime RETY Fix JSON decoding of newline character with Yaml backend [#3479 state…

Signed-off-by: Santiago Pastorino <>
@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.
@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)
@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
@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 <>
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.
@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.
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
@spastorino spastorino Merge pull request #1952 from simonbaird/3-0-stable
rake db:test:purge creates mysql database with wrong charset & collation
@spastorino spastorino Merge pull request #1837 from msgehard/3-0-stable
Fix for empty string assigned to _type column of polymorphic association
Commits on Jul 07, 2011
@kknapik kknapik 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`.
@spastorino spastorino Merge pull request #2004 from knapo/3-0-stable
Backport of #1997
Commits on Jul 08, 2011
Tomas D'Stefano Destroy association habtm record before destroying the record itself.…
… Fixes issue #402.
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.
@jonleighton jonleighton Merge pull request #1797 from kuahyeow/3-0-stable
Through association condition clobbers join condition
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
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
@spastorino spastorino Merge pull request #2064 from elight/3-0-stable
Backports cache_key fix from master
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.
@lhahne lhahne made sure that the possible new output_buffer created by CacheHelper …
…is of the same type as the original
@sikachu sikachu Fix a wrong assertion on url_helper_test, and refactor `html_safe` te…
…st to be in its method
@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
Commits on Jul 18, 2011
@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
@spastorino spastorino Merge pull request #2134 from jstorimer/ensure-status-codes-are-logge…

Ensure status codes are logged properly (for 3-0-stable)
@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.


@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.


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
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
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
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
Commits on Jul 26, 2011
@joshk joshk enable Travis CI irc notifications to #rails-contrib on 64c269a
@spastorino spastorino Merge pull request #2289 from joshk/3-0-stable
More Irc notifications (from Travis with love, again)
@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
Commits on Jul 29, 2011
@tenderlove tenderlove dump IO encoding value along with schema.rb so the file can be reload…
…ed. fixes #1592
@bhavinkamani bhavinkamani fix connection not established error while running rake task
@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.
@spastorino spastorino Merge pull request #2374 from arunagw/30_schema_dumper_test_fix
3-0-stable schema dumper test fix
@vijaydev vijaydev fixes #2368. rake about not showing the middleware, db adapter and db…
… schema version
@spastorino spastorino Merge pull request #2381 from vijaydev/rakeaboutfix3.0
Fix #2368 (3-0-stable)
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
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.
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
@tenderlove tenderlove more changelog updates 9d17458
@tenderlove tenderlove bumping to 3.0.10.rc1 521c9aa
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.
@tenderlove tenderlove properly subsituting bad utf8 characters b45dfc7
@tenderlove tenderlove bumping rails to 3.0.10 4f15f39