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 Mar 17, 2010
Mathias Biilmann Christensen Fix for missing dependency in ActionDispatch::Integration
When running cucumber features from a new rails 3 app requiring
'cucumber/rails/world' would raise:

uninitialized constant ActionDispatch::Integration::Session::Test (NameError)

Fixed by requiring 'test/unit/assertions' in action_dispatch/integration

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
6c0c0f4
Commits on Mar 18, 2010
Carlhuda Get modules back into integration tests
0e15f07
Mathias Biilmann Christensen Deleting and setting a cookie in the same request was broken
Made sure to remove a cookie from @deleted_cookies when set

[#4211 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
c8dd6f2
@jeremy jeremy Kill nonexistent method removal
db9e67a
@jeremy jeremy Fix broken test due to constant collision
fe2f383
@jeremy jeremy Use Array.wrap not Array()
41af6d9
@josevalim josevalim Sending the partial as info is no longer required.
191a2f7
@tenderlove tenderlove squelching more warnings in the AR tests. [#4218 state:resolved]
Signed-off-by: wycats <wycats@gmail.com>
3911a7c
@snusnu snusnu AS datetime conversions now require AS time conversions
d164d86
Carlhuda Fix an error in isolated running of tests
9da153c
@smartinez87 smartinez87 added require abstract_unit on setter_trap.rb
Signed-off-by: wycats <wycats@gmail.com>
bc36618
Carlhuda While isolated tests are useful, they take far too long to run for us…
… to be getting useful information from CI. Perhaps another box that runs the isolated tests every 3 hours (instead of per commit)
8e64998
@smartinez87 smartinez87 Fixed require line
Signed-off-by: wycats <wycats@gmail.com>
14b1dc2
@wycats wycats Merge branch 'master' of github.com:rails/rails
014bd4b
@tenderlove tenderlove kill where / having method redefine warnings. [#4225 state:resolved]
Signed-off-by: wycats <wycats@gmail.com>
587f468
Carlhuda @layout is a confusing name... use @cache_layout
3deb60e
Carlhuda Make action_has_layout? non-private
d8c7efe
Carlhuda Remove caching's dependency on view_context. Also, make it so that th…
…e layout is always rendered the same way (so that layout dependencies on the action actually being rendered aren't masked on the first render)
523d0f3
Carlhuda All tests pass without memoizing view_context
71c9337
Carlhuda Make render :partial, :layout consistent between AC and AV
edb5991
Commits on Mar 19, 2010
Carlhuda Return a valid Rack response from bare ActionController::Metal
1dacc19
Santiago Pastorino and Sebastian Martinez Added missing requires abstract_unit and activesupport to the loadpat…
…h of ts_isolated [#4215 state:committed]

Signed-off-by: wycats <wycats@gmail.com>
1e2caa5
Santiago Pastorino and Sebastian Martinez Make dependencies_test pass running standalone [#4215 state:resolved]
Signed-off-by: wycats <wycats@gmail.com>
e7276a9
@spastorino spastorino remove duplicated self.view_paths assingment on controller tests [#4206
… state:commited]

Signed-off-by: wycats <wycats@gmail.com>
e629e21
Carlhuda Each controller class has it's own view context subclass. This remove…
…s the need for ActionView::Base.for_controller
a5d80f8
@wycats wycats We seem to have removed the URL helpers from ActionView subclasses...
995f570
@wycats wycats Well that was a bust
0aa0c37
@smartinez87 smartinez87 removed useless require line
Signed-off-by: José Valim <jose.valim@gmail.com>
b395c81
@josevalim josevalim Singleton classes returns parent's methods with instance_methods(fals…
…e) and this makes remove_method in Module#delegate fail. Add a test case and fix the bug.
fbe3565
@fxn fxn cleans a bit #compute_public_path
[#4232 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
f374336
@josevalim josevalim Improve performance of the rendering stack by freezing formats as a s…
…ign that they shouldn't be further modified.
f28d856
@josevalim josevalim Merge branch 'master' of gitproxy:rails/rails
ae499b5
@tenderlove tenderlove switching migrations to use require cleans up many warnings [#4234 st…
…ate:resolved]

Signed-off-by: wycats <wycats@gmail.com>
541194f
@josevalim josevalim Controller generator now creates routes as well [#4233 state:resolved]
562154f
Carlhuda Fix protect_against_forgery
7f53dca
@wycats wycats Eliminate an error from an implicit dependency on AV::Base
9f92563
@fxn fxn s/guides.rails.info/edgeguides.rubyonrails.org/ in a few places, and …
…makes some links relative to work in either site
02be581
@fxn fxn normalizes titles of release notes guides, and adds them to the home …
…page
dea701b
@josevalim josevalim Clean up Mime::Type and remove deprecated stuff (from 2.3).
525382f
@rubys rubys Controller generators should generate tests when action is supplied. [#…
…3421 state:resolved]
80095c5
Commits on Mar 20, 2010
@wycats wycats Fixed a bunch of tests that failed in 1.9 because they assumed that a…
… Rack response was a String.
e1c030e
@wycats wycats response_body is an Array in 1.9, so an Array was being pushed onto t…
…he cache
f868c2a
@josh josh Move railties/builtin into lib
f38e89c
@josh josh Require info controller from info routes
14b7452
@josh josh Autoload Rails::Info
fcc6b12
@josh josh Remove invalid builtin tests since we aren't adding that dir to the
load path anymore
87db863
Commits on Mar 21, 2010
@josevalim josevalim Make ERB generators more flexible and customizable.
8b50f89
@smartinez87 smartinez87 do not support 'data-url' anymore, just use 'href' [#4236 state:resol…
…ved]

Signed-off-by: José Valim <jose.valim@gmail.com>
0137566
@odorcicd odorcicd Remove data-url support from url_helper [#4236 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
b7adec3
@jeremy jeremy Fix regression introduced in 8b50f89. Generated views mentioned the w…
…rong path.
4941655
@jeremy jeremy Also revert mailer generator test changes in 8b50f89
4884f28
Commits on Mar 22, 2010
@spastorino spastorino avoid active_support/core_ext/time/conversions.rb warnings
[#4250 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
16cad60
@spastorino spastorino db group makes more sense here
3bd85e2
Evan Phoenix Remove test ordering bug by using another class
34497c0
Evan Phoenix Fix ActionMailer test issues
* Don't depend so much no the message in a NameError
* Reset the delivery method properly
1e4be20
Evan Phoenix Don't depend on order of elements in Set
a307fd6
Evan Phoenix Remove obsolete use case that was broken in AR::Observers
79b0861
Evan Phoenix Clear the query cache between tests that test the query cache
0b608ab
Evan Phoenix Remove test ordering bug
Don't reuse classes with class attributes when testing different use cases
of class attributes.
ab3503b
Evan Phoenix Reset class attribute after changing it
4f5de7f
@miloops miloops From and lock should be defined to be consistent with other ivars. Li…
…mit and offset are always defined, no need to test that.

[#4253 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
d289e15
@josevalim josevalim Killing fixtures in mailer before they kill me (they usually lead to …
…very brittle tests).
fb89aba
@josevalim josevalim Make router shortcuts more polite to URLs starting with a leading slash.
4998e09
@josevalim josevalim Controller generators should use routes shortcut.
e8a80cd
@bernardo bernardo Adds number_to_human and several improvements in NumberHelper. [#4239
…state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
75904c5
@bernardo bernardo NumberHelper methods should now return html_safe strings (when the in…
…puts are valid numbers or are html_safe). Also adds :raise => true (used internaly) to make the number helpers throw InvalidNumberError when the given number is invalid.

Signed-off-by: José Valim <jose.valim@gmail.com>
a4090bc
@wycats wycats Provide a better error if thor is missing
d03af48
@wycats wycats No -rubygems needed
0b16c76
@josevalim josevalim Current url helpers become actions in controller. Added a failing tes…
…t case for it.
13bb4a6
@fxn fxn AS guide: documents Module#remove_possible_method
926ff0e
@josevalim josevalim Rename unsignificant to insignificant.
c53f77f
@josevalim josevalim Merge branch 'master' of gitproxy:rails/rails
1f93a46
Commits on Mar 23, 2010
@wycats wycats open_session can just return the a dup of the current context.
At this point, its entire purpose in the open_session {} case was to
delegate back to the IntegrationTest anyway.
15c31c7
@wycats wycats Put MRI-specific dependencies in an MRI group
b144b56
@josevalim josevalim Load generators from both lib/rails/generators and lib/generators. Us…
…ing the former since it's less obstrusive.
b61f6f5
@josevalim josevalim bin/rails should use the new app generator path.
05ec99e
@smartinez87 smartinez87 rake tasks should use the new app generator path [#4257 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
10825be
@smartinez87 smartinez87 updated Rakefile with new app generator path [#4258 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
a5e98d7
@josevalim josevalim Explicitly require files before monkey patching them.
b9f551a
@josh josh Load plugin initializers from lib/rails/initializers/*.rb
e47a1d7
@wycats wycats Protect routes again so they don't end up as actions. We need a bette…
…r solution than this.
cc0e402
@josevalim josevalim Ensure lib/rails/initializers/*.rb also works for gems.
5c41cb7
@josevalim josevalim Use latest I18n (0.3.6).
b92963f
@wycats wycats init.rb in plugins is here to stay
45e8cf5
Commits on Mar 24, 2010
@tenderlove tenderlove do not use unloadable constants in tests [#4260 state:resolved]
Signed-off-by: wycats <wycats@gmail.com>
bc48d39
@tenderlove tenderlove expand migration paths before requiring them. [#4240 state:resolved]
Signed-off-by: wycats <wycats@gmail.com>
ed21f0c
@briandoll briandoll Fixing spelling error in activerecord guide in the validation callbac…
…ks section, closing issue #2
3807db8
@rizwanreza rizwanreza Routes guide being rewritten, done till :singular.
94381b2
Commits on Mar 25, 2010
@miloops miloops Add add_limit_offset! to adapters.
e3a2fae
@miloops miloops Require Arel 0.3.2
e260d5f
@miloops miloops Refactor relation merging to create just one relation and then assign…
… values, instead of creating multiple relation objects.
90a4709
@retr0h retr0h Updated ActionController::Base.asset_host example
The example provided contrived.  It is not useful when wanting to use
1-based asset hosts (since it would generate a random asset host for
the same asset).

Signed-off-by: Rizwan Reza <rizwanreza@gmail.com>
cbdb4aa
@miloops miloops Move methods from association to relation finder methods.
fc2e257
@miloops miloops Remove unused attributes_with_quotes method.
d06a754
@jeremy jeremy Bump to arel 0.3.3 to resolve Active Support dep
a8b93d7
@josevalim josevalim Remove Arel's git repo from Gemfile and use system_timer just on 1.8.x
99ce6eb
@josevalim josevalim Actually, bring Arel back to Gemfile and use git repo since it helps …
…development.
759eb36
Commits on Mar 26, 2010
@josevalim josevalim Remove reference to unexistent methods and fix typo.
4c7c406
@jeremyroman jeremyroman fix habtm documentation to correct typo
Signed-off-by: Rizwan Reza <rizwanreza@gmail.com>
ffb22bd
@chrisfinne chrisfinne Add debugging documentation for _callback_chain to ActiveRecord::Call…
…back

Signed-off-by: Rizwan Reza <rizwanreza@gmail.com>
76d2c45
Josh Franklin Add support for a type=binary with an optional encoding=base64. If th…
…e encoding attribute is absent, the data is considered unencoded.

[#2966 state:resolved]
c7cc958
@josevalim josevalim Ensure to reference the proper TZInfo namespace [#4268 state:resolved].
5231e4e
@rizwanreza rizwanreza Better MySQL Error message. [#3775 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
5176b28
@joshsusser joshsusser find railties and engines by name [4264 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
7b8399b
@josevalim josevalim Improve heuristic for railties default name, otherwise railties may b…
…e named :railtie, :engine and so on.
f5ee855
@josevalim josevalim Rails router automatically calculated for you the controller and name…
…d routes in the following scenarios:

  match "home/about"                 #=> maps to home#about with named route home_about_path
  match "about"                      #=> does not work because it cannot guess the controller
  match "about" => "home#about"      #=> maps to home#about with named route home_about_path
  match "home/about", :as => "about" #=> maps to home#about with named route about_path
b2c2b0c
Edgars Beigarts Make script/dbconsole work with oracle (sqlplus <username>[/<password…
…>][@<connect_identifier>])

[#3773 state:resolved]
0848c86
@josevalim josevalim Revert "find railties and engines by name [4264 state:resolved]"
This reverts commit 7b8399b.
fc266d7
@josevalim josevalim Move application configuration to the application configuration objec…
…t, remove railtie_name and engine_name and allow to set the configuration object.
395d664
@josevalim josevalim Just assert for 'Hi' in generated mailer tests.
b3a0aed
@wycats wycats Merge branch 'master' into docrails
1979043
@wycats wycats Make X-Sendfile default to "" so it works correctly in dev mode.
Provide a default in production.rb that can be modified, so that
people who care about sendfile performance in production mode can
get better performance easily.
56a86c2
Commits on Mar 27, 2010
@krisselden krisselden In PostgreSQLAdapter, switch tables query to use current_schemas func…
…tion [#918 state:resolved]

Signed-off-by: wycats <wycats@gmail.com>
afb786a
@wycats wycats Fixes typo (ht: Claudio Poli) [#4107 state:closed]
b20a105
@pixeltrix pixeltrix Add parameter defaults support to new routing DSL [#4265 state:resolved]
Signed-off-by: wycats <wycats@gmail.com>
3d746fc
@rizwanreza rizwanreza Tests method_missing to raise NameError. [#2522 state:resolved]
Signed-off-by: wycats <wycats@gmail.com>
167017f
@nbibler nbibler Changed behavior of touch and added touch! Originally implemented by …
…Obie Fernandez, updated touch! to act as a thin wrapper to touch. [#2520 state:resolved]

Signed-off-by: wycats <wycats@gmail.com>
3a875e6
@pixeltrix pixeltrix Fix named routes for member actions of singleton resources [#4266 sta…
…te:resolved]

Signed-off-by: wycats <wycats@gmail.com>
39c35ff
@wycats wycats Fix a mistake in the documentation (ht: Evgeniy Dolzhenko) [#4217 sta…
…te:resolved]
02ab789
Sam Elliott and Ryan Bigg Use ActiveSupport::Autoload for view helpers. [#4237 state:resolved]
Signed-off-by: wycats <wycats@gmail.com>
62937b8
@lifo lifo Revert "Changed behavior of touch and added touch! Originally impleme…
…nted by Obie Fernandez, updated touch! to act as a thin wrapper to touch. [#2520 state:resolved]"

This reverts commit 3a875e6.
68ade93
@rizwanreza rizwanreza primary_key now supports :limit. [#876 state:resolved]
Signed-off-by: wycats <wycats@gmail.com>
41e5c7e
@gaeldeest gaeldeest Makes ActiveResource work with form_for: - Adds a `build' method that…
… can be used instead of `new' to load a new, unsaved resource from the remote site, filled with the correct default values. - Adds a `persisted?' method that simply returns the opposite value than the `new?' method. [#4222 state:resolved] [#4155 state:resolved]

Signed-off-by: wycats <wycats@gmail.com>
753304b
@tenderlove tenderlove avoiding a few closure references by evaling. [#4223 state:resolved]
Signed-off-by: wycats <wycats@gmail.com>
3172db1
@drodriguez drodriguez Recovers error_messages for ActiveRecordInstanceTag. [#4078 state:res…
…olved]

Signed-off-by: wycats <wycats@gmail.com>
334983e
@RipTheJacker RipTheJacker fixing inconsistency with cattr_reader and matter_reader [#4172 state…
…:resolved]

Signed-off-by: wycats <wycats@gmail.com>
b081948
@josevalim josevalim Do not check for a valid const name in Rails 3.0 applications. [#4200
…state:resolved]
140cc9c
@jacobat jacobat ActiveModel::Dirty#changes should return a HashWithIndifferentAccess [#…
…4157 state:resolved]

Keep the Rails style of inject

Signed-off-by: José Valim <jose.valim@gmail.com>
a5d637d
@wycats wycats Limit Array#extract_options! to directl instances of Hash and HWIA. A…
…dd extractable_options? to Hash so that subclasses of Hash can opt-into extractable behavior. This fixes an issue where respond_with wasn't working with subclasses of Hash that were provided by other libraries (such as CouchDB or Mashie) [#4145 state:resolved]
a24a888
@josevalim josevalim Fix tests added in previous commit.
f1da717
@josevalim josevalim Revert "primary_key now supports :limit. [#876 state:resolved]" since…
… it broke AR test suite.

This reverts commit 41e5c7e.
0cb3311
@josevalim josevalim Merge branch 'master' of gitproxy:rails/rails
418e5fc
@wycats wycats Fixes a bug where error_messages_for was returning an empty div [#4048
…state:resolved] (ht: Geoff Garside)
0a35205
@rizwanreza rizwanreza primary_key now supports :limit for MySQL
Signed-off-by: wycats <wycats@gmail.com>
faeca69
@wycats wycats Use the new RAILS_VERSION in rake install (ht: ZhangJinzhu) [#4116 st…
…ate:resolved]
c428fbd
@wycats wycats Don't write to /dev/null on mingw. [#3921 state:resolved] (ht: Patric…
…k Daryll Glandien)
bc4cdae
@wycats wycats Remove stray instance variable to resolve serialization problem [#3769
…state:resolved] (ht: Joe Rafaniello)
26e714d
@josevalim josevalim Do not need to load ActionPack::VERSION
46b7704
@josevalim josevalim Revert "primary_key now supports :limit for MySQL". Break Sam Ruby app.
To reproduce, start a new application, create a scaffold and run test suite. [#876 state:open]

This reverts commit faeca69.
ff522cf
@spastorino spastorino flatten not needed here
Signed-off-by: José Valim <jose.valim@gmail.com>
edbb952
@spastorino spastorino LINE on class_eval need + 1, also removed comments [#4281 state:commi…
…tted]

Signed-off-by: José Valim <jose.valim@gmail.com>
820e3a8
@spastorino spastorino Ruby's marshaling of Time instances doesn't respect the zone [#4282 s…
…tate:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
38bb133
@jeremy jeremy Fix unstated dep on HWIA
c3cea9b
@jeremy jeremy Use Array.wrap uniformly
a98db7c
@jeremy jeremy Bust gem prelude to ensure bundler's in the load path. Not sure what'…
…s broken here.
4384a95
@wycats wycats Actually check the value of the ivar
4b9f167
@wycats wycats Missing require
fdebc7f
@josevalim josevalim Ensure details are frozen after @details_keys lookup. The implementat…
…ion waits to freeze until the last required moment, to avoid duping hashes.
a09e992
Commits on Mar 28, 2010
@watsonian watsonian Fixes typo in environments/production.rb template.
edd59b7
@josevalim josevalim Time zone tests were right all along.
8398f21
@mikel mikel Merge branch 'master' of git://github.com/rails/rails
2bcc2eb
@mikel mikel Fixing test, ; is a delimiter, not a termination character, ref RFC 2045
63002ba
@mikel mikel Updating test, should be calling :decoded, not :encoded, is a problem…
… now that Mail is fixed
a41d1b1
@mikel mikel Mail now correctly bundles up the charset into the content type field
b91c57d
@mikel mikel Fixing up attachment encoding specs to work with latest mail - and be…
… correct
4e0d1cf
@mikel mikel Updating mail version requirement to 2.1.5
53bcd4a
@rizwanreza rizwanreza When creating database with rake, create schemas in schema_search_pat…
…h if it doesn't exist.
6c2a067
@rizwanreza rizwanreza Oops, a docfix.
66d57d7
@rizwanreza rizwanreza Rails 3 application can run performance tests now. [#4171 state:resol…
…ved]
835f5d0
@fxn fxn adds a few requires in active_model/dirty.rb
[#4284 state:committed]
3b1c69d
@fxn fxn adds missing requires for Object#duplicable?
105f9b8
@fxn fxn adds missing requires for Object#blank? and Object#present?
76f024a
@rizwanreza rizwanreza Add :dependent = to has_one and has_many [#3075 state:resolved]
f1e5a9f
@wycats wycats Merge remote branch 'rizwan/restrict'
c99194c
@jeremy jeremy Cosmetics: mismatch indentation
d1f3437
@jeremy jeremy Merge branch 'master' of github.com:rails/rails
7e3b4c1
@jeremy jeremy Merge remote branch 'mikel/master'
154f9ce
@jeremy jeremy Bump mail dep to 2.1.5.1
5c05829
@pixeltrix pixeltrix Add constraints to resources in new routing DSL
Signed-off-by: Rizwan Reza <rizwanreza@gmail.com>
e1a70fa
@wycats wycats Request#content_type exists in Rack::Request, and other parts of Rack…
…::Request expect

it to return a String. Split the Rails API so that Request#content_type returns
a String, and Request#content_mime_type returns a Mime::Type object.
77a2a3d
@matthewrudy matthewrudy defining a named_scope which overwrites an existing method is now all…
…owed we just log a warning.

This was motivated by the fact that :open is defined on all classes
as such the named_scope "open" can never be used, without hacking
ActiveRecord with an "undef_method" [#4083 state:resolved]

Signed-off-by: wycats <wycats@gmail.com>
b0967cc
@vandrijevik vandrijevik Drop expires argument from call to @data in MemCacheStore so it works…
… with memcache-client and memcached gems, as advertised [#3672 state:resolved]

Signed-off-by: wycats <wycats@gmail.com>
edaf92f
@wycats wycats Why are we not updating bundler?
1b9777e
Commits on Mar 29, 2010
@pixeltrix pixeltrix Add ActionDispatch to RDoc task [#4287 state:resolved]
Signed-off-by: wycats <wycats@gmail.com>
26bc5c5
@pacoguzman pacoguzman html_tag option to wrap error_message_on text [#4283 state:resolved]
Signed-off-by: wycats <wycats@gmail.com>
878a9e0
@rizwanreza rizwanreza Reapply Rizwan's patch, but memoize Bundler.load.specs in an ivar. [#…
…3697 state:resolved]

Signed-off-by: wycats <wycats@gmail.com>
de2b014
@libc libc PostgreSQL adapter: escape_bytea, quote_string and unescape_bytea are…
…n't thread-safe in Ruby 1.8 [#3237 state:resolved]

Signed-off-by: wycats <wycats@gmail.com>
fc6746f
@jeremy jeremy ./tools/console to drop into irb with rails loaded
4b07352
@DefV DefV Add _index to named collection routes for uncountable resources (e.g.…
… Sheep)

Signed-off-by: Rizwan Reza <rizwanreza@gmail.com>
72074aa
@rizwanreza rizwanreza Add more tests and docs to uncountable routes. [#3930 state:resolved]
cf6734f
@craigw craigw Allow customisation of asset path generation using a proc.
Set config.action_controller.asset_path_template to a proc that takes one
argument - the direct, unchanged asset path - and returns a path to that asset
using the scheme that your assets require.

This is useful if you have a setup which scales by introducing new application
servers where the mtime of the asset files may not be the same as those of the
asset files on your previous servers, but it does require your web servers to
have knowledge of the asset template paths that you rewrite to so it's not
suitable for out-of-the-box use. An example of configuring asset path
generation and rewriting these paths using Apache is included in
actionpack/lib/action_view/helpers/asset_tag_helper.rb.

Signed-off-by: wycats <wycats@gmail.com>
49bc6a2
@wycats wycats Updated asset_template_path to asset_path and have it also support a …
…String [#4247 state:resolved]
201e898
@wycats wycats preinitializer.rb is no longer needed, so remove it from the guide an…
…d replace with better suggestion. [#4279 state:resolved]
bd69589
@dhh dhh Update example of default_scope to use the new arel finder syntax
a4eab8f
@spastorino spastorino ruby-debug19 added to Gemfile [#4290 state:committed]
Signed-off-by: wycats <wycats@gmail.com>
4ea289f
@tenderlove tenderlove use the database to lower case strings rather than ruby. [#4293 state…
…:resolved]

Signed-off-by: wycats <wycats@gmail.com>
98d2d8c
@rizwanreza rizwanreza Reorganized app/test directory. [#3057 state:resolved]
Run 'rake update:test_directory' to reorganize your already generated apps.

test/functional                   ->      test/controllers
test/functional                   ->      test/controllers
test/unit/helpers                 ->      test/helpers
test/unit/**/*_observer_test.rb   ->      test/observers
test/unit                         ->      test/models
a0dc675
@rizwanreza rizwanreza Update USAGE docs for generators.
d31e03f
@pixeltrix pixeltrix Make Railties RDoc task work again [#4291 state:resolved]
Signed-off-by: wycats <wycats@gmail.com>
d39ec81
@pixeltrix pixeltrix Ignore generated railties RDocs [#4289 state:resolved]
Signed-off-by: wycats <wycats@gmail.com>
40d90ed
@jeremy jeremy Ruby 1.9.2: marshaling round-trips Time#zone
41e7c68
@wycats wycats Provide a better error if the parsed REXML document has no root [#3803
…state:resolved]
48c1d8c
@pixeltrix pixeltrix Add the ability to specify table_name_prefix on individual modules
Signed-off-by: wycats <wycats@gmail.com>
67d1cec
@wycats wycats Rename modularized_table_name_prefix to full_table_name_prefix [#4032
…state:resolved]
5f7bc47
@miloops miloops Warn scoped order and limit are ignored. [#4123 state:resolved]
53ddbfc
@jeremy jeremy Bump mail to 2.1.5.3
0d6f97e
@miloops miloops Arel now handles ranges with excluded end.
7006aa1
@jeremy jeremy Merge remote branch 'miloops/master'
4072adf
@jeremy jeremy Add missed changelog for table_name_prefix
36a5e78
@jeremy jeremy ruby-debug19 doesn't install cleanly on 1.9.2 trunk
94ced08
@josevalim josevalim Revert "Reorganized app/test directory. [#3057 state:resolved]"
This reverts commit a0dc675.
9a865ee
@josevalim josevalim Revert "Update USAGE docs for generators."
This reverts commit d31e03f.
74efe4c
@jeremy jeremy Ruby 1.9: use ruby-debug19. [#3949 state:resolved]
da238da
@wycats wycats Revert "Ruby 1.9: use ruby-debug19. [#3949 state:resolved]"
This wasn't the issue here; we need to beef up the docs and speak to
Wayne and Mark about installation.

This reverts commit da238da.
a509b0b
@ernie ernie Fix honoring :primary_key option when joining or eager loading a belo…
…ngs_to association

[#765 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
6302654
@jeremy jeremy Revert "Hash#symbolize_keys(!) optimizations"
Was slower in common case.

[#3891 state:open]

This reverts commit 2060977.
e303636
@jeremy jeremy Work without bundler
af8852d
@jeremy jeremy Ruby 1.9: use ruby-debug19. [#3949 state:resolved]
4fbcde4
@wycats wycats Revert "Ruby 1.9: use ruby-debug19. [#3949 state:resolved]"
This wasn't the issue here; we need to beef up the docs and speak to
Wayne and Mark about installation.

This reverts commit da238da.
b94c408
@josevalim josevalim Fix dom_id for ActiveRecord [#4296 state:resolved]
56bed51
@josevalim josevalim Just inspect load paths to generate the documentation.
331327d
Commits on Mar 30, 2010
@wycats wycats Replace the placeholder base_hook API with on_load. To specify some c…
…ode that

should run during framework load do:

ActiveSupport.on_load(:action_controller) do
  # Code run in the context of AC::Base
end
4aded43
@NZKoz NZKoz Fix syntax error and avoid the use of unless/else.
bc29815
@postmodern postmodern Changed gem_path to yield the path found in $LOAD_PATH to a block.
* This allows gems not found in $LOAD_PATH to be safely ignored by the
  rails documentation task.

Signed-off-by: José Valim <jose.valim@gmail.com>
f9e84a9
@josevalim josevalim Remove if/else branch when generating the documentation since we are …
…simply inspecting the load path.
ebcc4c5
Xavier Noria periods are not metacharacters within character classes
ce3864a
@josevalim josevalim Remove deprecated model_subclass since it was never published.
ffcd441
@josevalim josevalim Bring rdoc tasks back to plugins.
41b45d5
@miloops miloops Named scopes shouldn't test equality using to_a if it's not an Array,…
… this was causing records to be loaded before they were needed.

Signed-off-by: José Valim <jose.valim@gmail.com>
8d99ec9
@miloops miloops Fix failing test in MySQL.
Signed-off-by: José Valim <jose.valim@gmail.com>
37102a5
@josh josh Fix stack overflow bug in integration test router helpers
17f0c1e
@josh josh Consistent routing language
cdf8c35
@josh josh Missed a few spots in railties
53e16d8
@josevalim josevalim Add a test which ensures slugs in :id work.
772a022
@xuanxu xuanxu new assertion: assert_blank
Signed-off-by: Xavier Noria <fxn@hashref.com>
7212c29
@xuanxu xuanxu New assertion: assert_present [#4299 state:committed]
Signed-off-by: Xavier Noria <fxn@hashref.com>
589deb3
@fxn fxn adds and entry for assert_blank and assert_present to CHANGELOG
1412ad4
@spastorino spastorino Don't cache the utc_offset we are already caching the timezone [#4301
…state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
7d0eea1
@spastorino spastorino avoid method redefined; discarding old empty? warning [#4302 state:co…
…mmitted]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
c10958f
Commits on Mar 31, 2010
@josevalim josevalim Deprecate cookie_verifier_secret in favor of config.cookie_secret all…
…owing signed cookies to work again.
62151dd
@fxn fxn adds missing require for blank? and present?
607f945
@lifo lifo Dont try to load the record from the db if preloading didn't find any…
…thing
5562abb
@josevalim josevalim yield always return an array, so we don't need to use .key?
05337f6
@ravinderrana ravinderrana Create tmp directories if required before starting server [#3907 stat…
…e:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
db28d40
@josh josh Add --skip-bundler option to rails application generator
NOTE: This does not fix the bundler activation issue. The "bundler"
gem will still be installed and activated when you install rails.
fc3a39b
@jeremy jeremy To skip bundler, `rm Gemfile`. Create a Gemfile to use it again.
b3980af
@ernie ernie Fix mapping of bigint/smallint/uuid columns in postgresql adapter.
Signed-off-by: Emilio Tagua <miloops@gmail.com>
ccf8311
@ernie ernie Add tests for postgresql column type mapping updates [#4270 state:res…
…olved]

Signed-off-by: Emilio Tagua <miloops@gmail.com>
98bf00d
Commits on Apr 01, 2010
@jeremy jeremy Missed __FILE__
8dfa276
@jeremy jeremy HTML safety: give a deprecation warning if an array of option tags is…
… passed to select tag. Be sure to join the tag yourself and mark them .html_safe
3859828
@bernardo bernardo Fix error in number_with_precision with :significant option and zero …
…value [#4306 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
81e6933
@drichardson drichardson Read postgresql encoding using string key instead of symbol [#4304 st…
…ate:resolved]

Signed-off-by: wycats <wycats@gmail.com>
e8292ab
@dhh dhh Prep for beta2, depend on latest Bundler
d868cb4
@dhh dhh Not needed with RubyGems 1.3.6
86473b4
@dhh dhh Make your bed and clean up your gemspecs!
9b71c55
@dhh dhh Neat and tidy, I say
d956003
@dhh dhh Bump this guy too
46aee9f
@wycats wycats Updated changelogs
d2a4885
@wycats wycats Updated changelogs to differentiate beta1 and beta2
c1883e7
@dhh dhh Release is today, yo
f0364d8