Tim McEwan
7051a234b7
change number_with_precision to not return negative zeros
2012-03-27 19:46:15 +11:00
Xavier Noria
ded74dfd8b
Merge pull request #5582 from chendo/master
...
Remove "needless boolean casting"
2012-03-26 18:14:48 -07:00
Aaron Patterson
bca7770e6c
favor composition over inheritance
2012-03-26 17:56:44 -07:00
Piotr Sarnacki
37c84ed877
Don't ignore non Enumerable values passed to sanitize ( closes #5585 )
...
When someone accidentally passes a string to sanitize like:
sanitize("<span>foo</span>", :tags => "b")
there is no indication that it's the wrong way and span
will not be removed.
2012-03-27 02:26:17 +02:00
Aaron Patterson
4946107925
favor composition over inheritance
2012-03-26 17:25:44 -07:00
Aaron Patterson
41dfc46717
Merge pull request #2621 from icco/master
...
Issue with schema dump
2012-03-26 17:24:48 -07:00
Aaron Patterson
b36f240800
Merge pull request #5601 from carlosantoniodasilva/cookie-store-session-hash
...
Cookie store session hash
2012-03-26 16:24:42 -07:00
Carlos Antonio da Silva
2ceb3fc56a
Remove warning added by my own commit 🔥
...
Commit: 7a0cf2f5294e8bcef547642435636b394340a3e4
2012-03-26 20:16:13 -03:00
Aaron Patterson
281b31b4bb
Merge pull request #5331 from castlerock/remove_unused_require
...
remove unused require from AS/core_ext/class/delegating_att.rb
2012-03-26 16:12:40 -07:00
Aaron Patterson
a2a861fcec
still need to ensure the path is a directory
2012-03-26 16:08:33 -07:00
Aaron Patterson
33da24a8db
eliminating a branch we do not need. thanks @jeremy
2012-03-26 16:07:28 -07:00
Carlos Antonio da Silva
5ad9a8e874
Return the same session data object when setting session id
2012-03-26 20:02:43 -03:00
Aaron Patterson
47db156d42
stop using *args in order to simplify our constructor
2012-03-26 15:58:25 -07:00
Piotr Sarnacki
a2126abc11
Merge pull request #5592 from nashby/fix-issue-5584
...
String#titleize works properly with smart quotes
2012-03-26 15:58:01 -07:00
Aaron Patterson
de9c0ef8ef
Merge pull request #5561 from carlosantoniodasilva/form-builder-block-arg
...
Properly deprecate the block argument in AV FormBuilder
2012-03-26 15:34:22 -07:00
Aaron Patterson
045197f40e
Don't depend on ivars. Thanks @fesplugas
2012-03-26 13:50:50 -07:00
Piotr Sarnacki
ea0789f08d
Merge pull request #5594 from lest/patch-1
...
apply form_for namespace option to date_select
2012-03-26 13:10:05 -07:00
Guten
9637de6b47
ActiveRecord::Coders::YAMLColumn#dump should raise an error
...
closes #2737
Conflicts:
activerecord/lib/active_record/coders/yaml_column.rb
2012-03-26 21:57:39 +02:00
Aaron Patterson
2e8129e87a
Merge pull request #5595 from guilleiguaran/sprockets-rails-1.0.0
...
sprockets-rails 1.0.0 was released, remove git dependency from Gemfile
2012-03-26 12:03:37 -07:00
Guillermo Iguaran
dd74da7afc
sprockets-rails 1.0.0 was released, remove git dependency from Gemfile
2012-03-26 13:49:52 -05:00
Sergey Nartimov
65434a2f25
apply form_for namespace option to date_select
2012-03-26 21:46:30 +03:00
Aaron Patterson
65f4d8019f
no need to freeze things all the time
2012-03-26 11:34:01 -07:00
Aaron Patterson
6289f455ae
test against ruby features in order to fix tests on Ruby 2.0
2012-03-26 11:32:21 -07:00
Aaron Patterson
e8b5c8eaf3
Merge pull request #5593 from lukesarnacki/activemodel_name_composition_over_inheritance
...
ActiveModel::Name does not inherit from string
2012-03-26 11:28:28 -07:00
Vasiliy Ermolovich
633ee64e20
String#titleize works properly with smart quotes, closes #5584
2012-03-26 21:18:25 +03:00
Lukasz Sarnacki
72cbccb5f7
ActiveModel::Name does not inherit from string
2012-03-26 20:15:04 +02:00
José Valim
1d59caa975
Merge pull request #5183 from lest/patch-1
...
use content_tag in button_to helper
2012-03-26 02:14:34 -07:00
José Valim
adb802e629
Merge pull request #5581 from jamie/custom_param_field
...
Allow a defining custom member field on resources
2012-03-26 00:50:46 -07:00
Jack Chen (chendo)
ef64c6ba8c
Remove 'needless boolean casting'.
...
"Predicates in Rails rely on standard Ruby semantics for boolean values
and guarantee no singletons whatsoever." - @fxn
2012-03-26 15:55:16 +11:00
Jamie Macey
3e67e45dc3
Allow a defining custom member field on resources
...
By default, resources routes are created with :resource/:id. A model
defining to_param can make prettier urls by using something more
readable than an integer ID, but since the route picks it up as :id you
wind up with awkward User.find_by_username(params[:id]) calls.
By overriding the key to be used in @request.params you can be more
obvious in your intent.
2012-03-25 21:42:18 -07:00
Xavier Noria
8954ee650f
Merge pull request #5575 from phiggins/remove_conditional_from_statistics_task
...
Remove useless conditional.
2012-03-25 18:26:25 -07:00
Pete Higgins
68926dd5ee
Remove useless conditional.
2012-03-25 18:20:40 -07:00
Xavier Noria
7cc797f177
restores example depicting the use of true or false in regular font
...
There was an example here that mentioned reload_plugins?
but it was deleted. This commit puts another example back.
2012-03-25 20:26:35 +02:00
Piotr Sarnacki
a4bf3045ca
Merge pull request #5566 from lest/patch-3
...
fix HashWithIndifferentAccess.[] method
2012-03-25 04:16:53 -07:00
Jeremy Kemper
64ccb59c9a
Merge pull request #5570 from avakhov/ac-caching-split
...
ActionController caching small String#split optimization
2012-03-24 23:49:43 -07:00
Xavier Noria
3756a3fdfe
Revert "Return an actual boolean from xml_http_request?"
...
Reason: This commit changes code that was committed some year
and a half ago. The original code is an ordinary predicate
that delegates straight to a boolean operator with no further
unnecessaru adorments, as clearly explained in #5329 .
This change also may confuse users who may now believe they can
rely now on singletons, while predicates in Rails rely on
standard Ruby semantics for boolean values and guarantee no
singletons whatsover.
This reverts commit 6349791d5aaf652631b29f1371701fc2985fda83.
2012-03-25 00:22:04 +01:00
Alexey Vakhov
6880489e25
ActionController caching small String#split optimization
2012-03-24 17:10:15 +04:00
Vijay Dev
014498e1d7
Merge branch 'master' of github.com:lifo/docrails
...
Conflicts:
guides/source/ruby_on_rails_guides_guidelines.textile
2012-03-24 17:15:10 +05:30
Vijay Dev
780ab58209
Merge pull request #5569 from arunagw/warning_remove_master
...
removed warning: shadowing outer local variable - exception
2012-03-24 04:25:52 -07:00
Vijay Dev
2fab826db0
spacing fix in guide [ci skip]
2012-03-24 14:23:06 +05:30
Arun Agrawal
ef864c3a22
removed warning: shadowing outer local variable - exception
2012-03-24 10:35:36 +05:30
Aaron Patterson
beb51b4d5f
Merge pull request #5567 from tpope/xhr-boolean
...
Return an actual boolean from xml_http_request?
2012-03-23 17:27:14 -07:00
Tim Pope
6349791d5a
Return an actual boolean from xml_http_request?
2012-03-23 20:19:38 -04:00
Fabián Rodríguez
b99d95d838
[getting started][ci skip] fix link to the code
2012-03-23 18:15:02 -03:00
Sergey Nartimov
2ee28b2bf8
fix HashWithIndifferentAccess.[] method
2012-03-23 23:09:29 +03:00
Aaron Patterson
ea482d366a
oops, forgot to commit the tests! 💣
2012-03-23 11:47:42 -07:00
Aaron Patterson
7422f44364
chdir before globbing so that we don't need to escape directory names.
...
fixes #5521
2012-03-23 11:47:42 -07:00
Aaron Patterson
e944b296a9
Merge pull request #5550 from schneems/schneems/server_env
...
Fix environment support for rails server, and match interface of rails console
2012-03-23 10:36:16 -07:00
José Valim
86cd1b1d46
Merge pull request #5518 from rafaelfranca/minor-refactor
...
Remove code duplication
2012-03-23 09:35:31 -07:00
Piotr Sarnacki
9a26c9035f
Merge pull request #5556 from rafaelfranca/remove-warning
...
use the new scope syntax on the tests to avoid DEPRECATION WARNINGS.
2012-03-23 06:48:42 -07:00