Commit Graph

29171 Commits

Author SHA1 Message Date
Jens Fahnenbruck
96b72efc00 adds delegetion for eof? to AD::Http::UploadedFile
if you want to read the file you may need to ask if there is something
to read from
2012-03-27 22:53:33 +02:00
Aaron Patterson
e96d04a2e4 attributes are cached by string keys, so to_s to support symbols. fixes #5549 2012-03-27 11:27:51 -07:00
Vijay Dev
b42fbd3ecb Merge branch 'master' of github.com:lifo/docrails 2012-03-27 21:26:37 +05:30
Vijay Dev
ae040ed6d8 minor edits in testing guide [ci skip] 2012-03-27 21:24:21 +05:30
Vijay Dev
e01beb5b3b add missing do [ci skip] 2012-03-27 21:19:56 +05:30
Vijay Dev
286259f2aa Revert "[ci skip] updated bin/rails code in Rails Initialization Process guide"
This reverts commit 7feec40b89ada892ca6f107ada27ceedde505d83.

Reason: The guide had the contents of railties/bin/rails and I don't see
any reason to change it.
2012-03-27 21:08:08 +05:30
Santiago Pastorino
888fcca01b Merge pull request #5499 from arunagw/remove_unused_code
removed unused variables
2012-03-27 08:01:53 -07:00
Piotr Sarnacki
67b2404cf9 If partial is rendered in controller, grab format from template
Previously `rendered_format` was set only based on mime types
passed in Accept header, which was wrong if first type from
Accept was different than rendered partial. The fix is to simply
move setting rendered_format to the place where template
is available and grab format from the template. If it fails
we can fallback to formats passed by Accept header.
2012-03-27 12:14:56 +02:00
José Valim
19901c6c61 Merge pull request #5609 from tjmcewan/master
prevent returning a negative zero from number_with_precision
2012-03-27 03:05:11 -07:00
Arun Agrawal
4cd0b4e7c3 removed unused variables 2012-03-27 15:06:14 +05:30
Tim McEwan
7051a234b7 change number_with_precision to not return negative zeros 2012-03-27 19:46:15 +11:00
Alexey Vakhov
fbccdf9a96 Proc objects for caches_page no need controller object 2012-03-27 11:54:45 +04: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
Lukasz Sarnacki
0c5ca0747f added shallow_prefix option description in documantation
It is in response for confusion in issue #5301
2012-03-27 00:22:28 +02:00
Juanjo Bazán
fc25feb341 Missing generated query for pluck method.
(and changed the use of true for a more database agnostic example).
2012-03-27 00:08:31 +03: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
Dimitri De Frenne
ddab3df8d1 Made it a bit more clear where to run rails/server 2012-03-26 11:28:55 +02:00
Dimitri De Frenne
492e91cc34 Fixed typo in path 2012-03-26 11:28:12 +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