Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
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 Feb 13, 2012
@tenderlove tenderlove Merge pull request #5000 from flavorpill/master-with-multidb-associat…
…ion-fix

Fix associations with per-class/multiple database connections
04c0aea
@vatrai vatrai remove unwanted require for string encoding a9e18df
@tenderlove tenderlove Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_pr…
…epare

Fix usage of psql in db:test:prepare
957da55
@spastorino spastorino Merge pull request #5026 from castlerock/remove_require_for_string_en…
…coding

remove unused require for string encoding
10cf66c
@carlosantoniodasilva carlosantoniodasilva Refactor sprockets compressors module 9b9838e
@carlosantoniodasilva carlosantoniodasilva Use Hash#fetch instead of testing for #key? 6960e48
@jeremy jeremy Merge pull request #5031 from carlosantoniodasilva/sprockets-compress…
…ors-refactor

Sprockets compressors refactor
11d1bdc
Commits on Feb 14, 2012
@carlosantoniodasilva carlosantoniodasilva Allow collection helpers with block to access current object in the c…
…ollection

This gives a lot more flexibility to the user, for instance to generate
a collection of check boxes and labels, allowing to add custom classes
or data-* attributes to the label/check_box using another object
attribute.

This basically mimics options_for_select functionality that accepts a
third option for each item to generate html attributes for each option.
a10ed70
@markmcspadden markmcspadden Allow ActiveResource subclasses to inherit headers from parent 0101d27
@jeremy jeremy Merge pull request #3305 from cjolly/request_filtered_env
Exclude rack.request.form_vars from request.filtered_env
bd90f9e
@lest lest remove unnecessary require core_ext/string/encoding b5f5e27
@josevalim josevalim Merge pull request #5035 from lest/patch-1
remove unnecessary require core_ext/string/encoding
c5b90a6
@amatsuda amatsuda Rename field_changed? to _field_changed? so that users can create a f…
…ield named field
0bd44f9
@amatsuda amatsuda A test case for GH #3544 to ensure that a field named field works fine bdb6c4e
@josevalim josevalim Merge pull request #5032 from carlosantoniodasilva/collection-helpers…
…-object

Allow collection helpers with block to access current object in the collection
65ffcec
@carlosantoniodasilva carlosantoniodasilva Update f.button docs to reflect real label implementation 06599ff
@carlosantoniodasilva carlosantoniodasilva Remove not used button translation from av locale bb46124
@josevalim josevalim Merge pull request #5036 from carlosantoniodasilva/form-button
Remove not used button translation from av locale
7f6ee93
@carlosantoniodasilva carlosantoniodasilva Always reenable _dump task in AR databases rake. Closes #5030
This allows the internal :_dump task to be called as many times as
required. For instance, `rake db:migrate:redo` calls two tasks that
internally call :_dump, and without reenabling it to be reinvoked,
the database was left in incorrect state.
4b44c20
@funny-falcon funny-falcon sync __run_callbacks with ruby-trunk
https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/34580
In this revision behavior of respond_to? had changed: now to ask about
protected method one should pass second argument `true`
1076c88
@josevalim josevalim Merge pull request #5039 from funny-falcon/fix_callback
sync __run_callbacks with ruby-trunk
fa04a73
@josevalim josevalim Merge pull request #5038 from carlosantoniodasilva/fix-db-migrate-redo
Always reenable _dump task in AR databases rake. Closes #5030
abdff44
@tenderlove tenderlove Merge pull request #3544 from amatsuda/_field_changed
Rename field_changed? to _field_changed? so that users can create a field named field
848c3d4
@markmcspadden markmcspadden Remove double test for header inheritance leaks a93cbbd
@parndt parndt "Or" was not meaningful anymore, per dad7fdc 8b88a20
@vijaydev vijaydev Merge pull request #5042 from parndt/patch-2
"Or" was not meaningful anymore, per dad7fdc
4f6d310
@vijaydev vijaydev CSS fix for guides. Closing #5028 [ci skip]
In Ubuntu Chrome, in the last lines of code blocks, the underscore isn't
visible. Increasing the line height slightly seems to fix this. This
problem doesn't exist in Firefox even on Ubuntu. Too lazy to test in
any other OS-browser combo :)
4baaf0a
@spastorino spastorino Rack body respond to each and not to join
This fixes undef `to_str' for Rack::Chunked::Body when using
caches_action + streaming on an action

Closes #5027
5843069
Commits on Feb 15, 2012
@tenderlove tenderlove adding tests to document behavior for #4817 5cc47e4
@avakhov avakhov Fix AM block_format helper method description dadace4
@avakhov avakhov Cosmetic fixes in block_format AM helper method + test 393d4ec
@josevalim josevalim Merge pull request #5046 from avakhov/am-block-format-fit
Cosmetic fixes in block_format AM helper method + test
1c75b9a
@avakhov avakhov Fix AM format_paragraph helper method if a first word is long 7f33a44
@josevalim josevalim Merge pull request #5045 from avakhov/am-format-paragraph-fix
Fix AM format_paragraph helper method if a first word is long
2f9e477
@fabioyamate fabioyamate Fix sanitize_for_mass_assigment when role is nil
There is an example in Rails documentation that suggests implementing
assign_attributes method for ActiveModel interface, that by default
sends option role with nil. Since mass_assignment_authorizer never
is called without args, we can move the default value internally.
d204918
@josevalim josevalim Merge pull request #5049 from fabioyamate/master
Fix sanitize_for_mass_assigment when role is nil
1c22c6f
@tenderlove tenderlove fixing AP tests a03e9c6
@rafaelfranca rafaelfranca Revert "No need to pass options which is never used"
Options is needed for some Rails extensions to determine when
referential integrity should be disabled

This reverts commit bcb466c.

Fixes #5052
f174e84
@jeremy jeremy Merge pull request #5055 from rafaelfranca/fix-drop-table
Revert "No need to pass options which is never used"
a5874dd
Commits on Feb 16, 2012
@waseem waseem Autoload various constants effectively in abstract connection adapter. 9aad20f
@radar radar Rails::Engine docs should use helper method, not helpers 46b4a26
@radar radar [engines guide] Revise draft of guide, add testing, assets and depend…
…encies sections
4435959
@radar radar update engines guide to explicitly reference relative-to-engine-root-…
…path for db/seeds.rb
6a2cf4c
@radar radar [engines guide] Elaborate on isolate_namespace functionality 7bdfc47
@radar radar [engines guide] Clean up explanation for routing methods 3b3433f
@radar radar [engines guide] basic revision/review work 9ee71e2
@bogdan bogdan ActionDispatch: add missing test for callbacks f1a3e7b
@josevalim josevalim Merge pull request #5062 from bogdan/test2
ActionDispatch: add missing test for callbacks
c53f6ca
@fxn fxn Merge pull request #5059 from waseem/autoload_effectively
Autoload various constants effectively in abstract connection adapter.
eeae4da
@lest lest move id_before_type_cast to PrimaryKey module ec4759d
@jeremy jeremy Merge pull request #5064 from lest/patch-1
move id_before_type_cast to PrimaryKey module
079e2f4
@lest lest escape static file path to prevent double unescaping d07b2f3
@drogus drogus Remove console --irb deprecation notice e09ac70
@drogus drogus Allow to set custom console type with Rails.application.config.console=
This patch adds ability to set custom console if you want to use
something other than IRB. Previously the hack that people used
was:

    silence_warnings do
      require 'pry'
      IRB = Pry
    end

which is not the best way to customize things.
951b582
@drogus drogus Refactor Rails::Console to make it easier to test and add tests for it dd655d8
@drogus drogus Fix tests, Rails.env may be different on CI c84e4b5
@tenderlove tenderlove database connections are automatically established after forking.
Connection pools are 1:1 with pids.
aaff1a4
@tenderlove tenderlove use Process.pid rather than $$ decafdd
Commits on Feb 17, 2012
@josevalim josevalim Merge pull request #5066 from lest/patch-1
escape static file path to prevent double unescaping
4bb6ed7
@fxn fxn let expires_in accept a must_revalidate flag ce51edb
@pixeltrix pixeltrix Fix ActionDispatch::Static to serve files with unencoded PCHAR
RFC 3986[1] allows sub-delim characters in path segments unencoded,
however Rack::File requires them to be encoded so we use URI's
unescape method to leave them alone and then escape them again.

Also since the path gets passed to Dir[] we need to escape any glob
characters in the path.

[1]: http://www.ietf.org/rfc/rfc3986.txt
ceb288b
@pixeltrix pixeltrix Simplify regexp b9ad097
@petmit petmit Correctly print names of non-timestamped migrations with db:migrate:s…
…tatus
910c59f
@oestrich oestrich Update Time#change docs to reflect the options it uses
[ci skip]
3720d5e
@tenderlove tenderlove Merge pull request #5076 from petmit/migrate_status_without_timestamps
Correctly print names of non-timestamped migrations with db:migrate:status
663c9f3
Commits on Feb 18, 2012
@asanghi asanghi Add a note about :dependent => :restrict on has_one and has_many's op…
…tions
910f7aa
@asanghi asanghi Add note about Rails 4.0 changes abcaa9b
@asanghi asanghi Do get it right this time. Fixing the documentation around :dependent…
… => :restrict option
f49ec92
@avakhov avakhov Fix AbstractController::Base#hidden_actions comment 774e2c4
@avakhov avakhov Fix actionpack readme weblog example 6bd8b66
@josevalim josevalim Merge pull request #3479 from arvida/ensure-date-header-on-expires-in
Ensure Date header on expires_in
2f689d4
@willbryant willbryant assigns(:foo) should not convert @foo's keys to strings if it happens…
… to be a hash
185c3db
@nashby nashby add selected and disabled option to grouped select ac2e801
@ffmike ffmike Documenting the :inverse_of option for associations 1cb6417
@johndouthat johndouthat Remove reference to rails_legacy_mapper, which isn't compatible with …
…3.2 #5022
4250cca
@vijaydev vijaydev fix some typos [ci skip] 709f33d
@vijaydev vijaydev Merge branch 'master' of github.com:lifo/docrails 2cb86cd
@simi simi Update activerecord/CHANGELOG.md b4b2f5d
@vijaydev vijaydev Merge pull request #5085 from simi/patch-1
Update activerecord/CHANGELOG.md
6219beb
Commits on Feb 19, 2012
@avakhov avakhov Fix AbstractController#controller_path doc eb26af6
Commits on Feb 20, 2012
@jeremy jeremy Integration tests support the OPTIONS http method ad46884
@pixeltrix pixeltrix Remove fixture files with Windows incompatible filenames
Windows doesn't allow `\ / : * ? " < > |` in filenames so create
the fixture files at runtime and ignore the incompatible ones when
running on Windows.
1ef12fd
@bogdan bogdan AM::Errors: allow :full_messages parameter for #as_json 534dc4c
@josevalim josevalim Merge pull request #5075 from bogdan/json_full_messages
AM::Errors: allow :full_messages parameter for #to_json
e1c3816
@lawso017 lawso017 Restored ability to identify ID and Sequence from tables relying on a…
… nonmatching sequence default value for PK.
977f4bd
@lawso017 lawso017 removed commented line. 3434 tests, 10531 assertions, 0 failures, 0 e…
…rrors, 31 skips
1649a86
@josevalim josevalim Merge pull request #5083 from nashby/grouped-select-options
add selected and disabled options to grouped select
b62f5a9
@tenderlove tenderlove Merge pull request #5096 from lawso017/master
Restoring ability to derive id/sequence from tables with nonstandard sequences for primary keys
977183a
@tenderlove tenderlove Merge pull request #5082 from willbryant/assigns_should_not_stringify…
…_values_master

assigns(:foo) should not convert @foo's keys to strings if it happens to be a hash
eff507f
@tenderlove tenderlove search private / protected methods in trunk ruby 07dc909
@josevalim josevalim Merge pull request #5101 from ckdake/ckdake_actionview_handler_reset
Reset memoized hash keys when new ActionView::Template handler is registered
Conflicts:

	actionpack/lib/action_view/template/handlers.rb
5e3b54d
@spastorino spastorino Use the right format when a partial is missing.
Closes #5025
70fd692
@spastorino spastorino Fix a failing test 4e3c215
@nashby nashby refactor grouped_options_for_select 421025f
@nashby nashby refactor options_for_select decff3f
@josevalim josevalim Merge pull request #5102 from nashby/form-option-refactor
form option refactor
4b45fcf
@tenderlove tenderlove use Hash#delete with a default block 563df87
@lest lest fix output safety issue with select options 08b029c
Commits on Feb 21, 2012
@amatsuda amatsuda add AS::SafeBuffer#clone_empty 71b95bd
@amatsuda amatsuda use AS::SafeBuffer#clone_empty for flushing the output_buffer dcf0964
@amatsuda amatsuda delete vulnerable AS::SafeBuffer#[] 71d8c77
@tenderlove tenderlove tag bind params with a bind param object f48a33b
@jeremy jeremy Merge pull request #5033 from markmcspadden/inherited_headers
Allow ActiveResource subclasses to inherit headers from parent
c5bf538
@rubenfonseca rubenfonseca use Hash#delete on styelsheet_link_tag 0360a38
@jonleighton jonleighton Merge pull request #5107 from rubenfonseca/stylesheet_link_tag_refactor
use Hash#delete on styelsheet_link_tag
e7c6cd3
@pawel2105 pawel2105 Added database pooling sub-section to the 'configuring' guide 28860d8
@pawel2105 pawel2105 Merge pull request #84 from pawel2105/master
Database pooling configuration
b2bfb07
@mirakui mirakui Bug: cache_path.size doesn't return length of filename but size of fi…
…le if cache_path is Pathname.
0b1ce07
@nupurjain nupurjain suggested changes. f0baa1c
@spastorino spastorino Merge pull request #5112 from nupurjain/activesupport_cache_refactor
suggested changes.
67a5157
@nashby nashby refactor time_zone_options_for_select
BTW, select works quite faster then find_all:
require 'benchmark'

n = [1]*100_000_000
Benchmark.bm do |x|
  x.report { n.select { |a| a > 1 } }
  x.report { n.find_all { |a| a > 1 } }
end

    user     system      total        real
7.590000   0.010000   7.600000 (  7.927171)
9.650000   0.010000   9.660000 (  9.634406)
9dd64f2
@spastorino spastorino Restore lookup formats to the previous value after searching for the …
…failing view
92a7296
@rubenfonseca rubenfonseca Refactored two methods to use delete with a block c0ec40c
@tenderlove tenderlove Merge pull request #5116 from rubenfonseca/delete_with_block_refactor
Refactored two methods to use delete with a block
fd74cd7
@tenderlove tenderlove Merge pull request #5108 from mirakui/patch-1
Bug: cache_key.size doesn't return length of filename but size of file
12e2405
@kennyj kennyj Testcase for GH #5114. f5e69fc
@nashby nashby refactor option_text_and_value and option_value_selected? methods 50cf5f7
@vatrai vatrai ordered_options will work if inherited from Hash, remove OrderedHash …
…usage
cd641fa
@spastorino spastorino Don't wrap the raise with ensure d37a7e6
@vijaydev vijaydev fix bad docs from f373f29 [ci skip] a295544
@tenderlove tenderlove ruby 2.0 makes protected methods return false for respond_to, so pass…
… true as the second param
5d0c181
@tenderlove tenderlove more ruby 2.0 respond_to? changes 19c7124
@mattdbridges mattdbridges Adding :last_week, :last_month, and :last_year aliases to Time and Date
core extensions
d636662
@spastorino spastorino Merge pull request #5118 from castlerock/ordered_options_from_hash
ordered_options will work if inherited from Hash, remove OrderedHash usage
349d5a6
Commits on Feb 22, 2012
@tenderlove tenderlove prepared statements can be disabled fd39847
@tenderlove tenderlove bumping up arel 66b7eb1
@bquorning bquorning Prefer || over 'or' for boolean operations 5742f12
@josevalim josevalim Merge pull request #5124 from bquorning/prefer-||-over-'or'-for-boole…
…an-operations

Prefer || over 'or' for boolean operations
a95f730
@spastorino spastorino format lookup for partials is derived from the format in which the te…
…mplate is being rendered

Closes #5025 part 2
157ea76
@bogdan bogdan AS::Callbacks: deprecate rescuable option 10bac29
@josevalim josevalim Merge pull request #5128 from bogdan/deprecate_rescuable
AS::Callbacks: deprecate rescuable option
f28d9f1
@dlee dlee Add config.default_method_for_update to support PATCH
PATCH is the correct HTML verb to map to the #update action. The
semantics for PATCH allows for partial updates, whereas PUT requires a
complete replacement.

Changes:
* adds config.default_method_for_update you can set to :patch
* optionally use PATCH instead of PUT in resource routes and forms
* adds the #patch verb to routes to detect PATCH requests
* adds #patch? to Request
* changes documentation and comments to indicate support for PATCH

This change maintains complete backwards compatibility by keeping :put
as the default for config.default_method_for_update.
002713c
@fxn fxn Merge pull request #5130 from dlee/revised_patch_verb
Add config.default_method_for_update to support PATCH
7f2548e
@tenderlove tenderlove Merge pull request #5119 from kennyj/fix_5114
Testcase for GH #5114.
ef5670e
@rafaelfranca rafaelfranca Fix routes inspection order a870d06
@tenderlove tenderlove Merge pull request #5132 from rafaelfranca/fix-build
Fix routes inspection order
cdc1885
@rafaelfranca rafaelfranca Only set ActionView configuration inside the on_load block 60585d2
@tenderlove tenderlove Merge pull request #5133 from rafaelfranca/fix-build
Only set ActionView configuration inside the on_load block
36d9fd7
@tenderlove tenderlove add some tests, yay! a328f2f
@fxn fxn updates CHANGELOGs to register changes in 002713c 5497432
@mitio mitio Minor fixes to ActiveRecord::AutosaveAssociation's docs
* Fix typos
* Remove meaningless code from the examples
9114893
@mitio mitio Revert "Remove meaningless code from the examples" of AutosaveAssocia…
…tion


Reverts a part of 9114893. Should probably be squashed with it when merging back in rails/rails.
7ee7f14
@felixbuenemann felixbuenemann Make log autoflushing configurable 0f3d426
@felixbuenemann felixbuenemann Advertise autoflush option in production template 681a574
@felixbuenemann felixbuenemann Always default to flushing enabled 4a98a30
@tenderlove tenderlove Merge pull request #4998 from fbuenemann/feature/configurable-log-flu…
…shing

Make automatic log flushing configurable
abf3f67
@tenderlove tenderlove Merge pull request #5084 from johndouthat/patch-1
Remove reference to rails_legacy_mapper, which isn't compatible with 3.2...
3f8dc55
Commits on Feb 23, 2012
@avakhov avakhov Cosmetic fixes in AM changelog f75f5d2
@avakhov avakhov Remove skip_filter block param 9e1b2d8
@avakhov avakhov Remove unused global variable in controller filters test 2b1c853
@josevalim josevalim Merge pull request #5137 from avakhov/remove-skip-filter-block-param
Remove skip_filter block param
541dbf4
@josevalim josevalim Merge pull request #5138 from avakhov/remove-unused-global-var
Remove unused global variable in controller filters test
06d2d4c
@josevalim josevalim Avoid inspecting the whole route set, closes #1525 ed988ee
@mhfs mhfs Remove unused implementation of next_migration_number 846a9bc
@felixbuenemann felixbuenemann Move config.autoflush_log to correct template.
This accidentally ended up in the development template
instead of the production template, where it makes
most sense.
7549a78
@felixbuenemann felixbuenemann Use consistent whitespace for commented options. fb9a919
@pat pat SSL should not be disabled by default in any environment. ab83890
@pixeltrix pixeltrix Update documentation for force_ssl - closes #5023. c04a084
@spastorino spastorino Merge pull request #5140 from fbuenemann/fix/autoflush-wrong-template
Move config.autoflush_log to correct template
68a977e
@pixeltrix pixeltrix Document the :host option for force_ssl 5093915
@josevalim josevalim Merge pull request #5139 from mhfs/remove_next_migration_number
Remove unused implementation of next_migration_number
af988ef
@mguterl mguterl Update with new task names for building mysql and postgresql databases 6c384a6
@nashby nashby correct fetching :name option in form fields f0a5d32
@vijaydev vijaydev Merge pull request #5143 from mguterl/update_running_unit_tests_doc
Update with new task names for building mysql and postgresql databases
335fac5
@glitterfang glitterfang Fix typo in match :to docs 62b1f1a
Commits on Feb 24, 2012
@mattfawcett mattfawcett Fix the assert_recognizes test method so that it works when there are
constraints on the querystring. Issue #2781
d7bf930
@tenderlove tenderlove Merge pull request #5144 from nashby/input-name-nil
correct fetching :name option in form fields
e04fa0e
@fxn fxn removes verify_active_connections!
The method verify_active_connections! was used in
the old days (up to 2.1 I think) by the dispatcher
to verify the connections, but nowadays we do that
in a different way and this method is obsolete.
9d1f1b1
@fxn fxn explains why reconnect is false by default in the database.yml genera…
…ted for MySQL
5d70791
@noahhendrix noahhendrix Fixed typo in composed_of example with Money#<=>, was comparing amoun…
…t itself instead of other_money.amount
0519567
@fxn fxn removes the reconnect key from the database.yml generated for MySQL
The reconnect flag does not play nicely with transactions and so
it is of little use in Rails applications. Thus, albeit supported
by mysql2, it does not deserve such a prominent place in the
generated database.yml, which should be a representative config
example. Note that the flag is false by default.

Advanced users know from mysql2 docs that the flag is available.
004326e
@fxn fxn decouples the implementation of the inflector from its test suite
Trying alternative implementations of the inflections
is hard because the suite is coupled with the current
one, setting ivars by hand etc. This commit relies on
initialize_dup, as long as you maintain that one you
can tweak the implementation.
31ceb5e
Commits on Feb 25, 2012
@fxn fxn uses PATCH for the forms of persisted records, and routes PATCH and P…
…UT to the update action of resources
b7a0945
@fxn fxn consistently mention first patch, then put
There was a mix, sometimes patch first, sometimes put first.
Use always patch first, since this is going to be the
primary verb for updates.
3008188
@tenderlove tenderlove use regular ruby for fewer method calls. we do not need :gift:s! 9ef701d
@fxn fxn fixes a test: rake routes now includes PATCH for resources 84cd58f
@arunagw arunagw put and patch both are allowed for update d03076f
@josevalim josevalim Merge pull request #5161 from arunagw/put_patch_build_fix
build fixed -- put and patch both are allowed for update
97df6f3
@kennyj kennyj Remove wrong and redundant code. fd5a298
@josevalim josevalim Merge pull request #5163 from kennyj/fix_5119
Remove wrong and redundant code.
862e27f
@pacoguzman pacoguzman Update changelogs with rails 3.0-stable branch info 152a393
@fxn fxn Merge pull request #4023 from pacoguzman/update-changelogs
Update changelogs with rails 3.0-stable branch info
5196c07
@kennyj kennyj Remove NULLS FIRST/LAST. closes #5152 404b73b
@josevalim josevalim Merge pull request #5117 from nashby/form-option-refactor
FormOptionsHelper refactor
29054ba
@kennyj kennyj Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931. fe7cacb
@vijaydev vijaydev copy-edits [ci skip] 7940976
@vijaydev vijaydev Merge branch 'master' of github.com:lifo/docrails
Conflicts:
	actionmailer/CHANGELOG.md
1e25d62
@vijaydev vijaydev A guide for upgrading Rails [ci skip] eecb086
@nashby nashby use content_tag instead strings 2bc879a
@josevalim josevalim Merge pull request #5174 from nashby/safe-concat
use content_tag instead of strings
cbe74cf
Commits on Feb 26, 2012
@pixeltrix pixeltrix Adding tests for non-optional glob parameters 74bc920
@timsly timsly fixed regular expression in Specifying Constraints section a3a73c4
@devmentor devmentor layout affects views not methods 3689b57
@timsly timsly Merge branch 'master' of github.com:lifo/docrails d4b3593
@timsly timsly reverted regular expression fix 25ad2e9
@fxn fxn let the connection pool of new applications have size 1 rather than 5
The majority of Rails applications are multiprocess, people
may wonder why rails new generates a default pool of 5, does
my application need a connection pool of 5? By generating
a default of 1 database.yml is much more clear, and with
the comment people know what is the connection pool for,
and they know it has to be bigger for multithread apps.
9b2c38b
@fxn fxn updates the new default pool size in some additional places 5c0aba2
@rafaelfranca rafaelfranca Move all the helpers to protected section 5979ad3
@rafaelfranca rafaelfranca Add documentation to object method of CollectionHelpers::Builder 80680e9
@rafaelfranca rafaelfranca Fix collection_check_boxes and collection_radio_buttons when using local
variables in the form builder
2ff884c
Commits on Feb 27, 2012
Florent Guilleux document how to create non show paths from an array of parameters f2f556d
@josevalim josevalim Merge pull request #5185 from rafaelfranca/fix-collection_helpers
Fix collection helpers
551566d
@amatsuda amatsuda ruby19: no need to rescue when requiring 'rdoc/task' in Ruby >= 1.9 20ca766
@josevalim josevalim Merge pull request #5192 from amatsuda/rdoc_task_19
no need to rescue when requiring 'rdoc/task' in Ruby >= 1.9
4a631df
@rafaelfranca rafaelfranca Add a new line after the textarea opening tag.
Closes #393
a6074c3
@tenderlove tenderlove Merge pull request #5179 from RalphShnelvar/Binary_mode_Window_bug
Binary mode window bug
9ad7767
@tenderlove tenderlove Merge pull request #5173 from kennyj/fix_3931-2
Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931 (Try again).
a19dd29
@tenderlove tenderlove Merge pull request #5168 from kennyj/fix_5152
[PostgreSQL] Remove NULLS FIRST/LAST. Closes #5152
699e460
@tenderlove tenderlove Merge pull request #5191 from rafaelfranca/fix-393
Add a new line after the textarea opening tag.
a4e4d28
@tenderlove tenderlove use bind values for join columns 4bc2ae0
@tenderlove tenderlove removing dead code 2adf78d
@tenderlove tenderlove bind value creation refactoring 4f82553
@tenderlove tenderlove only mutate the scope object in the `bind` method 1b9e19c
@tenderlove tenderlove call binmode on the tempfile for Ruby 1.8 compatibility f42c963
@tobym tobym Correct NullStore cache store name in caching guide 03a6119
@lest lest force datetime attributes to be changed, fix GH #3965 ddb5d2f
@olly olly Add brief summary of strict validations added in 3.2. 593a09d
@lest lest remove unnecessary code
it was added in 36129f2
but isn't useful anymore as corresponding tests pass without it
cb400b0
Commits on Feb 28, 2012
@tenderlove tenderlove Revert "only mutate the scope object in the `bind` method"
This reverts commit 1b9e19c.
acf7e86
@gabehollombe gabehollombe Change asset_host config language to be more helpful and accurate e87f1aa
@josevalim josevalim Merge pull request #5197 from lest/patch-4
remove unnecessary code
d17e44e
@fxn fxn Merge pull request #5199 from gabehollombe/master
The language for describing how to configure ActionController::Base.asset_host could be clearer
43faccf
@fxn fxn Merge pull request #4284 from mattdbridges/time_calculation_aliases
Added aliases for prev_year, prev_month, and prev_week in Time and Date calculations
699ba8a
@avakhov avakhov Fix layout lookup for anonymous controller b27c29e
@vijaydev vijaydev copy edits [ci skip] 1d802f1
@vijaydev vijaydev move the strict validations to an appropriate section and some edits …
…[ci skip]
547e695
@vijaydev vijaydev Merge branch 'master' of github.com:lifo/docrails f597122
@vijaydev vijaydev minor edits [ci skip] 25aa4c7
@homakov homakov Inflector/constantize - inject method lets us to avoid using another …
…variable
ef79b84
@josevalim josevalim Merge pull request #5196 from lest/patch-3
force datetime attributes to be changed, fix GH #3965
5bbd2d3
@tenderlove tenderlove Merge pull request #5208 from ysoslow/ef79b8400f064361b2dbe1ee89f42d2…
…adc103a3c

Inject in constantize
f07a957
Mark Modified comments explaining what the update_only option does. 27da612
@fxn fxn Merge pull request #5212 from MarkMT/master
update_only documentation for accepts_nested_attributes_for
7d29d7a
Commits on Feb 29, 2012
@bdurand bdurand remove unnecessary memcache equire in ActionDispatch::Session::CacheS…
…tore
3fbc8f3
@jeremy jeremy Merge pull request #5214 from bdurand/fix_session_cache_store_require
remove unnecessary memcache require in ActionDispatch CacheStore
c512730
@tenderlove tenderlove reduced localhost check to two method calls 8cecb47
@kennyj kennyj Fix warning: assigned but unused variable adf3cb5
@jeremy jeremy Merge pull request #5221 from kennyj/fix_warning_20120301
Fix warning: assigned but unused variable
f9b698f
@vijaydev vijaydev adds a nodoc [ci skip]
We have an empty api doc page otherwise :)
3abf1f5
@vijaydev vijaydev fix api doc [ci skip] 4244a09
@tenderlove tenderlove Merge pull request #5219 from mattfawcett/2781-fix-querystring-route-…
…constraint-for-testing

Fix for #2781
1d21528
@tenderlove tenderlove Merge pull request #5203 from avakhov/anonymous-controller-layout
Fix layout lookup for anonymous controller
f9995ce
Commits on Mar 01, 2012
@josevalim josevalim Ensure [] respects the status of the buffer. 8ccaa34
@jeremy jeremy Tap, tap goes the middleware ceb66b6
@tenderlove tenderlove Merge branch 'master-security'
* master-security:
  Ensure [] respects the status of the buffer.
  delete vulnerable AS::SafeBuffer#[]
  use AS::SafeBuffer#clone_empty for flushing the output_buffer
  add AS::SafeBuffer#clone_empty
  fix output safety issue with select options

Conflicts:
	actionpack/lib/action_view/helpers/tags/base.rb
139963c
@claudiob claudiob Add release dates to documentation
Set "March 1, 2012" as the release date for 3.2.2, 3.1.4, 3.0.12
05c6caf
@vijaydev vijaydev Merge pull request #5232 from claudiob/add_release_date_to_docs
Add release dates to documentation
447d87c
Commits on Mar 02, 2012
@fxn fxn revert setting NOT NULL constraints in add_timestamps
Commit 3dbedd2 added NOT NULL constraints both to table
creation and modification. For creation the new default
makes sense, but the generic situation for changing a
table is that there exist records. Those records have
no creation or modification timestamps, and in the
general case you don't even know them, so when updating
a table these constraints are not going to work. See
a bug report for this use case in #3334.
fcef728
@josevalim josevalim Optimize path helpers. d7014bc
@josevalim josevalim Optimize url helpers. cd5daba