Commit Graph

34695 Commits

Author SHA1 Message Date
Rafael Mendonça França
ceedec7edc Fix collection_radio_buttons with the option :checked with value of
`false`
2012-12-26 23:00:31 -03:00
Rafael Mendonça França
b05819fd28 This change doesn't need a CHANGELOG entry.
[ci skip]
2012-12-26 20:39:32 -03:00
Rafael Mendonça França
9647d4b6f4 Add CHANGELOG entry for #8622 2012-12-26 19:22:38 -03:00
Santiago Pastorino
14a61bba4d Merge pull request #8598 from NARKOZ/refactor-highlight
refactor highlight method: return fast if text or phrases are blank
2012-12-26 14:06:13 -08:00
Rafael Mendonça França
78fd14c8de 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.
2012-12-26 18:55:47 -03:00
Colin Kelley
d4c30a0226 Tests and fix for validates_presence of :allow_nil, :allow_blank
Conflicts:
	activemodel/lib/active_model/errors.rb
2012-12-26 18:19:27 -03:00
Steve Klabnik
d9ce4fa7ac 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.
2012-12-26 15:24:22 -05:00
Rafael Mendonça França
899cae25ec Consistent use of single and double quotes 2012-12-26 12:23:39 -03:00
Rafael Mendonça França
d792737207 Merge pull request #8616 from senny/8612_respect_yaml_keywords
quote column names in generated fixture files
2012-12-26 07:20:46 -08:00
Rafael Mendonça França
5d80da812b Fix CHANGELOG style [ci skip] 2012-12-26 12:19:09 -03:00
Yves Senn
edae4777ad quote column names in generated fixture files 2012-12-26 16:17:47 +01:00
Rafael Mendonça França
e72790c4e7 Merge pull request #5100 from paukul/validate_on_condition_on_transaction_callbacks
Validate :on option on after_commit and after_rollback callbacks
2012-12-26 07:16:56 -08:00
Rafael Mendonça França
84d38f6033 We need to check explictly that env['action_dispatch.show_exceptions']
is false.

If it is nil we can't raise the exception
2012-12-26 12:15:18 -03:00
Rafael Mendonça França
8fe1dfd221 Merge pull request #8600 from shime/patch-1
more descriptive return parameters
2012-12-26 06:41:56 -08:00
Hrvoje Šimić
7731fd86b1 more descriptive return parameters 2012-12-26 14:17:11 +01:00
David Heinemeier Hansson
61b91c4c55 Revert "Ignore /bin on new apps" -- given the move to default binstubs, we want you to check those in!
This reverts commit 35c554f0bf518e1068e79002a462c3deba649e9b.
2012-12-26 13:02:59 +01:00
Pascal Friederich
5a3dc8092d validate :on option on after_commit and after_rollback callbacks 2012-12-26 11:37:37 +01:00
Rafael Mendonça França
227d4e9bdd Merge pull request #8608 from senny/8576_cant_inherit_from_deprecated_buffered_logger
deprecation warning when BufferedLogger is instantiated
2012-12-25 13:55:37 -08:00
Guillermo Iguaran
ea6cddd80d Merge pull request #8609 from senny/buffered_logger_documentation
replace AS::BufferedLogger doc mentions with AS::Logger
2012-12-25 11:48:20 -08:00
Yves Senn
6c8a48e6c6 replace AS::BufferedLogger doc mentions with AS::Logger 2012-12-25 20:39:23 +01:00
Yves Senn
8787c6e0e5 deprecation warning when BufferedLogger is instantiated 2012-12-25 20:21:14 +01:00
Rafael Mendonça França
95fa0e69de Merge pull request #8607 from senny/8576_cant_inherit_from_deprecated_buffered_logger
ActiveSupport::BufferedLogger can be subclassed
2012-12-25 07:00:35 -08:00
Yves Senn
433ebbdc4c ActiveSupport::BufferedLogger can be subclassed 2012-12-25 15:50:35 +01:00
Guillermo Iguaran
501175e3ad Merge pull request #8592 from rafaelfranca/warning_fix
Remove warning of intance variable not initialized
2012-12-24 20:29:52 -08:00
Guillermo Iguaran
0e4fb151ea Merge pull request #8604 from zoltankiss/minor_fixes
minor grammar fix
2012-12-24 13:39:35 -08:00
Zoltan Kiss
c651cc9d50 minor grammar fix 2012-12-24 15:20:05 -06:00
Xavier Noria
26c024e959 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.
2012-12-24 21:16:16 +01:00
Nihad Abbasov
513331d114 fetch highlighter option only when needed 2012-12-24 20:56:32 +04:00
Rafael Mendonça França
ef5d85709d Merge pull request #8601 from amatsuda/chmod_x
chmod -x from non-script files
2012-12-24 07:50:58 -08:00
Akira Matsuda
08cf17d708 chmod -x from non-script files 2012-12-24 23:36:19 +09:00
Rafael Mendonça França
0a752e88c2 Merge pull request #8595 from amatsuda/regex_warning
"warning: ambiguous first argument; put parentheses or even spaces"
2012-12-23 20:07:20 -08:00
Akira Matsuda
e8cf06e1d4 "warning: ambiguous first argument; put parentheses or even spaces" 2012-12-24 13:04:08 +09:00
Guillermo Iguaran
c80fcce91a Merge pull request #8594 from amatsuda/rm_sqlite2
I don't think we're supporting SQLite 2
2012-12-23 19:28:24 -08:00
Akira Matsuda
a2ce1de14e we're not supporting SQLite 2 2012-12-24 12:23:39 +09:00
Rafael Mendonça França
33e52d379e Explicit options should have precedence over railsrc on the rails new
command

Closes #8545
2012-12-24 00:03:13 -03:00
Rafael Mendonça França
a1a4957a63 Merge pull request #8593 from shime/master
another little documentation fix
2012-12-23 17:57:51 -08:00
Hrvoje Šimić
2e02752e8d remove duplication from Rails::Application docs 2012-12-24 02:50:32 +01:00
Rafael Mendonça França
7f7c09c1f3 Remove warning of intance variable not initialized 2012-12-23 20:32:09 -03:00
Carlos Antonio da Silva
7ab469c839 Merge pull request #8588 from marcandre/fix_reversible
Fix Migration#reversible by not using `transaction`.
2012-12-23 08:16:07 -08:00
Yehuda Katz
a4d21f764c Fix spacing regression in scaffold generator 2012-12-22 23:05:53 -08:00
Guillermo Iguaran
e738acd080 Fix syntax error in controller template 2012-12-22 23:46:51 -05:00
Marc-Andre Lafortune
a4932d6a63 Fixes for PR [#8267]
* Fix Migration#reversible by not using `transaction`.

* Adapt mysql adapter to updated api for remove_column

* Update test after aedcd683684d08eaf30623a4b48ce31a31426372
2012-12-22 20:40:42 -05:00
Xavier Noria
7b5d466faf adds kindlerb to the :doc bundle group for guides generation 2012-12-22 22:43:10 +01:00
José Valim
35c554f0bf Ignore /bin on new apps 2012-12-22 21:21:06 +01:00
Yehuda Katz
a562f9fa09 Forgot to check in railties fixture for binstubs 2012-12-22 12:18:35 -08:00
Yehuda Katz
cb025f850c Add --no-html to scaffold generator 2012-12-22 12:18:13 -08:00
Yehuda Katz
7173c4f931 Detect rbenv and update the shebang 2012-12-22 11:13:10 -08:00
Yehuda Katz
f34c27a452 Install binstubs by default 2012-12-22 10:57:50 -08:00
Guillermo Iguaran
cba05887dc Merge pull request #8085 from acapilleri/format_never_nil
if format is unknown NullMimeTypeObject is returned
2012-12-22 00:38:56 -08:00
Angelo Capilleri
c2267db383 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.
2012-12-22 09:18:08 +01:00