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: xuanxu/rails
...
head fork: xuanxu/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 Dec 14, 2012
@mmb mmb Do not log the binding values for binary columns.
They tend to be large and not very useful in the log.
8f59ffc
@steveklabnik steveklabnik Revert "Merge pull request #8499 from schneems/schneems/html-route-in…
…spector"

This reverts commit ae68fc3, reversing
changes made to 0262a18.

See here: rails#8499 (comment)
8554537
@steveklabnik steveklabnik Revert "Fix failing test in railties"
This reverts commit 6bdc046.

This has been reverted because rails@8554537
a8864aa
@tenderlove tenderlove Merge pull request #8514 from mmb/filter_blob
Do not log the binding values for binary columns.
99d142a
@carlosantoniodasilva carlosantoniodasilva Convert changelogs to 1.9 hash style and fix some formatting [ci skip] df9f9b7
@carlosantoniodasilva carlosantoniodasilva Skip binary data with binds test for mysql2, fix build
Mysql2 doesn't support binds, which means no binds payload is set when
logging, so the logic to render binary data differently here doesn't work.

Introduced in 99d142a.
f447240
@zbskii zbskii Remove unicode character encoding from ActiveSupport::JSON.encode
The encoding scheme (e.g. ☠ -> "\u2620") was broken for characters
not in the Basic Multilingual Plane.  It is possible to escape them
for json using the weird encoding scheme of a twelve-character
sequence representing the UTF-16 surrogate pair (e.g. '𠜎' ->
"\u270e\u263a") but this wasn't properly handled in the escaping code.
Since raw UTF-8 is allowed in json, it was decided to simply pass
through the raw bytes rather than attempt to escape them.
8f8397e
Commits on Dec 15, 2012
@rwz rwz AS::BasicObject can be inherited from bb1d3c1
@vijaydev vijaydev Revert "Add quotes to Numeric Passwords to force string(Postgres)"
This reverts commit 6e72099.

Reason: Feel that this isn't the right place.
7124e39
@vijaydev vijaydev Revert "Add quotes to Numeric Passwords to force string(MySql)"
This reverts commit e5f8b2b.
5e42488
@vijaydev vijaydev Revert "Add quotes to Numeric Passwords to force string(jdbcpostgresql)"
This reverts commit db9b619.
57bfd19
@vijaydev vijaydev Revert "Add quotes to Numeric Passwords to force string(jdbcmysql)"
This reverts commit 2f0311d.
df33446
@vijaydev vijaydev Revert "Add quotes to Numeric Passwords to force string(sqlserver)"
This reverts commit d1e70cb.
751dd9e
@vijaydev vijaydev bullets have fullstops too [ci skip] ca73e05
@vijaydev vijaydev copy editing [ci skip] 561e5ab
@vijaydev vijaydev Merge branch 'master' of github.com:lifo/docrails
Conflicts:
	actionpack/lib/action_view/helpers/form_helper.rb
	railties/lib/rails/info_controller.rb
5cc178a
@vijaydev vijaydev make an editing pass through the upgrading guide [ci skip] 351f071
@rubys rubys Remove blank lines from generated Gemfile
Introduced by 059bdc3
b9eb784
@rafaelfranca rafaelfranca Merge pull request #8519 from rubys/master
 Remove blank lines from generated Gemfile
c298ee4
@robotex82 robotex82 Add `ActiveModel::Validations::AbsenceValidator`, a validator to chec…
…k the absence of attributes.

Add `ActiveModel::Errors#add_on_present` method. Adds error messages to present attributes.
d72a07f
@jeremy jeremy Merge pull request #8518 from rwz/inheritable-basic-object
Properly deprecate AS::BasicObject without breaking subclasses of it
2d6abcc
Kurtis Rainbolt-Greene Refactoring the token_and_options method to fix bugs
Adding a test for the equal trun bug

Adding a test for the after equal trunc bug

Adding a test for the slash bug

Adding a test for the slash quote bug

Adding a helper method for creating a sample request object with token

Writing a method to create params array from raw params

Writing a method to rewrite param values in the params

Writing a method to get the token params from an authorization value

Refactoring the token_and_options method to fix bugs

Removing unnessecary test

A constant for this shared regex seemed appropriate

Wanting to split up this logic

Adding small documentation pieces
f71cca9
Commits on Dec 16, 2012
@le0pard le0pard AR supporting new intrange data type on PostgreSQL >= 9.2 9a4a095
@steveklabnik steveklabnik Restored 'Working with Validation Errors'
Somehow this got lost in my PRs before. I'm going to re-check all the
guides to make sure this didn't happen again elsewhere.
8832313
@schneems schneems DebugExceptions `File.join` => `File.expand_path` 170a93d
@steveklabnik steveklabnik Merge pull request #8529 from schneems/schneems/debug-exceptions-exte…
…nd-path

DebugExceptions `File.join` => `File.expand_path`
aefdcfd
Commits on Dec 17, 2012
@ptn ptn Add missing requires to core_ext/integer/time d963ff4
@fxn fxn Merge pull request #8532 from ptn/add_missing_require
Add missing requires to core_ext/integer/time
d8607c1
@vanyak vanyak Add script_name option description and example for #url_for options 0c181b4
@frodsan frodsan fix AS::BasicObject :nodoc: [ci skip] 9f4386c
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8539 from frodsan/fix_as_basic_object
Add nodoc to AS::BasicObject [ci skip]
d551701
@pixeltrix pixeltrix Make conditional_layout? private and update documentation
The conditional_layout? method is not for public use and doesn't
actually do what the documentation suggested it does. It's actually
used to determine whether or not to use the explicit layout definition
defined in a controller or use the implicit layout definition.

Also documentation was added for the action_has_layout? method which
acts as a master switch for disabling the layout for the current
action. This method was added so that action caching didn't depend
on accessing layout internals but is also used by third-parties,
most notably the [Hobo][1] application.

[1]: https://github.com/hobo/hobo
dcb318e
@schneems schneems HTML formatting to Rails::InfoController#routes
This PR adds formatting and meta-data to the display of the internal routes. Users can now toggle between showing helpers with the `_path` or _`url` suffix. 

There are multiple ways to achieve this, this method uses partials for formatting and meta-data. The partials can be re-used when rendering `routing_error.erb`, though that will need to be in a separate PR.

![](http://f.cl.ly/items/3A2p3c1T1t2f2X2R2K2S/Screen%20Shot%202012-12-12%20at%202.28.01%20PM.png)


ATP Railties
8a59b87
@rafaelfranca rafaelfranca Merge pull request #8521 from schneems/schneems/html-routes
HTML formatting to Rails::InfoController#routes
75ba92e
@rafaelfranca rafaelfranca Merge pull request #8528 from le0pard/fixed_ar_intrange
AR supporting new int4range and int8range data type on PostgreSQL >= 9.2
cc74088
@le0pard le0pard AR supporting new int4range and int8range data type on PostgreSQL >= …
…9.2. Fix realization
49182b8
@rafaelfranca rafaelfranca Merge pull request #8542 from le0pard/fixed_ar_intrange
AR supporting new int4range and int8range data type on PostgreSQL >= 9.2. Fix #8528 pull request
504ed90
@schneems schneems Format routes as html on debug page
When someone gets a routing exception, the routes are rendered (starting in Rails 4.0). This PR brings parity between the html routes in the `rails/info/routes` path and when rendered from an exception. This is the continuation of #8521 which brought html formatted routes. 

In addition to bringing parity to the two views, we're keeping our views DRY by rendering off of the same partials. In this case Railties depends on partials provided by ActionDispatch. I'm open to alternative implementations. Ideally both views will use the same code so any improvements or updates to it will be reproduced on both.

<hr />

![](http://f.cl.ly/items/3O1D0K1v0j0i343O3T3T/Screen%20Shot%202012-12-17%20at%203.07.20%20PM.png)
37d9c44
@dgalarza dgalarza Explain controller specific assets more thoroughly
The current section on controller specific assets does not really explain how the default application.css and application.js files
generated by rails will work with controller specific assets and is a bit ambiguous. We should remind users that they will be included
into their application by default but that they have the option to include them only where needed if they want and how this works with
precompiling assets.

[ci_skip]
86c5cea
@rafaelfranca rafaelfranca Merge pull request #8543 from schneems/schneems/html-route-error
Format routes as html on debug page
60214e8
Commits on Dec 18, 2012
@nashby nashby handle protocol option in stylesheet_link_tag and javascript_include_tag
closes #8388
0a6d8fb
@steveklabnik steveklabnik Merge pull request #8389 from nashby/issue-8388
handle protocol option in stylesheet_link_tag and javascript_include_tag
bd5f0ad
@carlosantoniodasilva carlosantoniodasilva Minor js review [ci skip]
Remove/add ; where necessary, fix indentation.
c3e573d
@ppadron ppadron Added support for validates_uniqueness_of in PostgreSQL array columns…
…. Fixes: #8075.
ba98dad
@carlosantoniodasilva carlosantoniodasilva Refactor uniqueness validator logic a bit
Cleanup some code, avoid extra hash with reverse_merge, and don't use
send for :id, since it's always present.
ba492af
@carlosantoniodasilva carlosantoniodasilva Remove prepend_and_append requirement from AS
It's not necessary to use this extension here, we are fine with Array#unshift.
af05829
@carlosantoniodasilva carlosantoniodasilva Avoid unnecessary hashes with error options 73fb634
@carlosantoniodasilva carlosantoniodasilva Simplify value logic by always typecasting 23750b4
@carlosantoniodasilva carlosantoniodasilva Change relation in place 1127262
@carlosantoniodasilva carlosantoniodasilva Extract some methods 0bb1517
@carlosantoniodasilva carlosantoniodasilva Merge branch 'uniqueness-validation-postgresql-arrays'
When setting an array column (or other PostgreSQL-specific data type)
to be validated for uniqueness, the resulting SQL query is generated with
syntax errors, like this:

    SELECT 1 AS one FROM "postgresql_arrays"
    WHERE "postgresql_arrays"."nicknames" = '["john", "johnny"]' LIMIT 1

This happens because Ruby Arrays must be type-casted to their PostgreSQL
equivalent. This small patch fixes this issue, calling the adapter's
type_cast method.

Closes #8077
f6d0eda
@dhh dhh Add app/models/concerns and app/controllers/concerns to the default d…
…irectory structure and load path
f6bbc3f
@dhh dhh Merge 09aeee7
@dhh dhh Fix changelog 15c40b2
@garysweaver garysweaver #5523 Add ability for postgresql adapter to disable user triggers in …
…disable_referential_integrity.
9bb27f7
@rafaelfranca rafaelfranca Merge pull request #8548 from garysweaver/postgresql_fallback_to_disa…
…ble_user_triggers

fix #5523: postgresql adapter to disable user triggers in disable_referential_integrity
e4003ad
@rafaelfranca rafaelfranca Revert "Merge pull request #7587 from elia/fix-too-eager-loading"
This reverts commit 3663057.

REASON: This caused a regression that add app folder in the eager load
path. See #8146 for more information.

Conflicts:
	railties/CHANGELOG.md
7f96e43
@tenderlove tenderlove Revert "use File.basename to get the filename minus .yml"
This reverts commit 00c5342.

Conflicts:
	activerecord/lib/active_record/fixtures.rb
8e44c93
@carlosantoniodasilva carlosantoniodasilva Fix argument name in fixtures method
Relatedo to 8e44c93.
e68abc2
@frodsan frodsan fix railties CHANGELOG [ci skip] b565a7a
@frodsan frodsan update concerned tests 411e499
Commits on Dec 19, 2012
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8552 from frodsan/concerned_tests
Fix railties tests related to the addition of app/[models|controllers]/concerns, and improve changelog.
88e9157
@yahonda yahonda Address test_binary_data_is_not_logged with Oracle database
The number of sql statement logged depends on each database adapter
implementation.
Also, this test does not depends on how many sql statement executed.
2d4b243
@reed reed Remove obfuscation support from mail_to helper
Removes support for :encode, :replace_at, and :replace_dot
options from the mail_to helper. Support for these options
has been extracted to the 'actionview-encoded_mail_to' gem.
cf9d945
@dhh dhh Merge pull request #8523 from reednj77/remove-mail-to-encoding
Remove obfuscation support from mail_to helper
153f0cb
@senny senny Keep index names when using with sqlite3 d01f913
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8554 from yahonda/binary_count_oracle
Address test_binary_data_is_not_logged with Oracle database
b204830
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8522 from senny/3489_index_names_on_copy
Leep index names when using `alter_table` with sqlite3. Closes #3489
e36f9ef
@carlosantoniodasilva carlosantoniodasilva Revert "Add test to deprecation of Path#children"
This reverts commit 29b1dc2.

Conflicts:
	railties/test/application/paths_test.rb

Reason: since 7f96e43 was reverted,
Path#children is no longer deprecated.
ebef8e9
@mshytikov mshytikov attempt to fix slow runner name method 5c33542
@carlosantoniodasilva carlosantoniodasilva Move changelog entry to the top [ci skip] 939ff86
@josevalim josevalim Merge pull request #8559 from mshytikov/runner_method_is_slow_with_th…
…read_safe

Attempt to fix slow runner name method
b225693
@u16suzu u16suzu Fix: documentation for String#humanize f12d09f
@pixeltrix pixeltrix Integrate Journey into Action Dispatch
Move the Journey code underneath the ActionDispatch namespace so
that we don't pollute the global namespace with names that may
be used for models.

Fixes rails/journey#49.
56fee39
@pixeltrix pixeltrix Remove obsolete Hash extension needed for Ruby 1.8.x support
[ci skip]
dc0542f
@pixeltrix pixeltrix Remove the actual extension file as well [ci skip] f0129da
@frodsan frodsan remove code for Ruby 1.8.x support a1cffa6
Commits on Dec 20, 2012
@frodsan frodsan :nodoc: Journey because is not part of the public API [ci skip] a36ae63
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8565 from frodsan/wed_code_journey
nodoc Journey and remove unneeded Ruby <1.9 validation
dd4822c
@carlosantoniodasilva carlosantoniodasilva Improve AMo changelog example to not rely on AR [ci skip] 05b80a1
@carlosantoniodasilva carlosantoniodasilva Fix Action Mailer changelog indenation to match other changelogs
Also some minor improvements to other changelogs. [ci skip]
42b555d
@hsbt hsbt change spy of after invoked controller action. because ruby-2.0.0 wan…
…ed unused variables
4f0f1b5
@limitingfactor limitingfactor Remove Reference to Ruby 1.8.7 9f42f73
@dmitriy-kiriyenko dmitriy-kiriyenko Prevent callback from being set twice.
When you add one callack in two separate `set_callback` calls - it is
only called once.

When you do it in one `set_callback` call - it is called twice.

This violates the principle of least astonishment for me. Duplicating
callback is usually an error. There is a correct and obvious way to do
anything without this "feature".

If you want to do

    before_save :clear_balance, :calculate_tax, :clear_balance

or whatever, you should better do

    before_save :carefully_calculate_tax

    def carefully_calculate_tax
      clear_balance
      calculate_tax
      clear_balance
    end

And this even opens gates for some advanced refactorings, unlike the
first approach.

My assumptions are:

- Principle of least astonishment is violated, when callbacks are either
  prevented from duplication, or not.
- Duplicating callbacks is usually an error. When it is intentional -
  it's a smell of a bad design and can be approached without abusing
  this "feature".

My suggestion is: do not allow duplicating callbacks in one callback
call, like it is not allowed in separate callbacks call.
4a9644a
@kei-s kei-s Fix documentation style 4c41e87
@guilleiguaran guilleiguaran Fix CHANGELOG entry about scope change
I missed attribution on this :flushed:
a8ad694
@kei-s kei-s Fix incorrect adjustment 4c41e87 e1f8ec5
@frodsan frodsan update AD::Journey to follow Rails coding conventions eb493f5
@rafaelfranca rafaelfranca Merge pull request #8567 from frodsan/update_coding_conventions_journey
update AD::Journey to follow Rails coding conventions
3aa327f
@rafaelfranca rafaelfranca Merge pull request #8560 from u16suzu/master
Fix document for String#humanize

Conflicts:
	activesupport/lib/active_support/core_ext/string/inflections.rb
4eefa1e
@carlosantoniodasilva carlosantoniodasilva Fix indentation issuing warning 9e7bcaa
Commits on Dec 21, 2012
@carlosantoniodasilva carlosantoniodasilva Fix doc pointing to non existent logger class [ci skip] c7d7e7f
@rafaelfranca rafaelfranca Wrap table creation in a transaction.
This will make the tests pass when the intrange datatype is not present
aefcd34
@vijaydev vijaydev Revert "Fix incorrect adjustment 4c41e87"
This reverts commit e1f8ec5.

Reason: seems bad styling

[ci skip]
6fee8f3
@vijaydev vijaydev copy edits in assets guide [ci skip] 4a8bdab
@rafaelfranca rafaelfranca Serialized attribute can be serialized in an integer column
Fix #8575
f2e0925
@vijaydev vijaydev Merge branch 'master' of github.com:lifo/docrails e0176bf
@dhh dhh Add ActiveSupport::Logger#silence that works the same as the old Logg…
…er#silence extension
f914454
@dhh dhh Make sure that ActiveSupport::Logger includes the Logger extensions f…
…rom core_ext/logger
d00f568
@dhh dhh Revert "Make sure that ActiveSupport::Logger includes the Logger exte…
…nsions from core_ext/logger" (some confusion over deprecation)

This reverts commit d00f568.
95f5f81
@marcandre marcandre Simplify change_table and avoid duplicated logic b045804
@marcandre marcandre Simple replacement of variable name for consistency 29ed612
@marcandre marcandre Split ridiculously long line 740dbf8
@marcandre marcandre Allow reverting of migration commands with Migration#revert [#8267] d327c18
@marcandre marcandre Extract exec_migration [#8267] 24653c9
@marcandre marcandre Allow revert of whole migration [#8267] 65e154f
@marcandre marcandre Add Migration#reversible for reversible data operations [#8267] 99770e4
@marcandre marcandre Add drop_join_table [#8267] bd155d2
@marcandre marcandre Make drop_table reversible [#8267] af871a0
@marcandre marcandre Differentiate between remove_column and remove_columns. Make remove_c…
…olumn reversible.

[#8267]
e28ddea
@marcandre marcandre Make remove_index reversible [#8267] 3132324
@marcandre marcandre Factorize methods that are easily reversible [#8267] 7204d3c
@marcandre marcandre Migration generators use `change` even for destructive methods [#8267] aedcd68
@marcandre marcandre Make change_table reversible when possible [#8267] e43e8e2
@marcandre marcandre Make execute, change_column and remove_columns methods actually irrev…
…ersible

[#8267]
06c7ba8
@marcandre marcandre Update Migration and 4.0 Release Guides, Changelogs [#8267] a81845f
@rafaelfranca rafaelfranca Fix broken test for postgresql
For some reason postgresql doesn't pass an integer value to load.

cc @tenderlove
b37b6b7
@rafaelfranca rafaelfranca BufferedLogger is deprecated too. 48b40ec
@garysweaver garysweaver Updated security guide with information about secret_token.rb and to …
…suggest securing sensitive files like database.yml and secret_token.rb
d2b1584
@guilleiguaran guilleiguaran Merge pull request #8581 from garysweaver/security_guide_update
Update security guide
8ee1c26
@rafaelfranca rafaelfranca Remove ActiveModel::Errors#add_on_present method.
We don't need to define a new method in ActiveMode::Errors for each
validatior.

See
rails@d72a07f#commitcomment-2325333
b437053
@rafaelfranca rafaelfranca Use :present as key for the absence validatior message ac6941f
@rafaelfranca rafaelfranca Remove CHANGELOG entry for ActiveModel::Errors#add_on_present bda1937
@rafaelfranca rafaelfranca Merge pull request #7376 from dmitriy-kiriyenko/fix-double-callback-i…
…n-same-statement

Prevent callback from being set twice.

Conflicts:
	activesupport/CHANGELOG.md
ecc7751
@garysweaver garysweaver Updated security guide to reference secret_key_base instead of secret…
…_token, with a little information about the change from CookieStore to EncryptedCookieStore.
e176580
@guilleiguaran guilleiguaran Merge pull request #8584 from garysweaver/security_guide_update
Updated security guide to reference secret_key_base instead of secret_token
59ea907
@tenderlove tenderlove Merge pull request #8267 from marcandre/reversible_drop_table_etc
Reversible commands
68e91da
@carlosantoniodasilva carlosantoniodasilva Fix calling quote column name in interpolated string 2976282
@carlosantoniodasilva carlosantoniodasilva Remove duplicated methods in command recorder and duplicated test name 4da76d7
@alindeman alindeman Revert "Make sure that RAILS_ENV is set when accessing Rails.env"
This reverts commit b3125c8.

* It is not desirable to set `ENV['RAILS_ENV']`; otherwise, it will leak
  through to rake tasks such as `rake test` or `rake spec`. See #7175
  for more details.
33b3fa6
@alindeman alindeman Correctly shows RAILS_ENV=development even when ENV['RAILS_ENV'] is n…
…ot set (e.g., in Pow)

* Fixes #8025
6b692ee
@steveklabnik steveklabnik Merge pull request #7312 from krainboltgreene/http-token-parser-bug
Http token parser bug
625699a
@rafaelfranca rafaelfranca Merge pull request #8574 from alindeman/rails_env
Correctly shows RAILS_ENV=development even when ENV['RAILS_ENV'] is not set (e.g., in Pow)
bc8d2f6
Steve Klabnik + Katrina Owen Refactor Hash.from_xml.
Three basic refactors in this PR:

* We extracted the logic into a method object. We now don't define a tone of extraneous methods on Hash, even if they were private.
* Extracted blocks of the case statement into methods that do the work. This makes the logic more clear.
* Extracted complicated if clauses into their own query methods. They often have two or three terms, this makes it much easier to see what they _do_.

We took care not to refactor too much as to not break anything, and put comments where we suspect tests are missing.

We think ActiveSupport::XMLMini might be a good candidate to move to a plugin in the future.
b02ebe7
@steveklabnik steveklabnik Merge pull request #8471 from kytrinyx/refactor-xml-to-hash
WIP Refactor xml conversion to hash
10c0a3b
Commits on Dec 22, 2012
@jeremy jeremy Move background jobs to the 'jobs' branch until fully baked. Not ship…
…ping with Rails 4.0.
f9da785
@balexand balexand Digestor explicit dependency should not contain trailing whitespace 749a745
@rafaelfranca rafaelfranca Merge pull request #8586 from balexand/cache_digests_regex
Digestor explicit dependency should not contain trailing whitespace
8a39d83
@acapilleri acapilleri return Mime::NullType if format is unknown
If a request has an unknown format, the methods html?, xml?, json? ...etc
not raise an Exception.

This patch add a class Mime::NullType, that is returned when  request.format is unknown
and it responds false to the methods that ends with '?' and true to 'nil?'.

It refers to #7837, this issue is considered a improvement not a bug.
c2267db
@guilleiguaran guilleiguaran Merge pull request #8085 from acapilleri/format_never_nil
if format is unknown NullMimeTypeObject is returned
cba0588
@wycats wycats Install binstubs by default f34c27a
@wycats wycats Detect rbenv and update the shebang 7173c4f
@wycats wycats Add --no-html to scaffold generator cb025f8
@wycats wycats Forgot to check in railties fixture for binstubs a562f9f
@josevalim josevalim Ignore /bin on new apps 35c554f
@fxn fxn adds kindlerb to the :doc bundle group for guides generation 7b5d466
Commits on Dec 23, 2012
@marcandre marcandre Fixes for PR [#8267]
* Fix Migration#reversible by not using `transaction`.

* Adapt mysql adapter to updated api for remove_column

* Update test after aedcd68
a4932d6
@guilleiguaran guilleiguaran Fix syntax error in controller template e738acd
@wycats wycats Fix spacing regression in scaffold generator a4d21f7
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8588 from marcandre/fix_reversible
Fix Migration#reversible by not using `transaction`.
7ab469c
@rafaelfranca rafaelfranca Remove warning of intance variable not initialized 7f7c09c
Commits on Dec 24, 2012
@shime shime remove duplication from Rails::Application docs 2e02752
@rafaelfranca rafaelfranca Merge pull request #8593 from shime/master
another little documentation fix
a1a4957
@rafaelfranca rafaelfranca Explicit options should have precedence over railsrc on the `rails new`
command

Closes #8545
33e52d3
@amatsuda amatsuda we're not supporting SQLite 2 a2ce1de
@guilleiguaran guilleiguaran Merge pull request #8594 from amatsuda/rm_sqlite2
I don't think we're supporting SQLite 2
c80fcce
@amatsuda amatsuda "warning: ambiguous first argument; put parentheses or even spaces" e8cf06e
@rafaelfranca rafaelfranca Merge pull request #8595 from amatsuda/regex_warning
"warning: ambiguous first argument; put parentheses or even spaces"
0a752e8
@sanemat sanemat Add rake default to description 0d8ca81
@sanemat sanemat Add rake test description a3309ca
Ace Suares reminder to run bundle after setting up rails-dev-box 41381c1
@amatsuda amatsuda chmod -x from non-script files 08cf17d
@rafaelfranca rafaelfranca Merge pull request #8601 from amatsuda/chmod_x
chmod -x from non-script files
ef5d857
@NARKOZ NARKOZ fetch highlighter option only when needed 513331d
@fxn fxn silences "possibly useless use of :: in void context" warnings
The AS utility silence_warnings does not really silence this
one, because it is issued at parse-time. It seemed to in
some places because the constant was the only expression in
the block and therefore it was its return value, that could
potentially be used by silence_warnings are return value of
the yield call.

To bypass the warning we assign to a variable. The chosen
variable is "_" because it is special-cased in parse.c not
to issue an "assigned but unused variable" warning in turn.
26c024e
@zoltankiss zoltankiss minor grammar fix c651cc9
@guilleiguaran guilleiguaran Merge pull request #8604 from zoltankiss/minor_fixes
minor grammar fix
0e4fb15
Commits on Dec 25, 2012
@guilleiguaran guilleiguaran Merge pull request #8592 from rafaelfranca/warning_fix
Remove warning of intance variable not initialized
501175e
@senny senny ActiveSupport::BufferedLogger can be subclassed 433ebbd
@rafaelfranca rafaelfranca Merge pull request #8607 from senny/8576_cant_inherit_from_deprecated…
…_buffered_logger

ActiveSupport::BufferedLogger can be subclassed
95fa0e6
@senny senny deprecation warning when BufferedLogger is instantiated 8787c6e
@senny senny replace AS::BufferedLogger doc mentions with AS::Logger 6c8a48e
@guilleiguaran guilleiguaran Merge pull request #8609 from senny/buffered_logger_documentation
replace AS::BufferedLogger doc mentions with AS::Logger
ea6cddd
@rafaelfranca rafaelfranca Merge pull request #8608 from senny/8576_cant_inherit_from_deprecated…
…_buffered_logger

deprecation warning when BufferedLogger is instantiated
227d4e9
Commits on Dec 26, 2012
@paukul paukul validate :on option on after_commit and after_rollback callbacks 5a3dc80
@dhh dhh Revert "Ignore /bin on new apps" -- given the move to default binstub…
…s, we want you to check those in!

This reverts commit 35c554f.
61b91c4
@shime shime more descriptive return parameters 7731fd8
@rafaelfranca rafaelfranca Merge pull request #8600 from shime/patch-1
more descriptive return parameters
8fe1dfd
@rafaelfranca rafaelfranca We need to check explictly that env['action_dispatch.show_exceptions']
is false.

If it is nil we can't raise the exception
84d38f6
@rafaelfranca rafaelfranca Merge pull request #5100 from paukul/validate_on_condition_on_transac…
…tion_callbacks

Validate :on option on after_commit and after_rollback callbacks
e72790c
@senny senny quote column names in generated fixture files edae477
@rafaelfranca rafaelfranca Fix CHANGELOG style [ci skip] 5d80da8
@rafaelfranca rafaelfranca Merge pull request #8616 from senny/8612_respect_yaml_keywords
quote column names in generated fixture files
d792737
@rafaelfranca rafaelfranca Consistent use of single and double quotes 899cae2
@steveklabnik steveklabnik Note about migration timestamps.
We should mention that the ordering matters with regards
to timestamps, and not imply that it's just for uniqueness
purposes.

Closes #8610.
d9ce4fa
@ColinDKelley ColinDKelley Tests and fix for validates_presence of :allow_nil, :allow_blank
Conflicts:
	activemodel/lib/active_model/errors.rb
d4c30a0
@rafaelfranca rafaelfranca Revert the change at ActiveModel::Errors#add_on_blank and fix in the
right place.

The EachValidator#validate already handle :allow_blank and :allow_nil,
correctly.

Closes #8622.

Fix #8621.
78fd14c
@spastorino spastorino Merge pull request #8598 from NARKOZ/refactor-highlight
refactor highlight method: return fast if text or phrases are blank
14a61bb
@rafaelfranca rafaelfranca Add CHANGELOG entry for #8622 9647d4b
@rafaelfranca rafaelfranca This change doesn't need a CHANGELOG entry.
[ci skip]
b05819f
Commits on Dec 27, 2012
@ColinDKelley ColinDKelley removed TIP: :allow_nil/:allow_blank is ignored by the presence valid…
…ator

These tips were documenting an inconsistency issue rails#8621. That issue is resolved by rails#8622.
52691c3
@rafaelfranca rafaelfranca Fix collection_radio_buttons with the option `:checked` with value of
`false`
ceedec7
@rafaelfranca rafaelfranca Extract the component rendering of collection_radio_buttons and
collection_check_boxes to a private method.

It will make easier to extend.

Example:

    class CollectionRadioButtons < ActionView::Helpers::Tags::CollectionRadioButtons
      include CollectionExtensions

      def render
        wrap_rendered_collection(super, @options)
      end

      private

        def render_component(builder)
          builder.radio_button + builder.label(:class => "collection_radio_buttons")
        end
    end
42d9b48
@jeremy jeremy Make test logs easier to read.
Tagging every message in tests makes the logs really wide. It's great
for grepping, but annoying to open in an editor or a narrow terminal.
Try out a different approach: spit out a heading before each test.
b821094
@schneems schneems Ruby 1.9 style hash in Route Inspector d5277b8
@rafaelfranca rafaelfranca Merge pull request #8627 from schneems/schneems/routes-1-9
Ruby 1.9 style hash in Route Inspector
2283a1d
@senny senny rewrite order dependent test case. #8185
As reported (rails#8185 (comment))
this test relied on the order a hash was serialized. Comparing the parsed
hash makes the test no longer order dependent.
e68505a
@freegenie freegenie Fixed couple of typos e63b752
@rafaelfranca rafaelfranca Merge pull request #8634 from senny/rewrite_order_dependent_test_case
rewrite order dependent test case
88a6883
@jeremy jeremy Consistent punctuation for @jaroslawr :bowtie: 6b18a79
Commits on Dec 28, 2012
@jeremy jeremy Introduce assert_not to replace 'assert !foo' f75addd
@arunagw arunagw Remove 'assigned but unused variable' warning f71aa35
@steveklabnik steveklabnik Merge pull request #8641 from arunagw/warning_removed_unused_var
Remove 'assigned but unused variable' warning
90397de
@vijaydev vijaydev Revert "reminder to run bundle after setting up rails-dev-box"
This reverts commit 41381c1.

Reason: This doesn't quite fit the flow where it's added. Let's add this
someplace else if it's explicitly required.

[ci skip]
8dd2c71
@vijaydev vijaydev Revert "Add rake default to description"
This reverts commit 0d8ca81.

Reason: docrails isn't the place to do this. Also, I feel this is
not really required.

[ci skip]
09a347f
@vijaydev vijaydev Revert "Add rake test description"
This reverts commit a3309ca.

Reason: docrails isn't the place to do this.

[ci skip]
896a049
@vijaydev vijaydev Merge branch 'master' of github.com:lifo/docrails 427544e
@jeremy jeremy Revert "Detect rbenv and update the shebang"
This reverts commit 7173c4f.
This reverts commit a562f9f.
a79300a
@jeremy jeremy Revert "Install binstubs by default"
This reverts commit f34c27a.

We'll be taking a different tack on this with new `bundle binstubs <gem>` support.
1e9d6e7
@senny senny work off FIXME comments in AR rename_column_test.rb
There were a couple of tests, which had FIXME comments in palce of
assertions. I replaced these FIXME comments with actual assertions to
get more feedback from our test suite.
d1f2155
@rafaelfranca rafaelfranca Merge pull request #8636 from senny/work_off_fixme_in_rename_column_test
work off FIXME in rename_column_test
70e3ee3
@acapilleri acapilleri small refactoring, added blob_or_text_colum? in AbstractMysqlAdapter 6415d3a
@rafaelfranca rafaelfranca Merge pull request #8644 from acapilleri/abstract_mysql
small refactoring, added blob_or_text_colum? in AbstractMysqlAdapter
ac65949
Commits on Dec 29, 2012
@tenderlove tenderlove fix PG typecasting errors 54a6518
@jeremy jeremy Test that assert_not returns true. Use assert_raises instead of doing…
… begin/rescue/else.
8a130ec
@tenderlove tenderlove mysql does not return alias names, so fall back 8faf2b3
@tenderlove tenderlove fix time typcasting on group counts in PG 160af90
@tenderlove tenderlove add missing require and fixtures 1d38c82
@codeodor codeodor Fix up/down column change example code formatting 0b79a93
@guilleiguaran guilleiguaran Merge pull request #8650 from codeodor/patch-1
Fix up/down column change example code formatting
7b34c5c
@nishantmodak nishantmodak Update documentation for yml usage 95343f6
@spastorino spastorino Rails 4.0 is going to depend on Rack 1.5.x so let's test against Rack…
… master
fba97c9
@vijaydev vijaydev Merge pull request #8647 from nishantmodak/patch-2
Update documentation for yml usage
2e92a23
Commits on Dec 30, 2012
@arunagw arunagw warning removed: shadowing outer local variable 92ab7ac
@guilleiguaran guilleiguaran Merge pull request #8656 from arunagw/warning_removed_shadowing_var
warning removed: shadowing outer local variable
257b3f6
@tjouan tjouan Fix missing ending newline in db structure dump:
  When dumping database structure with `rake db:structure:dump` and
using migrations, the resulting file will not end with a newline char.
Although it's not mandatory, it breaks a lot of simple use cases with
programs like cat, more, grep, etc.

  This changes use `puts' instead of `<<' to append migration versions
data to the dump and also split the line where this is happening as it
was a bit long.
494cfc3
@spastorino spastorino Improve secret_token deprecation message 219e831
@rafaelfranca rafaelfranca Merge pull request #8651 from tjouan/activerecord-structure_dump-endi…
…ng_nl

Fix missing ending newline in db structure dump:
1202170
@spastorino spastorino Point to guides.rubyonrails.org instead of edgeguides.rubyonrails.org 3755a49
@guilleiguaran guilleiguaran Revert "Rails 4.0 is going to depend on Rack 1.5.x so let's test agai…
…nst Rack master"

This reverts commit fba97c9.
1304298
Commits on Dec 31, 2012
@spastorino spastorino Merge pull request #8546 from hsbt/fix-testcase-strict-warning
fix testcase: ruby-2.0.0 warned unused variables
5e80b25
@spastorino spastorino Define [], []=, permanent, signed and encrypted as the only allowed m…
…ethods for the non Raw Cookie classes
2b773e1
@senny senny charset should not be appended for `head` responses
      1) Failure:
    test_head_created_with_image_png_content_type(RenderTest) [test/controller/render_test.rb:1238]:
    Expected: "image/png"
      Actual: "image/png; charset=utf-8"
b8c2f3c
@spastorino spastorino Merge pull request #8662 from senny/8661_should_not_append_charset_if…
…_already_present

Charset should not be appended to image/* type
5e51074
@jiripospisil jiripospisil Fix usage of lambda as a Rack endpoint
The response body needs to respond_to? :each.
dbacb95
@rafaelfranca rafaelfranca Revert "minitest provides "it" and "describe""
This reverts commit 22bc12e.

REASON: We will remove the MiniTest::Spec from Rails and we need these
methods again

Conflicts:
	activesupport/lib/active_support/test_case.rb
d58d71f
@rafaelfranca rafaelfranca Inherit from MiniTest::Unit::TestCase instead of MiniTest::Spec eb4930e
@rafaelfranca rafaelfranca Add active_support/testing/autorun
minitest/autorun load minitest/spec polluting the global namespace with
the DSL that we don't want on Rails
5da4d51
@rafaelfranca rafaelfranca Remove unneeded tests
These tests are needed only if we are using MiniTest::Spec
d4c94ac
@rafaelfranca rafaelfranca Do not use the same tests description 6c0013f
@rafaelfranca rafaelfranca Alias refute methods to assert_not and perfer assert_not on tests 5294ad8
@rafaelfranca rafaelfranca Add note on the contributing guide to not use the refute methods cf4afc4
@rafaelfranca rafaelfranca Merge branch 'minitest_cleanup' b22c527
@spastorino spastorino Merge pull request #8666 from mekishizufu/fix_lambdas
Fix usage of lambda as a Rack endpoint
cf2dcf4
@rafaelfranca rafaelfranca Do not install debugger in the pathlevel 362 9c18b6a
@rafaelfranca rafaelfranca Use ActiveSupport::TestCase in the journey tests dc8091b
@acapilleri acapilleri refatctoring of some code repetition in spawn_methods 1564b08
@rafaelfranca rafaelfranca Revert "Do not install debugger in the pathlevel 362"
This reverts commit 9c18b6a.
73a6a71
@rafaelfranca rafaelfranca Merge pull request #8664 from acapilleri/spawn_method
refatctoring of some code repetition in spawn_methods
90c8972
@rafaelfranca rafaelfranca Only call MiniTest.autorun if the dependecy is present e6e3a64