Commit Graph

33716 Commits

Author SHA1 Message Date
burningTyger
46100f0ccb make comments fit the comment boxes (mostly) in API doc guides 2012-11-10 22:18:18 +01:00
AvnerCohen
8553b7ac2f 1.9 hash syntax in activesupport 2012-11-10 22:15:13 +02:00
AvnerCohen
890da5149d 1.9 Syntax related changes 2012-11-10 17:16:21 +02:00
Will Gray
dcf401e3bc Update guides/source/rails_application_templates.md
Add `#environment`
2012-11-09 15:10:39 -06:00
Will Gray
407e7d499c Update guides/source/rails_application_templates.md
Update function signatures for `#gem` and `#generate`.
2012-11-09 15:09:50 -06:00
Cesar Carruitero
d89b03a7c3 update syntax and add note about prompt use of HttpHelpers [ci-skip] 2012-11-09 11:40:26 -05:00
Cesar Carruitero
477cf3151a correct link syntax [ci-skip] 2012-11-09 10:30:10 -05:00
Cesar Carruitero
0500becd3f change rdoc syntax for adecuate render [ci-skip] 2012-11-09 10:21:34 -05:00
Steve Klabnik
d2a0781b03 Further explain the CDN and caching situation. 2012-11-09 15:19:40 +01:00
Steve Klabnik
e85cb2d3bb Add note about asset pipeline and CDNs.
Fixes #2468.
2012-11-09 15:13:18 +01:00
Steve Klabnik
4d61d1f8f5 Fix default cache store documentation.
It's actually the FileStore.

Fixes #8130.
2012-11-09 14:52:56 +01:00
Cesar Carruitero
3738ef292a correct double quotes for interpolation in routing guide [ci_skip] 2012-11-08 17:16:57 -05:00
Cesar Carruitero
5fe385ba93 change match to get and add single quotes in routing/redirection [ci-skip] 2012-11-08 17:16:57 -05:00
Malcolm Locke
6eb4271d91 Action mailer can take an array for template_dir 2012-11-09 10:21:03 +13:00
AvnerCohen
3c580182ff 1.9 hash syntax changes 2012-11-08 23:16:54 +02:00
Cesar Carruitero
c04abbaa63 fix bugs in rails_on_rack [ci-skip] 2012-11-08 16:04:39 -05:00
Gaurish Sharma
e3e4fa1f65 make syntax of select.map(&:field) same as pluck
The shortcut ampersand syntax of `select.map(&:field)` is same thing as `.plunk(:field)`. document that
2012-11-08 19:14:35 +05:30
AvnerCohen
8659212df2 Actionmailer to 1.9 hash syntax 2012-11-08 09:48:11 +02:00
Cesar Carruitero
01c7a1e702 update syntax in routing guide [ci-skip] 2012-11-08 00:36:50 -05:00
AvnerCohen
08d3e534ab Hash Syntax to 1.9 converison 2012-11-07 16:50:10 +02:00
Carlos Antonio da Silva
9ef88380af Revert "fix white spaces"
This reverts commit 223ed2b4832d63853b61ccb8e9ff82fcd835e61f.

Reverting since rake routes right align named route. See some discussion in
223ed2b483 (commitcomment-2104595)
2012-11-05 19:49:17 -02:00
Cesar Carruitero
223ed2b483 fix white spaces 2012-11-05 15:28:58 -05:00
comptrol
ebc18cf291 Fixed the wrong terminology usage in 2.2.2 2012-11-03 15:32:23 +02:00
Vijay Dev
3b0bb08699 Merge branch 'master' of github.com:lifo/docrails
Conflicts:
	actionpack/lib/action_controller/metal/mime_responds.rb
	activerecord/lib/active_record/attribute_methods.rb
	guides/source/working_with_javascript_in_rails.md
2012-11-03 01:56:16 +05:30
Rafael Mendonça França
974467d70d Add test to avoid regression of 1bfc5b4 2012-11-02 18:16:27 -02:00
Vijay Dev
ee917493e4 copy edits [ci skip] 2012-11-03 01:41:44 +05:30
Vijay Dev
1c3bdfcda4 Revert "Updated activerecord test comments to new hash syntax"
This reverts commit 3b89052014c2bf3b8fbbcfb93f657a17dd7e7ca3.

Reason: changes made to a test, albeit in commented lines - non-uniform
change.

[ci skip]
2012-11-03 01:27:14 +05:30
Vijay Dev
8ffb0dacf9 Revert "dont encourage AC::Parameters#permit_all_parameters usage [ci skip]"
This reverts commit cd17ee5598411728747011566abf6779166be9d3.

Reason: Let's note that this is discouraged, not remove the docs

[ci skip]
2012-11-03 01:16:57 +05:30
Rafael Mendonça França
1bfc5b4068 Revert "Merge pull request #7668 from Draiken/fix_issue_6497"
This reverts commit f4ad0ebe7a6b17658bddfeb996e3c34835b75623, reversing
changes made to 8b2cbb3a832101f0e672ee309beca0f8c555b292.

Conflicts:
	actionpack/CHANGELOG.md

REASON: This added introduced a bug when you have a shorthand route
inside a nested namespace.

See
281367eb77
2012-11-02 14:49:12 -02:00
Rafael Mendonça França
e34d856b8d Merge pull request #8097 from steveklabnik/issue_8095
Fixed mapping of Solomon Islands.
2012-11-01 18:12:47 -07:00
Steve Klabnik
642e1af6f1 Fixed timezone mapping of Solomon Islands.
Fixes #8095.

For reference, here is the discussion about the mapping being
incorrect:
http://rubyforge.org/pipermail/tzinfo-users/2012-November/000114.html
2012-11-01 18:10:48 -07:00
Santiago Pastorino
2e20a7d9f7 Merge pull request #8019 from lest/patch-1
memoize calculated ip without additional variable
2012-11-01 13:03:08 -07:00
Sergey Nartimov
43aa2d308c memoize calculated ip without additional variable
There is no need in additional `@calculated_ip` instance variable.
2012-11-01 22:29:21 +03:00
Carlos Antonio da Silva
694334c37a Fix issue with collection associations and first(n)/last(n)
When calling first(n) or last(n) in a collection, Active Record was
improperly trying to set the inverse of instance in case that option
existed. This change was introduced by
fdf4eae506fa9895e831f569bed3c4aa6a999a22.

In such cases we don't need to do that "manually", since the way
collection will be loaded will already handle that, so we just skip
setting the inverse association when any argument is given to
first(n)/last(n).

The test included ensures that these scenarios will have the inverse of
instance set properly.

Fixes #8087, Closes #8094.

Squashed cherry-pick from d37d40b and c368b66.

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/associations/collection_association.rb
2012-11-01 14:37:12 -02:00
kennyj
2c4faaaedd This is comment for singular association. 2012-11-02 01:34:29 +09:00
Carlos Antonio da Silva
69cebae3b2 Merge pull request #8093 from nikitug/keep_app_x_ua_compatible
Fix #8086 (BestStandardsSupport rewrites app X-UA-Compatible header)
2012-11-01 04:42:55 -07:00
Nikita Afanasenko
d8c1404107 Fix #8086 (BestStandardsSupport rewrites app X-UA-Compatible header, now appends).
Now `BestStandardsSupport` middleware appends it's `X-UA-Compatible` value to app's value.
Also test for `BestStandardsSupport` middleware added.
2012-11-01 15:15:46 +04:00
Carlos Antonio da Silva
b31ea0c240 Add test to ensure data attributes are properly escaped with tag helpers
Closes #8091
2012-11-01 08:49:47 -02:00
Santiago Pastorino
c7e233ce47 Merge pull request #8092 from arunagw/warning_removed_unused_var
Small change to remove warning unused variable.
2012-10-31 22:17:39 -07:00
Arun Agrawal
d065938663 Small change to remove warning unused variable. 2012-11-01 10:25:20 +05:30
Carlos Antonio da Silva
1e89e43f66 Merge pull request #8026 from steveklabnik/issue_8025
Make sure that RAILS_ENV is set when accessing Rails.env
2012-10-31 17:18:45 -07:00
Steve Klabnik
b3125c89f4 Make sure that RAILS_ENV is set when accessing Rails.env
Fixes #8025
2012-10-31 17:05:26 -07:00
AvnerCohen
d20a52930a 1.9 hash syntax changes to docs 2012-10-31 21:19:44 +02:00
David Heinemeier Hansson
d349490371 Revert "Don't allocate new strings in compiled attribute methods"
This reverts commit f1765019ce9b6292f2264b4601dad5daaffe3a89.
2012-10-31 17:04:08 +01:00
David Heinemeier Hansson
750a30b19f No need for the debugger 2012-10-31 16:35:20 +01:00
David Heinemeier Hansson
954c350daf Allow #permit to take its list of permitted parameters as an array 2012-10-31 16:33:54 +01:00
Guillermo Iguaran
4b20cd9c66 Revert "if format is unknown NullMimeTypeObject is returned"
This reverts commit a8560fa361958b33d76e4468eb5c07d82a20196e.
2012-10-31 10:01:39 -05:00
Carlos Antonio da Silva
9fdf606954 Remove extre count, preheat already happens during setup 2012-10-31 12:54:07 -02:00
Carlos Antonio da Silva
92bae4929d Merge pull request #8073 from alexisbernard/fix_find_in_batches_start_option
Fix find_in_batches against string IDs when start option is not specified
2012-10-31 07:49:42 -07:00
Alexis Bernard
a58cafeb3a Fix find_in_batches against string IDs when start option is not specified. 2012-10-31 15:39:24 +01:00