Skip to content
This repository
  • 113 commits
  • 90 files changed
  • 13 comments
  • 30 contributors
Jun 09, 2011
Brad Robertson modified table_exists? to always use current search_path or schema if…
… explicitly set
0252376
Jun 11, 2011
Arun Agrawal Adding JDBCmysql template for Jruby in 3-0-stable. 4448988
Arun Agrawal Tests added for activerecord-jdbcmysql 0e0be35
Arun Agrawal Adding JDBCsqlite3 template for Jruby in 3-0-stable. 871a0fc
Arun Agrawal Adding jdbcsqlite3 in comment 680e5d2
Arun Agrawal Adding JDBCpostgresql template for Jruby in 3-0-stable. bcd9145
Arun Agrawal Adding Jruby-openssl in gemfile for 3-0-stable. 7f4bf01
Arun Agrawal Fixed error when running db:create with jdbcmysql d5b9ea3
Arun Agrawal Allow database.rake tasks to perform opreation with jdbcpostgresql 9da2a10
Arun Agrawal Modified database.rake file to run with jdbcsqlite3 2b4a7ca
Arun Agrawal Using different constant. 110de0f
Jun 13, 2011
Andrew White Remove obsolete compatibility module 271bccb
Jon Leighton 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
Jun 15, 2011
Andrew White Make MissingTranslation exception handler respect :rescue_format 190101e
Damien Mathieu simplify to only one condition
Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
6cfd1c7
Damien Mathieu encode the uploaded file's name in the default external encoding - Cl…
…oses #869
991e388
Damien Mathieu all requests are utf-8. Don't use the external encoding. 71d7610
Lukáš Konarovský Use assert_equal instead of assert in uploaded file test. b869b8c
José Valim Merge pull request #1714 from dmathieu/3-0-cherry
Cherry picking encoding for 3.0
95905c5
Jun 16, 2011
Aaron Patterson 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
Jun 17, 2011
Jon Leighton Add require 'pathname' as it has not already been required in some ci…
…rcumstances
8742a97
Santiago Pastorino Bump mysql2 up fccacae
Jun 19, 2011
Arun Agrawal Removing require_relative gem. Linecache new version 0.46 is out and
it's loading rbx-require-relative > 0.0.4
48fcd22
José Valim Merge pull request #1772 from arunagw/require_rel_remove-3-0-stable
Require rel remove 3 0 stable
8d9bc64
James Miller Add option to omit creating an instance reader method on class_attribute ad06ddd
José Valim Merge pull request #1775 from bensie/class-attr-3-0-stable
Instance reader method on class_attribute - 3-0-stable
22cc1e9
Jun 20, 2011
José Valim Fix SafeBuffers by adding a dirty flag. bc070ba
José Valim Removed file added by accident. 8467ea3
Jun 21, 2011
Arun Agrawal For more specific for jdbc postgresql databases. 3e7af42
Arun Agrawal More specific for jdbc-sqlite 14bfe83
Arun Agrawal Only mysql and jdbcmysql. 3b05231
Arun Agrawal Fixed for sqlite3 checking with jdbc 4bfbdd1
Jun 22, 2011
Arun Agrawal Remove superfluous pg driver install instructions 25e5ad2
Arun Agrawal Add generic 'jdbc' database option 2aeabdc
Arun Agrawal Convert database names to ones appropriate for JRuby 2fc22bf
Arun Agrawal Tests added for jdbc option fb495cd
Arun Agrawal Modified .yml files according to master changes. As this will also work. ecddc65
Arun Agrawal Test added to check default option with jruby. It should generate
sqlite3 bases app
2771b91
Jun 23, 2011
Tests only after filters in cache sweepers 8ebc17f
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
Mike Gehard 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
Santiago Pastorino Merge pull request #1834 from jeroenj/cachesweeper-fix-3-0
Fixes an issue where cache sweepers
3add2ea
Santiago Pastorino Add CHANGELOG entry 19392cf
Jun 24, 2011
Xavier Noria updates the contributing guide 59f19a9
Jun 28, 2011
Aaron Patterson Merge pull request #1649 from arunagw/jruby_3_0_stable
Jruby 3 0 stable
a6495af
Fix JSON decoding of newline character with Yaml backend [#3479 state…
…:resolved]

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

Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
c314203
Jul 04, 2011
Simon Baird 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
Andrew White The rails gem doesn't have a lib directory. 3001728
Andrew White Revert "The rails gem doesn't have a lib directory."
RubyGems requires at least one require_path.

This reverts commit 3001728.
1b03f7f
Jul 06, 2011
Santiago Pastorino Merge pull request #1894 from arunagw/fix_test_for_jruby_db-3-0-stable
Fix test for jruby db 3 0 stable
7ff32e2
Santiago Pastorino Merge pull request #1952 from simonbaird/3-0-stable
rake db:test:purge creates mysql database with wrong charset & collation
2f3eb7a
Santiago Pastorino Merge pull request #1837 from msgehard/3-0-stable
Fix for empty string assigned to _type column of polymorphic association
9e4d156
Jul 07, 2011
Krzysztof Knapik 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
Santiago Pastorino Merge pull request #2004 from knapo/3-0-stable
Backport of #1997
e9f2c67
Jul 08, 2011
Destroy association habtm record before destroying the record itself.…
… Fixes issue #402.
28f057c
Jul 11, 2011
Jon Leighton Merge pull request #1797 from kuahyeow/3-0-stable
Through association condition clobbers join condition
fc4bce1
Aaron Patterson Merge pull request #1607 from bradrobertson/pg_adapter
fix table_exists? in postgresql adapter to always use current search_path
9a4d2b2
Jul 12, 2011
Thong Kuah 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
Jul 15, 2011
Lauri Hahne fixed CacheHelper to properly support html_safe output buffers c476a6b
Jul 16, 2011
Evan Light Fixes #2064
Backport of cache_key fix from master
b1b5d18
Santiago Pastorino Merge pull request #2064 from elight/3-0-stable
Backports cache_key fix from master
247a50b
Jul 17, 2011
Lauri Hahne 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
Lauri Hahne made sure that the possible new output_buffer created by CacheHelper …
…is of the same type as the original
39a4f67
Prem Sichanugrist Fix a wrong assertion on url_helper_test, and refactor `html_safe` te…
…st to be in its method
2cb29fa
Santiago Pastorino 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
Jul 18, 2011
Jesse Storimer 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
Santiago Pastorino 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
Josh Kalderimis 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
Josh Kalderimis 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
Jul 21, 2011
Xavier Noria I actually love well-formed Gemfiles 80b1f9e
Jul 22, 2011
Karunakar (Ruby) Duplicate tests removed. bd804d7
Santiago Pastorino Merge pull request #2183 from castlerock/3-0-stable-duplicate_test
3 0 stable duplicate test
c39bd5f
Jul 23, 2011
Arun Agrawal fixed task for rake test:uncommitted b490fd8
Santiago Pastorino Merge pull request #2205 from arunagw/test_un_3_0_stable
rake test:uncommitted for 3-0-stable
19d9689
Santiago Pastorino Merge pull request #2080 from lhahne/3-0-stable
Fix improper detection and handling of html_safe buffer in CacheHelper
eead13f
Jul 25, 2011
Arun Agrawal Fix rake rails:template to tell user to pass LOCATION variable. edfcf47
Santiago Pastorino Merge pull request #2249 from arunagw/rake_template_path_fix
Rake template path fix
56c663b
Jul 26, 2011
Josh Kalderimis enable Travis CI irc notifications to #rails-contrib on irc.freenode.org 64c269a
Santiago Pastorino Merge pull request #2289 from joshk/3-0-stable
More Irc notifications (from Travis with love, again)
e18e896
Santiago Pastorino Remove cruise files 43e6f82
Jul 27, 2011
Xavier Noria contrib app minor tweak e93cff8
Jul 28, 2011
Akira Matsuda callback methods are Class methods a8aa666
Santiago Pastorino Merge pull request #2320 from amatsuda/callback_deprecation_message
callback methods are Class methods
a33fe79
Jul 29, 2011
Aaron Patterson dump IO encoding value along with schema.rb so the file can be reload…
…ed. fixes #1592
6c0beb5
Bhavin fix connection not established error while running rake task
db:schema:dump
5d7ed7a
Aaron Patterson default writing the schema file as utf-8 3676af4
Aaron Patterson updating changelog with schema.rb changes 6631abd
Aaron Patterson delay backtrace scrubbing until we actually raise an exception. fixes #… b9f6798
Aaron Patterson updating the CHANGELOG 553d9ea
Jul 31, 2011
Arun Agrawal skiping magic comment test. checking encoding_aware?
Loading AS encoding.
b0334db
Santiago Pastorino Merge pull request #2374 from arunagw/30_schema_dumper_test_fix
3-0-stable schema dumper test fix
cb36585
Santiago Pastorino Merge pull request #2381 from vijaydev/rakeaboutfix3.0
Fix #2368 (3-0-stable)
564d39e
Aug 01, 2011
Vijay Dev fixes #2368. rake about not showing the middleware, db adapter and db…
… schema version
773d219
Santiago Pastorino Merge pull request #2393 from bdurand/fix_cache_read_multi
Fix ArgumentError in ActiveSupport::Cache::CacheStore.read_multi
a173bb3
Aug 04, 2011
Jon Leighton 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
Aaron Patterson we should not ignore all gems in here df6b1e2
Aaron Patterson updating CHANGELOGs f54d0cf
Aaron Patterson more changelog updates 9d17458
Aaron Patterson bumping to 3.0.10.rc1 521c9aa
Aug 16, 2011
Aaron Patterson Properly escape glob characters. e0c03f8
Aaron Patterson prevent sql injection attacks by escaping quotes in column names fb4747b
Aaron Patterson Tags with invalid names should also be stripped in order to prevent
XSS attacks.  Thanks Sascha Depold for the report.
3480d97
Aaron Patterson properly subsituting bad utf8 characters b45dfc7
Aaron Patterson bumping rails to 3.0.10 4f15f39