Santiago Pastorino
bae190c5a6
Merge pull request #6271 from homakov/patch-5
...
configuration for active_support and JSON Encoding
2012-05-12 08:48:58 -07:00
Xavier Noria
e5b91f2b1d
copy-edits a recent CHANGELOG entry [ci skip]
2012-05-12 17:48:34 +02:00
Vijay Dev
65c3b1287e
update example outputs of some asset helpers
...
Changed /images and /fonts to /assets in the examples of
image_path, image_tag and font_path helpers
[ci skip]
2012-05-12 19:56:57 +05:30
Vijay Dev
b2b815899b
fixes a nodoc which swallowed the documentation for the rest of the methods [ci skip]
2012-05-12 19:41:29 +05:30
Vijay Dev
2c8b4a514c
Merge pull request #6285 from acapilleri/missplelling_error_in_abstract_mysql_adapter
...
missplelling error in abstract_mysql_adapter
2012-05-12 06:46:14 -07:00
Vijay Dev
70237e7dd3
Merge branch 'master' of github.com:lifo/docrails
...
Conflicts:
activesupport/lib/active_support/callbacks.rb
2012-05-12 19:10:49 +05:30
Angelo Capilleri
984bc75fe6
missplelling error in abstract_mysql_adapter
2012-05-12 15:39:40 +02:00
Vijay Dev
f2f6534272
s/wether/whether [ci skip]
2012-05-12 19:08:19 +05:30
José Valim
98355fe100
Merge pull request #6277 from homakov/patch-6
...
Comment for active_support's option in application.rb
2012-05-12 05:45:59 -07:00
José Valim
eab0520e13
Revert "Merge pull request #6142 from spartan-developer/master"
...
This reverts commit 667d0bdd90ef6e6b691f0cc4cf5535b8da69f248, reversing
changes made to 4ae6bab6bb02c9390188a49f9a749400f6a0ac94.
2012-05-12 14:42:35 +02:00
Vijay Dev
84d198b4a0
copy edits [ci skip]
2012-05-12 18:10:08 +05:30
Vijay Dev
f2af26dc81
fix incorrect example [ci skip]
2012-05-12 18:07:26 +05:30
Vijay Dev
d897255f8a
copy editing [ci skip]
2012-05-12 18:07:10 +05:30
Santiago Pastorino
3a59eab5f7
Remove wrong rack/utils dependency from AS
...
Closes #6274
2012-05-12 09:18:39 -03:00
Vijay Dev
905c48eab3
Merge pull request #6281 from acapilleri/mispelling_errors_in_render_text_test
...
mispelling errors in render_text_test.rb
2012-05-12 05:00:52 -07:00
Vijay Dev
9eddb8b0df
Merge pull request #6278 from GRoguelon/master
...
Add commas missing in performance tests
2012-05-12 04:56:13 -07:00
Jon Leighton
6f2aee3c18
Merge pull request #6280 from nashby/private-try
...
Object#try can't call private methods
2012-05-12 04:23:03 -07:00
angelo giovanni capilleri
47570d4f1f
mispelling errors in render_text_test.rb and sqlite_specific_schema
2012-05-12 13:19:28 +02:00
Vasiliy Ermolovich
b8f394f4a3
Object#try can't call private methods
2012-05-12 14:07:21 +03:00
José Valim
667d0bdd90
Merge pull request #6142 from spartan-developer/master
...
refactored extracting :size => 'XxY' into an extract_size! method
2012-05-12 04:03:07 -07:00
Xavier Noria
4ae6bab6bb
Merge pull request #6279 from acapilleri/mispelling_error_in_actionpach_changelog
...
mispelling error in actionpach changelog
2012-05-12 03:59:35 -07:00
angelo giovanni capilleri
39eff2d62d
mispelling error in actionpach changelog
2012-05-12 12:37:16 +02:00
Vasiliy Ermolovich
219342b642
remove docs related to ruby 1.8 from Array#wrap
2012-05-12 13:31:30 +03:00
Geoffrey Roguelon
38b4e7c8b1
Add commas missing in performance tests
2012-05-12 10:36:35 +02:00
Egor Homakov
1d1939056a
Update railties/lib/rails/generators/rails/app/templates/config/application.rb
2012-05-12 10:26:22 +04:00
Francesco Rodriguez
c78c29556e
added examples to Integer#multiple_of?
2012-05-11 23:16:44 -05:00
Francesco Rodriguez
fc6ab69777
removing trailing spaces
2012-05-11 23:06:53 -05:00
Erich Menge
7dba51288f
Better document the difference between #clone and #dup.
...
Add #nodoc to initialize_dup and use :method: to document the #dup method.
Relates to issue #6235
2012-05-11 18:51:01 -05:00
Jon Leighton
2091e5a65e
Remove #=== quirk
...
Makes it consistent with Relation. Can't see a use for this.
2012-05-11 23:44:55 +01:00
Francesco Rodriguez
a0b46b5f1b
added docs to String#to_datetime
2012-05-11 17:30:46 -05:00
Santiago Pastorino
fbf1858ed9
Add test directory to TestTask's libs
2012-05-11 19:25:19 -03:00
Francesco Rodriguez
53cc85fad3
added docs to String#to_date
2012-05-11 17:08:31 -05:00
Santiago Pastorino
36dd1857dc
Remove useless load path modifications
2012-05-11 19:00:35 -03:00
Santiago Pastorino
a00228c1a3
Lazy load I18n
2012-05-11 19:00:25 -03:00
Santiago Pastorino
abd6f4a2b1
Move require to where it's needed
2012-05-11 19:00:18 -03:00
Santiago Pastorino
a6381042fa
Remove ruby/shim
...
require 'action_view' is now much faster
2012-05-11 19:00:11 -03:00
Francesco Rodriguez
7bf6edf819
added examples to String#exclude?
2012-05-11 16:42:23 -05:00
Francesco Rodriguez
ef440bb0c3
remove unnecessary 'examples' noise
2012-05-11 16:21:32 -05:00
Jon Leighton
ecef5a9f22
this stuff can all be handled by Relation
2012-05-11 20:11:04 +01:00
Jon Leighton
be7c6ee56d
extract deprecated code
2012-05-11 20:11:04 +01:00
Jon Leighton
8f50bbee31
set_owner_attributes is covered by the scoping
2012-05-11 20:11:04 +01:00
Jon Leighton
c86a32d745
CollectionProxy < Relation
...
This helps bring the interfaces of CollectionProxy and Relation closer
together, and reduces the delegation backflips we need to perform.
For example, first_or_create is defined thus:
class ActiveRecord::Relation
def first_or_create(...)
first || create(...)
end
end
If CollectionProxy < Relation, then post.comments.first_or_create will
hit the association's #create method which will actually add the new record
to the association, just as post.comments.create would.
With the previous delegation, post.comments.first_or_create expands to
post.comments.scoped.first_or_create, where post.comments.scoped has no
knowledge of the association.
2012-05-11 20:11:04 +01:00
Jon Leighton
a8637cf493
Use respond_to?(:to_ary) rather than is_a?(Enumerable) to detect collection-thing.
2012-05-11 20:11:04 +01:00
Scott Johnson
f915c2899f
Merge pull request #97 from itchy/doc_make_engine_ApplicationController_inherit_from_main_app
...
Update engines guide ApplicationController
2012-05-11 12:10:43 -07:00
Scott Johnson
a0d9b79035
update engines guide to show how to have an engine's ApplicationController inherit from the main application's ApplicationController
2012-05-11 13:48:34 -05:00
Francesco Rodriguez
39c483fec5
fix String#last example
2012-05-11 13:18:00 -05:00
Francesco Rodriguez
53ef85dae8
fix String#last example
2012-05-11 13:16:35 -05:00
Francesco Rodriguez
ed116eda05
added docs to String#last
2012-05-11 13:11:06 -05:00
Francesco Rodriguez
b2e9d33515
improve String#first docs
2012-05-11 12:56:53 -05:00
Francesco Rodriguez
074359dfa8
fix typo in String#first
2012-05-11 12:24:45 -05:00