Skip to content


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 Jan 27, 2010
@foobarfighter foobarfighter Added observe_form 95b77e9
@stevestmartin stevestmartin extract_remote_attributes should be a private method 27d52e0
@stevestmartin stevestmartin cleanup some spacing 62a2d51
@stevestmartin stevestmartin nuke what appears to be a duplicate and unused test file 143d076
@stevestmartin stevestmartin rename ajax_test.rb to ajax_helper_test.rb for consistency 07299eb
@stevestmartin stevestmartin fix failing tests from fork/merge 49e84a5
@stevestmartin stevestmartin make observers a little more dry f115fb0
@erikstmartin erikstmartin javascript_helper now correctly pulls in ajax_helper instead of proto…
…type_helper. prototype_helper is pulled in by ajax_helper for reverse compatibility
@erikstmartin erikstmartin fixing failing tests from last commit, order of attributes matters sh…
…ould probably change this later
@erikstmartin erikstmartin Removed all helpers from PrototypeHelper that are implemented in Ajax…
…Helper. Modified tests that extended with PrototypeHelper to now extend using AjaxHelper. AjaxHelper is now included by default in view helper
@stevestmartin stevestmartin restructure compatibility module so it is no longer a child d8343a6
@stevestmartin stevestmartin oops, remove test code 20c6c71
@stefanpenner stefanpenner first round of documenation for ujs 255066b
@erikstmartin erikstmartin fixed current tests that were failing do to module location change, t…
…his is temporary to fix state of repo till all the new tests are complete
@stevestmartin stevestmartin port existing test suite to check for new output, and fix all breakin…
…g tests
@erikstmartin erikstmartin moving include of ScriptaculousHelper into PrototypeHelper, ActionVie…
…w should know as little as possible about individual frameworks
@stevestmartin stevestmartin test :method option of link_to_remote, and ensure rel='nofollow' is a…
…dded when :method => 'delete'
@erikstmartin erikstmartin link_to_remote and button_to_remote now support :confirm c3baf8b
@erikstmartin erikstmartin making non remote versions of link_to, button_to, submit_tag and imag…
…e_submit_tag output data attributes for things like :confirm, :method, :popup, and :disable_with
@erikstmartin erikstmartin refactoring AjaxHelper a bit so that it calls shared method from Java…
…scriptHelper to add attributes for :confirm
@erikstmartin erikstmartin modified helper that adds attributes for :method to include rel='nofo…
…llow' if :method => :delete, same as its remote_ equivalent
@erikstmartin erikstmartin link_to_remote and button_to_remote now support :confirm 9821648
@erikstmartin erikstmartin making non remote versions of link_to, button_to, submit_tag and imag…
…e_submit_tag output data attributes for things like :confirm, :method, :popup, and :disable_with
@stevestmartin stevestmartin add missing :before and :after callbacks for link_to_remote 133f601
@erikstmartin erikstmartin fixing last merge breakage 9e3e1b3
@stevestmartin stevestmartin add missing test for :with option to link_to_remote a5e9d03
@stevestmartin stevestmartin refactor params and with into copat module d9af0df
@erikstmartin erikstmartin removing Prototype inline js for attributes for :with and :condition,…
… it now is free form js that can be placed there, also moved :submit out into AjaxHelper, updated tests to reflect changes
@stevestmartin stevestmartin add missing call to set_with_and_condition_attributes for form_remote…
@stevestmartin stevestmartin initial jquery driver and compat, right now the only supported method…
… is form_remote_tag
@erikstmartin erikstmartin account for the fact a few options may be passed as symbols and need …
…to be converted to string
@stevestmartin stevestmartin refractor handler code for remote_form_tag to also handle link_to_rem…
…ote, fix a bug preventing :method from being used, also add missing :position, :confirm is still not functional yet
@erikstmartin erikstmartin remote_form_for now supports :confirm eb2d32f
@stevestmartin stevestmartin upgrade jquery to 1.4.1 and default request method to GET as its defa…
…ult on forms and links
@stevestmartin stevestmartin fix duplidate data-submit attribute, submit_to_remote should test url 8b7cd5a
@stevestmartin stevestmartin support for submit_to_remote in jquery driver ff26ca6
@erikstmartin erikstmartin adding support for :disable_with to button_to_remote 56ae655
@erikstmartin erikstmartin adding :href override to link_to_remote 9fe8456
@erikstmartin erikstmartin test to go with last commit, explicit :href for link_to_remote ad26b39
@erikstmartin erikstmartin need to tell erb that our <script> tag is html_safe 6a8da20
@erikstmartin erikstmartin periodically_call_remote does not need data-observe=true 0215466
@erikstmartin erikstmartin start of prototype driver, missing observe_form, observe_field, and p…
@erikstmartin erikstmartin moving html_safe call into helpers directly as they only work from th…
…at level
@erikstmartin erikstmartin removing container inline js function of observed elements :function …
@erikstmartin erikstmartin :href should be comming in through html_options and not options c0f6388
@stefanpenner stefanpenner Added regression tests that discovered the previous issue. 1b8ced5
@stevestmartin stevestmartin refactored to be more dry, data-update-failure now correctly works, c…
…ombine compat and driver, namespaced events, and support for periodically_call_remote
@erikstmartin erikstmartin observe_form now supports :with option as it should 3c7d39d
@erikstmartin erikstmartin initial prototype of prototype js driver d13f254
@stevestmartin stevestmartin support for observers in jquery driver, and minor bug fixes da19dfa
@stefanpenner stefanpenner tests + docs 253f335
@stefanpenner stefanpenner updated tests + docs, plus minor inconsistency fixes 2e338ae
@schmidt schmidt Adding custom yaml (de-)serialization for OrderedHash
[#3608 state:committed]

Signed-off-by: Jeremy Kemper <>
Commits on Jan 28, 2010
@mikel mikel Updated mail requirement to 2.1.2 32ce2bb
@mikel mikel Unbundling TZInfo 9029efc
@mikel mikel Unvendor'd Builder. Now requires the Builder gem as a dependency f1fe71d
@mikel mikel Unvendor'd MemCache-Client. Now requires the MemCache Client gem as a…
… dependency - Don't forget to gem bundle buys and girls
@mikel mikel Unvendor'd text-format, now requires text-format gem a06a5a6
@jeremy jeremy Merge remote branch 'mikel/master' 8399a31
@jeremy jeremy Remove unbundle changelogs 030ab35
@jeremy jeremy self.defaults => default f2dd357
@erikstmartin erikstmartin jquery driver now supports :popup 4911343
@erikstmartin erikstmartin jquery driver now supports :confirm a0232d8
@snusnu snusnu active_support/ordered_hash now requires yaml 016f15d
@gbuesing gbuesing Time#- with a DateTime argument behaves the same as with a Time argum…
…ent, i.e. returns the difference between self and arg as a Float [#3476 status:resolved]
@rubymerchant rubymerchant Use format of ARes rather than content-type of remote errors to load …

[#1956 state:committed]

Signed-off-by: Jeremy Kemper <>
@erikstmartin erikstmartin initial prototype of jQuery driver complete eff999d
@jeremy jeremy Expected attachment encoding is binary 8c60acb
@jeremy jeremy Fix time comparison. Mail#date returns DateTime not Time. 187b3b0
@erikstmartin erikstmartin renaming javascript drivers to *.rails.js for better naming convention 2ec9919
@jeremy jeremy Clear up some ivar warnings fd0eb3d
@jeremy jeremy Attend to brittle mailer generator tests 0797142
@jeremy jeremy Rename 'defaults' class method to 'default' to reflect that it's a de…
@jeremy jeremy Missed template change for defaults -> default 2c12a71
@stefanpenner stefanpenner Merge branch 'rails/master' into ujs 3aa1ea1
Carlhuda Test::Unit Railtie c7c3eac
Carl Lerche Fix the test_framework generator tests 6268fcd
Carl Lerche Cleanup the test_unit generator move into the railtie 252911e
@josevalim josevalim Refactor MetalLoader and RoutesReloader to rely less on class configu…

Signed-off-by: Carl Lerche <>
@josevalim josevalim Add config.to_prepare back and add tests for it.
Signed-off-by: Carl Lerche <>
@josevalim josevalim Add reloadable specific for engines and move environment to applicati…
…on paths.

Signed-off-by: Carl Lerche <>
@josevalim josevalim Add more tests to some key points in Railties.
Signed-off-by: Carl Lerche <>
Carl Lerche Move the ActiveRecord generator settings into the Railtie f15bbcf
@jeremy jeremy Ensure test sets json time format flag d58398c
Commits on Jan 29, 2010
Yehuda Katz superclass_delegating_accessor rewritten to serve as the base for man…
…y other kinds of accessors (step 1 of unification)
@mikel mikel Added tests for rendering different template for new API
Signed-off-by: José Valim <>
@mikel mikel Add a failing test case for render :layout
Signed-off-by: José Valim <>
@josevalim josevalim ActionMailer should depend just on AbstractController. 3f84091
@josevalim josevalim Get rid of AM warnings in AP test suite. ba82eb2
@josevalim josevalim Fix rendering of layouts. 986a4e6
@josevalim josevalim Added :format and :locale options to render. cc2642b
@josevalim josevalim Automatically configure generators if application is defined. 17ea8d8
@josevalim josevalim Only load testing tasks if test unit is being used. 24aba77
@josh josh Add rails.js driver to default source list 8a46e11
@erikstmartin erikstmartin fixed tests to also look for rails.js when using javascript_include_t…
…ag :defaults
Commits on Jan 30, 2010
@josh josh Deprecate link_to :popup bddd1bb
@josh josh Drop JS scripts from core a06c47a
@paulrosania paulrosania tsort-based dependency resolution for initializers
Signed-off-by: Jeremy Kemper <>
@josevalim josevalim Improve railtie deprecation messages. 431fc3c
@josevalim josevalim Drop AR I18n deprecation and simple use errors.messages as fallback. d6e2f50
@josevalim josevalim Fix some backward incompatible behavior on AM. 0e063f4
@josevalim josevalim Add transfer_encoding= setter deprecation. 2d567e4
@josevalim josevalim Bring helpers_dir deprecation back. c164ca1
@josh josh Deprecation notice for TestResponse#redirected_to 1bd8a50
@lifo lifo Rely on arel to generate the correct sql when an empty array is suppl…
…ied to IN predicate
@josh josh Revert "Drop JS scripts from core"
This reverts commit a06c47a.
@josh josh Revert "fixed tests to also look for rails.js when using javascript_i…
…nclude_tag :defaults"

This reverts commit 7f181e4.
@josh josh Revert "Add rails.js driver to default source list"
This reverts commit 8a46e11.
@josh josh Revert "Merge branch 'rails/master' into ujs"
This reverts commit 3aa1ea1, reversing
changes made to 2c12a71.


@josh josh Move observe_field and observe_form to prototype_legacy_helper plugin 61c9b16
@josh josh Move periodically_call_remote into prototype_legacy_helper plugin 95f317b
@josh josh Drop AjaxHelper 2de311a
@josh josh Move link_to_function and link_to_remote into prototype_legacy_helper
@josh josh Move button_to_remote and submit_to_remote into prototype_legacy_helper
@josh josh Move form_remote_tag and remote_form_for into prototype_legacy_helper 9c2c307
@josh josh Move scripty JSG helpers into scriptaculous_helper.rb ad19241
@josh josh Unused JAVASCRIPT_PATH const ff3f779
@josh josh Move button_to_function to prototype helper 570e02c
@josh josh Reorg options_for_javascript and array_or_string_for_javascript 657d855
Commits on Jan 31, 2010
@josh josh Axe AM state machine
We're going do it eventually, get it done before 3.0 is final.
@josh josh Include prototype ujs adapter with new apps 7d9ed8e
@erikstmartin erikstmartin updating link_to and button_to to support :remote => true and other o…
…ptions such as :confirm in a unobtrusive manor

Signed-off-by: Joshua Peek <>
@josh josh Generate UJS code for :disable_with 31820b9
@josh josh Add rel=nofollow on non get remote links 48459c8
@josevalim josevalim Improve missing template error messages a little bit. b3a0282
@mikel mikel deOMGifying Railties, Active Support, and Action Pack 2ebea1c
@mikel mikel Updating Action Mailer documentation bb2c7b4
@josh josh Require ac/test_case from AV::TestCase 59e9478
@stevestmartin stevestmartin form_for should pass :remote to form_tag through html_options a3349f8
@stevestmartin stevestmartin add :remote option to form_tag a9e89e8
@erikstmartin erikstmartin data-remote needs to be on the form and not the submit when using but…
…ton_to :remote=>true
@stefanpenner stefanpenner UJS documentation. c493370
@mikel mikel Full update on ActiveModel documentation a07d0f8
@mikel mikel Updating copyright dates on all licenses 65ad165
Commits on Feb 01, 2010
@jeremy jeremy Bump arel dependency to 0.2.0 from 0.2.pre 9bd0422
Carl Lerche Get rails tests running on bundler 0.9 9f01dff
Carl Lerche Update the CI geminstaller to pull in the correct version of bundler dfeae62
Carl Lerche Have rails depend on bundler 1c83fd2
Yehuda Katz For performance reasons, you can no longer call html_safe! on Strings…
…. Instead, all Strings are always not html_safe?. Instead, you can get a SafeBuffer from a String by calling #html_safe, which will

  * Additionally, instead of doing concat("</form>".html_safe), you can do
    safe_concat("</form>"), which will skip both the flag set, and the flag
  * For the first pass, I converted virtually all #html_safe!s to #html_safe,
    and the tests pass. A further optimization would be to try to use
    #safe_concat as much as possible, reducing the performance impact if
    we know up front that a String is safe.
Carl Lerche Update the generated Gemfile and config/boot.rb to work with bundler 0.9 a54654d
@mikel mikel Completely updated the ActionMailer guide 65fb2c7
Carl Lerche Update the Ci build script 3b922aa
@spastorino spastorino action_view is requiring the deleted action_view/erb/util.rb file
Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local>
@spastorino spastorino action_view/safe_buffer is no longer valid
Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local>
@spastorino spastorino Deleted all references to ActionView::SafeBuffer in favor of ActiveSu…

Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local>
Yehuda Katz Add support for compile-time <%= raw %> 2092351
@mikel mikel Updates to output and warning on being for Rails 3.0 aa9f549
@josevalim josevalim Add config.generators.fallbacks. a8c5d22
@jeremy jeremy Introduce class_attribute to declare inheritable class attributes. Wr…
…iting an attribute on a subclass behaves just like overriding the superclass reader method. Unifies and replaces most usage of cattr_accessor, class_inheritable_attribute, superclass_delegating_attribute, and extlib_inheritable_attribute.
@jeremy jeremy Convert to class_attribute e5ab4b0
@josevalim josevalim Deprecate AC configuration values which were moved to Rack. 0dece79
@josevalim josevalim Merge branch 'master' of gitproxy:rails/rails 66615f2
@mikel mikel Adding Release Notes 3.0 428bdb5
@spastorino spastorino failing tests in multibyte_chars_test.rb fixed
Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local>
Carl Lerche Add the database adapter in the generated Gemfile ff7a6a9
@josevalim josevalim Make AM test suite green. d74b5e4
@mikel mikel Xavier's edits ddf2b4a
Carl Lerche [PATCH] remove geminstaller dependency from ci build 90ab1a6
Carl Lerche Run bundle exec rake instead of bin/rake during CI 16c0d1d
Carl Lerche Update the Gemfile and CI build b9edb0c
@mikel mikel Merge branch 'master' of git:// d1eed07
Commits on Feb 02, 2010
@mikel mikel Fixed --dev flag for new bundler 485f12f
@rubys rubys Resolve view paths correctly on CygWin
Signed-off-by: Mikel Lindsaar <>
@rubys rubys Make rdoc match current API
Signed-off-by: Mikel Lindsaar <>
@sikachu sikachu Hide '/rails/info/properties' from 'rake routes' [#3793 state:resolved]
Signed-off-by: Pratik Naik <>
Kieran Pilkington Updating USAGE information for Mailer generator [#3801 status:resolved]
Signed-off-by: José Valim <>
@probablycorey probablycorey fixed migration logger bug [#3434 status:resolved]
Signed-off-by: José Valim <>
@sikachu sikachu Add test case for unable to run migration if ActiveRecord::Base.logge…
…r is nil (#3434)

Signed-off-by: José Valim <>
@sikachu sikachu Modify the behavior of `radio_button_tag` to use `sanitize_to_id` for…
… consistency [#1792 status:resolved]

Signed-off-by: José Valim <>
@szimek szimek Change Rails::Generators::Migration protected instance methods to cla…
…ss methods. [#3820 status:resolved]

Signed-off-by: José Valim <>
@josevalim josevalim Ensure that attr_reader methods in generators are protected. 101a8fa
@josevalim josevalim Get rid of deprecation warnings on config/environments/* ec4b18e
@josevalim josevalim Configuration values should be on AV::Base. 95eadb3
Santiago Pastorino and José Ignacio Costa Routing Mapper with % interpolation on Ruby 1.9.1 fixed [#3837 status…

Signed-off-by: José Valim <>
@josevalim josevalim Revert "failing tests in multibyte_chars_test.rb fixed". The bug is i…
…n Ruby 1.9.1 p376, not in AS test suite.

This reverts commit bf1f70d.
@thewoolleyman thewoolleyman Fix invocation of system commands in ci script
Signed-off-by: Carl Lerche <>
Carl Lerche Use bundler 0.9.0.pre4 when running CI 144f41e
@dhh dhh Removed all the default commands in script/* and replaced them with s…
…cript/rails and a rails command that'll act the same when run from within the app [DHH]
Carl Lerche Remove the generated gemfile in railties tests since the rails gemfil…
…e is used.
@dhh dhh Boot path has already been required, dont need it again 9f22406
@dhh dhh Add a reminder that you should use "rails" not "script/rails" when ru…
…nning normally
Commits on Feb 03, 2010
@dhh dhh Added "rake about" as a replacement for script/about [DHH] 7840ea2
@dhh dhh Fix rails server 68ca336
@dhh dhh Wups, need the application command in there too ea59177
@dhh dhh Rename usage path to command to just the command name 9a83bd5
@mikel mikel Updating index.html to remove script/generate and making railties tes…
…ts pass again
@mikel mikel Updating index.html to remove script/generate and making railties tes…
…ts pass again
@mikel mikel Made rake db:create also create the test database if you are in devel…
…opment mode
@mikel mikel Added encoding qery support for SQLite3 to make rake db:charset work …
…on all databases shipping with Rails 3
@mikel mikel Deprecated freeze rake tasks and cleaned up annotations.rake 38d13f9
@mikel mikel Adding 'db' as a shortcut for dbconsole to the rails command f390ead
@josevalim josevalim Merge remote branch 'mikel/master' b135043
@josevalim josevalim Add method and path to AC notifications. 836cbe5
@josevalim josevalim No more vendored thor. 622e3dd
@josevalim josevalim Properly show middlewares on rake about. 391f254
@josevalim josevalim Make bin/rails call rails/commands/application, fix generators usage …
…and update .gitignores.
Commits on Feb 04, 2010
Yehuda Katz Removing submodule hacks 7701587
Carl Lerche Update rails to use the latest bundler f497e7a
@mikel mikel Adding guard to make sure test database declarations exist before try…
…ing to auto create
@mikel mikel -v and --version params now work on rails script in or our of an app 1ae543a
@subbarao subbarao removing , from ,= statement in WrappedDatabaseException constructor
[#3830 state:committed]

Signed-off-by: Jeremy Kemper <>
@jeremy jeremy Merge remote branch 'mikel/master' 9b033d1
@dhh dhh Copy over latest release notes from docrails 36e6daa
@dhh dhh Simplify description ddb512c
@dhh dhh Move to 3.0.0.beta 79817aa
@dhh dhh Merge dd13874
@thewoolleyman thewoolleyman remove arel directory, breaks 'git submodule init', which breaks ci b…

Signed-off-by: Yehuda Katz <yehudakatz@Billing-MacBook-Pro.local>
@dhh dhh Homogenize gemspecs and remove the deprecated autorequire 031139b
@jeremy jeremy Autorequire bundled libraries by default db15e49
@jeremy jeremy Bump bundler dep to 0.9.1.pre1 b636430
@jeremy jeremy Use a normal gem source url instead of a magic symbol c9ec28b
@josevalim josevalim Remove instrument! and require thread from AS::Notifications. 31248fe
@josevalim josevalim Merge branch 'master' of gitproxy:rails/rails ab14e3f
@josevalim josevalim Update Gemfile to use latest bundler config. 79376e3
@josevalim josevalim Automatically require rubygems when --dev flag is given. d0f9842
Santiago Pastorino and José Ignacio Costa require 'action_controller' added on a test that uses it
Signed-off-by: José Valim <>
@josevalim josevalim Remove duplicated version check. 06860dc
@lifo lifo Make RAILS_* give deprecation warning just once 25b6b95
@acangiano acangiano Updated the database.yml file generated for ibm_db to the latest vers…
…ion of DB2 and the gem.

[#3852 state:committed]

Signed-off-by: Jeremy Kemper <>
@jeremy jeremy Move framework requires and Bundler.require from boot.rb to app.rb. C…
…ut down the list of railtie choices to those that make sense.
@jeremy jeremy Rationalize railtie dependencies: AC uses AV; AR uses AMo; and Rails …
…always uses AS.
@jeremy jeremy Use the correct environment.rb path 2faf94a
@jeremy jeremy Fix broken autorequires 6154278
@jeremy jeremy Rails script commands load the application rather than just boot 358451c
@jeremy jeremy Revert "Rails script commands load the application rather than just b…

This reverts commit 358451c.
@jeremy jeremy server command loads the application 293fd9d
@jeremy jeremy Depend on bundler >= 0.9.1 a871b1a
@jeremy jeremy Autorequire default libs and those in groups named after the current …
…Rails environment
@jeremy jeremy Bump to bundler 0.9.2 c697974
@brynary brynary Link to main Arel repository
Signed-off-by: Jeremy Kemper <>
@jeremy jeremy Ensure javascripts are pulled in so UJS can hook the Delete link 127e534
@jeremy jeremy Expose CSRF tag for UJS adapters 78de17c
@thewoolleyman thewoolleyman fix rubygems/bundler install in ci build script
Signed-off-by: Jeremy Kemper <>
@jeremy jeremy Expose CSRF param name also 2191aa4
Commits on Feb 05, 2010
@jeremy jeremy HTML-escape csrf meta contents 3062bc7
@jeremy jeremy Update prototype-ujs for data-confirm 358968c
@jeremy jeremy Revert dumb test 6bf79f0
@jeremy jeremy Add prototype ujs handler for data-method 7b1d3a0
@jeremy jeremy Test that csrf meta content is html-escaped, too 31f8a59
@jeremy jeremy Release using gemcutter gem:push tasks c1785f3
@dhh dhh Need gemcutter here too 657ffed
@jeremy jeremy No sense bundling sense it's not available in Rakefile. Also, actuall…
…y require.
@jeremy jeremy Fix task defines 7b81f59
@jeremy jeremy Kill default require_path b1f30ef
@jeremy jeremy Add the dummy rails3b gemspec that pulls in non-prerelease deps ae4cb06
@jeremy jeremy Submarine the rake-gemcutter dep in Rakefiles 459ecaf
@paulrosania paulrosania install ActionController::UrlFor before environment is parsed, to pro…
…vide ActionMailer#default_url_options=

Signed-off-by: Jeremy Kemper <>
@jeremy jeremy Revert "Link to main Arel repository"
This reverts commit 2036268.
@jeremy jeremy Bump arel dep a81a2a2
@jeremy jeremy Bump git versions to 3.0.0.beta1 since we've released c548e21