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 .
This comparison is big! We’re only showing the most recent 250 commits
Commits on Jul 14, 2010
@lifo lifo Remove unintentional API changes. [#1108] d5921cd
@tenderlove tenderlove Let's initialize instance variables in the postgres adapter. 36150c9
@tenderlove tenderlove PostgreSQLAdapter#query bail early if there is no column and dry up o…
…ur conditionals
@tenderlove tenderlove PostgreSQLAdapter#query string interpolation calls to_s for us 8ba14c2
@tenderlove tenderlove remove useless ternary in PostgreSQL adapter 6a53445
@tenderlove tenderlove activerecord tests should inherit from ActiveRecord::TestCase 1db8ed0
Commits on Jul 15, 2010
@tenderlove tenderlove use array intersection for dry / faster code d41a28b
@tenderlove tenderlove primary_key_name already checks for the model_class 955b26a
@wycats wycats Style fixes 3c300b3
@tenderlove tenderlove clean up ||= with an initialized variable and attr_reader 62dd1d8
@fxn fxn layouts and rendering guide: use content_for? instead of the yield or…
… yield idiom
@fxn fxn Merge remote branch 'docrails/master' c7d79a4
@lifo lifo Revert "Style fixes"
This reverts commit 3c300b3.
@jaimeiniesta jaimeiniesta Migrations guide: minor typos corrected 5543e8b
@spastorino spastorino Bump up to rack-mount 0.6.9 and rack-mount-0.6.6.pre removed from act…
…ion_dispatch vendor
@spastorino spastorino Bump up nokogiri, memcache-client, sqlite3-ruby, fcgi, mail and tzinfo fcb2301
@lukaszx0 lukaszx0 Bump bundler to 1.0.0.beta.5
[#5102 state:committed]

Signed-off-by: Jeremy Kemper <>
@carlosantoniodasilva carlosantoniodasilva Small fix in cookie docs and trailing whitespaces c09cd19
@spastorino spastorino CI should bundle update instead of install so gems are properly updated ea0bf4e
@fxn fxn AS guide: revised the docs of class_attribute and cattr_* macros 181e0d3
Commits on Jul 16, 2010
David Genord II JoinDependency#graft does not properly set parent join [#5124 state:r…

Signed-off-by: Pratik Naik <>
@lifo lifo Fix data loading from the performance script 130bf3c
Neeraj Singh adding proper markup to comment c9630d9
Neeraj Singh moving persistence related tests to a new file
Before refactoring test result from AR:
2291 tests, 7180 assertions, 0 failures, 0 errors

After the refactoring test result from AR:
2291 tests, 7180 assertions, 0 failures, 0 errors

Signed-off-by: José Valim <>
@tenderlove tenderlove fixing typeo. thanks bamnet! 1b2824b
@spastorino spastorino Explain how to change javascript default files 041e47b
@nicksieger nicksieger Don't rely on implementation-specific order-dependence of array compa…
…risons in unit tests

Signed-off-by: Santiago Pastorino <>
@spastorino spastorino Adds application.js when app is generated with -J and clear javascrip…
@spastorino spastorino Makes this test don't trust on the speed of execution 79d9e0f
@tenderlove tenderlove use an attr_reader for performance b952470
@tenderlove tenderlove only test for existence of +pool+ once 04ef434
@fxn fxn minor pass to generated code in application.rb related to :defaults ef165b3
@tenderlove tenderlove fixing whitespace errors 2244bb0
@tenderlove tenderlove fixing test file name 7ba54ff
@tenderlove tenderlove adding a test for clearing stale connections 8d17f53
@tenderlove tenderlove unfactoring clear_stale_cached_connections! 42be67e
@spastorino spastorino Makes test use the new config.action_view.javascript_expansions[:defa…
…ults] initialization syntax
Commits on Jul 17, 2010
@josevalim josevalim Add skip_eager_load!, skip_autoload! and friends to path objects. c6e2058
@fxn fxn new guide: API Documentation Guidelines, ported and revised from the …
…docrails github wiki
@fxn fxn Merge remote branch 'docrails/master' 631b956
@tenderlove tenderlove use === to avoid regular expression creation, and speed up string com…
@tenderlove tenderlove removing Binding class 4226c93
@tenderlove tenderlove private method is not needed fa73e77
@tenderlove tenderlove drained? is never called 606d8fd
@qrush qrush Removing ActionDispatch::Http::FilterParameters#fitered_parameters alias 7aec9f9
@spastorino spastorino It's not needed to initialize the attr when calling mattr_writer cebe5c2
@tenderlove tenderlove convert duration to an attr_reader cfca559
Commits on Jul 18, 2010
@josevalim josevalim Add console hook to force ActiveRecord::Base to be loaded when consol…
…e starts avoiding reference loops.
@josevalim josevalim Avoid uneeded queries in session stores if sid is not given. e210895
@subbarao subbarao save on parent should not cascade to child unless child changed [#3353

Signed-off-by: José Valim <>
Neeraj Singh fixing the ternary operation where the logic is very confusing.
[#5136 state:resolved]

Signed-off-by: José Valim <>
@mexpolk mexpolk select :include_blank or :prompt should return escaped string [#5099

Signed-off-by: José Valim <>
@josevalim josevalim Set session options id to nil is respected and cancels lazy loading. 291adcd
Neeraj Singh removing extra whitespaces
Signed-off-by: José Valim <>
Neeraj Singh fixing typo
Signed-off-by: José Valim <>
Neeraj Singh primary_keys_test reads better than pk_test
Signed-off-by: José Valim <>
Neeraj Singh expected value should come first in assert_equal
Signed-off-by: José Valim <>
@spastorino spastorino Float comparison adjustment
Signed-off-by: José Valim <>
Neeraj Singh replacing around with for in the comments for callbacks d1037a4
@tenderlove tenderlove bind method is not needed, so goodbye! <3 <3 <3 2cbef69
@tenderlove tenderlove tap the subscriber for easier return value 234b969
@tenderlove tenderlove Notifier API == Fanout API, so replace Notifier with Fanout as they q…
…uack the same
Commits on Jul 19, 2010
@tenderlove tenderlove subscriber does not need to be a block, but an object that responds t…
…o #call
@tenderlove tenderlove avoid proc activation every time a log message is made ad8f4df
@mislav mislav correct typos in Routing examples bcec0f6
Neeraj Singh Exceptions from views should be rescued based on the original excepti…
…on. If a handler for original exception is missing then apply ActiveView::TemplateError

[#2034 state:resolved]

Signed-off-by: José Valim <>
@josevalim josevalim No need to create a new module in the previous commit. ab6ff85
@josevalim josevalim There is absolutely no need to use __send__ here. 70f7ba3
@josevalim josevalim Add missing entries and tidy up CHANGELOG. b22c11f
@lukaszx0 lukaszx0 Removed warnings when a variable is shadowed 247886e
@lukaszx0 lukaszx0 Introduced redefine_method fc71d59
@lukaszx0 lukaszx0 Removed warnings about method redefining 010eda2
@lukaszx0 lukaszx0 Test for behaviour of befeore_type_cast when operating on datetime co…
@lukaszx0 lukaszx0 Make use of redefine_method, removed some more redefining warnings 661fd98
@lukaszx0 lukaszx0 Added missing require of remove_method bd4b3d8
@tenderlove tenderlove avoid call to Array#first dd4e81d
@tenderlove tenderlove avoid const lookup. we know what these constants are in advance ad4ef42
@dguettler dguettler Minor performance improvment in notifications/fanout and active_recor…
…d/log_subscriber [#5098 state:open]
@tenderlove tenderlove mocking out debing? call in the MockLogger 1b26c66
@spastorino spastorino Test added, we shouldn't log sql calls when logger is not on debug? mode d39c3b1
@spastorino spastorino Remove unused orig_handler and unneeded parentheses 17600eb
@josevalim josevalim Remove assert_valid. It was already deprecated on Rails 2.3. c3c349e
@tenderlove tenderlove reusing the time instrumentation from the instrumenter rather than Be…
…nchmark. [#5098 state:open]
@brynary brynary Extract ParameterFilter class from FilterParameters mixin
Signed-off-by: wycats <>
@kou kou fix mixed encoding logs can't be logged.
[#4807 state:committed]

Signed-off-by: Kouhei Sutou <>
Signed-off-by: Jeremy Kemper <>
Commits on Jul 20, 2010
@josevalim josevalim Fix typo on CHANGELOG. 3255920
@josevalim josevalim Add missing require to metal/streaming.rb 51d2db0
Neeraj Singh expanded comment for update_attribute method 767de13
@jaimeiniesta jaimeiniesta Active Record Validations and Callbacks guide: Fixed typos and rephra…
…sed some paragraphs for clarity
@jaimeiniesta jaimeiniesta Merge branch 'master' of 0f99178
@josevalim josevalim Add a test for elapsed and require missing benchmark file. 9df9c4b
@tenderlove tenderlove adding a reader for loaded, initializing @loaded to false e1df4b9
@jaimeiniesta jaimeiniesta non-singleton true and false should go on regular font 6914d67
@josevalim josevalim Fix a failing test in Railtie and properly define all severity levels…
… in MockLogger for LogSubscriber.
@spastorino spastorino This example is better for guides and gem/plugins docs 6ce761c
@spastorino spastorino Make use of severity levels
Signed-off-by: José Valim <>
@drogus drogus Moved PolymorphicRoutes to ActionDispatch::Routing
Signed-off-by: José Valim <>
Neeraj Singh Ensure that primary_keys of HABTM records is not double quoted
[#5152 state:reslved]
Commits on Jul 21, 2010
@spastorino spastorino id is a public method fa8b290
@drogus drogus Moved a few methods from RecordIdentifier to ActiveModel::Naming
Signed-off-by: José Valim <>
@josevalim josevalim No need to delegate. Simply include the whole RecordIdentifier module. c565f00
@josevalim josevalim Remove old install.rb files. f1082bd
@josevalim josevalim Improve contribuition guide. cd15368
@josevalim josevalim Rework a bit README files. b70062f
@josevalim josevalim Add .rdoc extension to README files. 508fba9
@josevalim josevalim Reuse already existing classes for ActiveModel tests. 5331061
@josevalim josevalim Fix failing railties tests. 0a729b0
Neeraj Singh - without the id test is passing even if I change :allow_destroy from…
… 'false' - adding more tests to strengthen the test suite

Signed-off-by: José Valim <>
@subbarao subbarao In nested_attributes when association is not loaded and association
record is saved and then in memory record attributes should be saved

[#5053 state:resolved]

Signed-off-by: José Valim <>
@szetobo szetobo association load target shouldn't replace records
from db if it is already loaded by nested attributes assignment

[#5053 state:resolved]

Signed-off-by: José Valim <>
@subbarao subbarao Strengthening the test for nested_attribute
Loading the associate target in nested_attributes
should load most recent attributes for child
records marked for destruction

Signed-off-by: José Valim <>
@josevalim josevalim Revert "save on parent should not cascade to child unless child chang…
…ed [#3353 state:open]"

Please check Lighthouse for more information.

This reverts commit 4a0d7c1.
Neeraj Singh Timestamp columns of HABTM join table should record timestamps
[#5161 state:resolved]
@josevalim josevalim Ensure all join table attributes will be in the same timestamp. f3e4229
@thiagopradi thiagopradi rake db:seed should check if the database have pending migrations [#5163

Signed-off-by: José Valim <>
Neeraj Singh update_attribute should not update readonly attributes
[#5106 state:resolved]

Signed-off-by: José Valim <>
@subbarao subbarao eagerly loaded association records should respect default_scope [#2931

Signed-off-by: José Valim <>
@josevalim josevalim Ensure default_scope can be overwriten by association conditions. 7131244
@josevalim josevalim Ensure insert_before in middleware stack raises a meaningful error me…
…ssage [#3679 state:resolved]
@josevalim josevalim Use capture instead of yield in link_to_unless.
[#5162 state:resolved]
Neeraj Singh renaming tests by removing proxy_options from names
Signed-off-by: José Valim <>
@jeroenvandijk jeroenvandijk Mention that ActionMailer::Base.default_url_options is now deprecated 24c0bc5
@spastorino spastorino We are doing the same in this conditions
Signed-off-by: José Valim <>
@spastorino spastorino Make config.generators accept string namespaces, you can do now confi…
…g.generators.test_framework 'rspec' for instance

Signed-off-by: José Valim <>
@spastorino spastorino Make use of tap to return a previously used var
Signed-off-by: José Valim <>
@akaspick akaspick remote_function patch with more detailed test
Signed-off-by: wycats <>
@wincent wincent doc: form_for does return output rather than merely evaluate its block 680f045
@spastorino spastorino Change some missing README -> README.rdoc d16c5cc
@heimidal heimidal Fixed a globbed route issue where slashes were being escaped, causing…
… assert_routing to fail. [#5135 state:resolved]

Signed-off-by: José Valim <>
@subbarao subbarao removing unused models from tests
[#5153 state:resolved]

Signed-off-by: José Valim <>
@fxn fxn routing guide: a "photo" resource has by convention paths under "phot…
…os", in plural
@spastorino spastorino Hash#to_param is doesn't use sort anymore, some tests added for Hash#…
@spastorino spastorino Test Hash#to_param escapes keys and values 6cbd085
@fxn fxn routing guide: say "path" when you mean path 5cba663
@fxn fxn camelize and underscore are sort of inverse of each other, but not in…
… a mathematical sense [#5174 state:resolved]
Neeraj Singh replacing around with for in the comments for callbacks aa2235b
@mislav mislav correct typos in Routing examples efdfcf1
Neeraj Singh expanded comment for update_attribute method 5c13793
@jaimeiniesta jaimeiniesta Active Record Validations and Callbacks guide: Fixed typos and rephra…
…sed some paragraphs for clarity
@jaimeiniesta jaimeiniesta non-singleton true and false should go on regular font 6f7402d
@jeroenvandijk jeroenvandijk Mention that ActionMailer::Base.default_url_options is now deprecated ab62aa1
@wincent wincent doc: form_for does return output rather than merely evaluate its block 198975e
@fxn fxn routing guide: a "photo" resource has by convention paths under "phot…
…os", in plural
@fxn fxn routing guide: say "path" when you mean path b72cc47
@fxn fxn camelize and underscore are sort of inverse of each other, but not in…
… a mathematical sense [#5174 state:resolved]
@fxn fxn Merge remote branch 'rails/master' 919eb20
@tenderlove tenderlove adding tests for sessions and clearing up warnings 1f8edb9
@tenderlove tenderlove initializing instance variables bdbe390
@tenderlove tenderlove starting sql bypass test, fixing create_table and drop_table! ba0d2a9
@tenderlove tenderlove readability is hip 4e6cf42
@tenderlove tenderlove reducing function calls in the session store f5de56f
@tenderlove tenderlove testing new_record? and converting to an attribute 87a319c
@tenderlove tenderlove testing loaded? method and reducing funcalls a78547a
Commits on Jul 22, 2010
@spastorino spastorino options could be of any kind of Hash (Hash, HashWithIndifferentAccess…
… or OrderedHash) this way we keep the properties of the options passed as an argument
@spastorino spastorino These tests are trusting in the order of the elements so use OrderedH…
…ash instead of Hash
@bobbywilson0 bobbywilson0 Changed code style that was incorrectly rendering block style instead…
… of inline.
@mislav mislav revise download/installation/support sections in READMEs
 - don't reference ancient gem versions
 - don't link to old API doc subdomains
 - point to GitHub instead of RubyForge
 - point to Lighthouse account for support
@mislav mislav improve Action Pack README
 - revise introductory text
 - list modules contained in the package
 - improve examples
 - remove obsolete `scaffold` and `form` examples
@mislav mislav improve Active Record README
 - revise introductory text
 - improve examples
 - don't claim that Oracle, SQL Server, or DB2 are supported
 - remove lengthy "simple example"
@mislav mislav remove unneeded "Dependencies" section from Action Mailer README
Other READMEs don't have dependencies indicated, and installing a gem
takes care of dependencies automatically. For developers, dependencies
are indicated in the Gemfile.
@mislav mislav improve Active Model README
 - fix indentation problems
 - revised introductory text to state right away what the library is
 - improved examples: reduce heavy usage of ellipsis,
   don't mark paragraphs of text as code
@mexpolk mexpolk [PATCH] Update guides after Jeremy Kemper's changes on fieldWithErrors
to field_with_errors [#157 state:resolved]
@tenderlove tenderlove adding a test for session save 38734af
@tenderlove tenderlove refactor to use instance methods and be kind to subclasses 97f3c73
Carlhuda Performance optimizations to handle cases of instrumentors that are n…
…ot listened to. Also, fix a possible concurrency issue.
@spastorino spastorino Don't shadow outer local variables 21c4b09
@spastorino spastorino MySQL can't index a TEXT column 1b8cd5f
@spastorino spastorino This is a VARCHAR not a TEXT 7113f20
@spastorino spastorino Makes current adapter decide the syntax of PRIMARY KEY column definition 24f303b
@josevalim josevalim Merge remote branch 'spastorino/master'
Signed-off-by: José Valim <>
@akaspick akaspick update remote_function docs referencing link_to_remote cf5c2ba
@jeremy jeremy Session data will exceed 255 bytes. Use TEXT. 3ec6759
@spastorino spastorino session_id is a VARCHAR 227680f
@fxn fxn bump required RDoc to >= 2.5.9, and replace the 2.2 horo.rb with Aaro…
…n's gem
@spastorino spastorino Makes Rakefile activate rdoc >= 2.5.9
Signed-off-by: Xavier Noria <>
Commits on Jul 23, 2010
@tenderlove tenderlove refactoring class methods to a module da37716
@tenderlove tenderlove refactoring more methods to a class methods module 34ff74f
@tenderlove tenderlove fixing space error 5e6382e
@tenderlove tenderlove brrrrr! freeze is not needed 9b48a94
@tenderlove tenderlove testing sqlbypass destroy. caching connection during destroy 5ebc1d8
Neeraj Singh reformatting sentence 8f638d8
Neeraj Singh shortening the sentences and removing fluff 3416517
Neeraj Singh adding proper markup in comments 4bf6c1c
@tenderlove tenderlove update Rakefiles for RDoc 2.5 b50635a
Neeraj Singh fixing typo 46c7a99
Neeraj Singh making comments sentence more concise 8429e7b
@jeroenvandijk jeroenvandijk Move config_accessor :asset_host from ActionController::Base to Abstr…
…actController which fixes issues with asset_host in ActionMailer

  - Moved mailer objects in separate directory
  - Added two tests for asset_host configuration option
@fxn fxn include the root README.rdoc as main page 728ba20
@josevalim josevalim Also move asset_path to AbstractController. 2af8fd2
@josevalim josevalim Clean up AM and AC railties. 76b6136
@josevalim josevalim Merge branch 'master' of 7a7cbab
@spastorino spastorino Makes restore previosly saved warnings_on_first_load value and avoid …

Signed-off-by: José Valim <>
@spastorino spastorino Removes unused vars
Signed-off-by: José Valim <>
@spastorino spastorino Make this test, test again
Signed-off-by: José Valim <>
@spastorino spastorino make a throwaway value equals to _ to avoid warnings
Signed-off-by: José Valim <>
Commits on Jul 24, 2010
Neeraj Singh bringing consistency in comments 082ca51
@josevalim josevalim Get rid of instrumenter.elapsed. 834bd23
@jackdempsey jackdempsey Fix small middlewares typo 9a9fb12
Commits on Jul 25, 2010
@spastorino spastorino Removing one AS/lib ruby and rake adds to $LOAD_PATH 749948a
@fastred fastred Fixes syntax error in "with_scope" example 7fb7a2b
@sespindola sespindola Fixed output_buffer encoding problem [#5179]
Signed-off-by: Santiago Pastorino <>
Signed-off-by: José Valim <>
@spastorino spastorino Change returning with tap
Signed-off-by: José Valim <>
@josevalim josevalim Move runtime to log subscriber. 82c7ef8
@josevalim josevalim runtime should be properly initialized. d02f2d2
@tenderlove tenderlove use a hash to collect optional statistics about the instrumentation b7e0408
@tenderlove tenderlove cache the instrumentor for a speed gain fc088d4
@tenderlove tenderlove look up connection once 0d0e793
@josevalim josevalim Revert the previous three commits.
* AS::Notifications#instrument should not measure anything, it is not its responsibility;

* Adding another argument to AS::Notifications#instrument API needs to be properly discussed;
@josevalim josevalim Move runtime back to connection. 304c49b
@josevalim josevalim Cache connection access. 331df84
@fxn fxn application generation: --skip-testunit and --skip-activerecord renam…
…ed to --skip-test-unit and --skip-active-record respectively

Reason is their proper spellings are "Test::Unit" and "Active Record".
Option names and descriptions have been revised, as well as some method
names and minor details here and there.
@carlosantoniodasilva carlosantoniodasilva Add assertion to link_to_function test with block and capture, and mo…
…re expressive test name [#5179 state:resolved]

Signed-off-by: José Valim <>
@josevalim josevalim Cache instrumenter again as per Aaron's patch. f4200b0
@spastorino spastorino Object#returning removed
Signed-off-by: José Valim <>
@spastorino spastorino CHANGELOG updated Object#returning removed
Signed-off-by: José Valim <>
@fxn fxn AS guide: Object#returning is gone 06853cb
@fxn fxn APIs for individual components are no longer published dcb7832
@tenderlove tenderlove do not execute the session tests within transactions df95948
@fxn fxn Merge remote branch 'docrails/master' 6aa1253
@spastorino spastorino Don't interpolate a blank string, avoid warnings 963c71e
@spastorino spastorino Bump up bundler 8abcd49
@spastorino spastorino Gemfile now makes use of platforms calls with blocks instead of elsif…
… logic to define dependencies over specific platforms
@tenderlove tenderlove fisting warning 53fbbf4
@tenderlove tenderlove using AREL from the environment if it exists 13df581
Commits on Jul 26, 2010
@wycats wycats Fix a bug where requires inside of autoloads were being added to the …
…autoloaded_constants list, causing mayhem. [#5165 state:resolved]
@josevalim josevalim Update to latest thor. 9789d22
Neeraj Singh strengthening the rescue_from test suites
Signed-off-by: José Valim <>
Neeraj Singh strengthening the test suite for rescue_from
Signed-off-by: José Valim <>
@jreidinger jreidinger fix escaping id and parameters in path [#5137 state:resolved]
Signed-off-by: José Valim <>
@thiagopradi thiagopradi Removing unnecessary code [#5192 state:resolved]
Signed-off-by: José Valim <>
@lukaszx0 lukaszx0 Removed deprecated APIs in text and number helpers [#5156 state:resol…

They're deprecated since 2008. It's time to get rid of them.

Signed-off-by: José Valim <>
Neeraj Singh No need to check for :uniq
[#5170 state:resolved]

Signed-off-by: José Valim <>
@spastorino spastorino Fixes usage message when running rails without --dev on a cloned rail…
…s repo
@spastorino spastorino This is for making sure const_missing is triggered without warnings 4ea1753
@bernerdschaefer bernerdschaefer XmlMini.rename_key emits valid xml with dasherize
This resolves issues for libraries which use '_' prefixed keys in their
attributes hash, such as Mongoid. A key like "_id" or "_type" will no
longer be converted to "<-id>" and "<-type>".

Signed-off-by: wycats <>
@texel texel Override new on proxy objects so that they never wrap nil or false. e56c9ef
@texel texel Test to ensure that falsy objects aren't wrapped by deprecation proxies 37d82f2
@spastorino spastorino Changed returning with tap on guides fd589db
@wincent wincent doc: cleanup respond_to documentation
Signed-off-by: Wincent Colaiuta <>
@tenderlove tenderlove fixing space errors 32844cb
@josevalim josevalim Move runtime back to the Thread.current dd61a81
@dhh dhh Prep for RC 856fc4b
@dhh dhh Rails version update e71815b
@spastorino spastorino missing requires added 4ac3ae0
@dhh dhh Make Rails 3 RC depend on Bundler RC 3bdaa09
@dhh dhh Spaces, people, spaces! 06b9531
@dhh dhh Add install script for testing gems locally f79f9a7
@nicksieger nicksieger JRuby should not need system_timer, and cannot install it either
Signed-off-by: Santiago Pastorino <>
@dhh dhh Fix deprecation message on info screen d283ca3
@chad chad fix bad logic in determining if in rails app subdir
Signed-off-by: David Heinemeier Hansson <>