Commit Graph

16818 Commits

Author SHA1 Message Date
Gonçalo Silva
381a30fbba don't set cpu_frequency if RubyProf resolved it 2010-06-17 19:18:52 -07:00
Aaron Patterson
bf6661c5d7 setting the timezone in postgres to whatever ruby thinks the timezone is [#4895 state:resolved]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-06-17 16:49:21 -07:00
Aaron Patterson
5ae7a9d31d when the timezone is nil, a TimeWithZone object should not be constructed. [#4881 state:resolved]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-06-17 14:14:30 -07:00
Santiago Pastorino
84d387bc0f Make text_helpers methods which return valid html to return it as safe and sanitize the input always unless :sanitize => false is set
[#4825 state:committed]

Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
2010-06-17 13:34:10 -05:00
Xavier Noria
12eef93e89 documents how to run an individual test in AR 2010-06-17 17:41:39 +02:00
Andrew White
6db9558416 Add shallow routing option to new router [#3765 status:committed]
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
2010-06-17 09:52:55 -05:00
Santiago Pastorino
7240a960f2 excerpt shoudn't return safe output test added
[#4878]

Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
2010-06-17 09:41:04 -05:00
Wincent Colaiuta
a424808df9 truncate() should not try to produce HTML-safe output
As discussed in Lighthouse ticket #4825 and ticket #4878, the truncate()
method cannot guarantee safe output for all possible inputs/offsets, so
it is best to leave the output unsafe so that it gets escaped when used
in a view.

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
2010-06-17 09:41:04 -05:00
José Valim
69bc8b26a9 Merge branch 'master' of github.com:rails/rails 2010-06-17 13:49:27 +02:00
José Valim
7ba756281a Add a failing test for ticket #4874 2010-06-17 13:48:02 +02:00
Xavier Noria
2aa4e5f3fa pdoc tasks publishe APIs in api.rubyonrails.org 2010-06-16 22:39:13 +02:00
Xavier Noria
01f3f0dbae use RDoc 2.2 to generate the documentation of individual components 2010-06-16 22:30:06 +02:00
Xavier Noria
145fbdff67 removes the documentation group from the Gemfile, thus making RDoc 2.2 required in dev machines
In order to generate the API with that particular version we need to activate the gem
in the Rakefile before rake. Therefore the Rakefile does not honor --without for that
group now. Installing rdoc is no big deal anyway.
2010-06-16 19:28:23 +02:00
Aaron Patterson
8e56085817 use assert_in_delta() for floating point comparisons in tests [#4871 state:resolved]
Signed-off-by: Carl Lerche <carllerche@mac.com>
2010-06-16 10:09:59 -07:00
Xavier Noria
07c6b7a6ad migrates the Jamis template to RDoc 2.x, the root Rakefile requires RDoc 2.2
To understand the changes in horo.rb check rdoc/template.rb in a RDoc 2.x
2010-06-16 04:06:20 +02:00
Xavier Noria
5cd3c2a855 Merge remote branch 'rails/master' 2010-06-14 23:24:41 +02:00
Xavier Noria
f17159b029 edit pass: the names of Rails components have a space, ie, "Active Record", not "ActiveRecord" 2010-06-14 23:22:04 +02:00
rspeicher
b442edbfcc Fix minor typos and inconsistencies, and one minor grammar change 2010-06-14 17:19:15 -04:00
Xavier Noria
94de5b8cb5 edit pass in #define_callbacks rdoc 2010-06-14 22:52:47 +02:00
Neeraj Singh
e4c8bc1b34 adding to the :kind documentation for ActiveSupport callbacks 2010-06-14 16:18:29 -04:00
Neeraj Singh
ed9a183ea4 clearer documentation of how scope applies to ActiveSupport callbacks 2010-06-14 15:48:09 -04:00
Xavier Noria
4a8c8804ff refactors AR::Base#reset_table_name 2010-06-14 18:36:04 +02:00
Thiago Pradi
8d82bef58a Documentation for #quoted_table_name method
Signed-off-by: Xavier Noria <fxn@hashref.com>
2010-06-14 17:32:45 +02:00
Neeraj Singh
f587dec2c9 truncate safe method description changes 2010-06-14 09:12:10 -04:00
Rizwan Reza
e67c28dfe0 Added headings to serializers. 2010-06-14 13:59:55 +04:30
Rizwan Reza
7d7d54fa1f Revised the rest of the files from ActiveModel. 2010-06-14 13:56:51 +04:30
Rizwan Reza
2572af11ce Revised and added headings. 2010-06-14 13:49:01 +04:30
Rizwan Reza
de12b5e616 Revised naming.rb and lint.rb 2010-06-14 13:44:49 +04:30
Rizwan Reza
c5db6450ec Added headings and revised active_model.rb/lint.rb grammatically 2010-06-14 13:43:06 +04:30
Rizwan Reza
626586b8c7 Minor changes to active_model/errors.rb 2010-06-14 13:40:57 +04:30
Rizwan Reza
716c243def Minor changes to active_model/callbacks.rb and dirty.rb 2010-06-14 13:38:29 +04:30
Rizwan Reza
97d6778c80 Minor changes to active_model/attribute_methods 2010-06-14 13:36:05 +04:30
Rizwan Reza
4523081317 Minor changes to callbacks and conversion API docs. 2010-06-14 13:28:00 +04:30
Rizwan Reza
bf7429041e Merge branch 'master' of git://github.com/rails/rails 2010-06-14 13:13:13 +04:30
Derek Willis
4b05de19aa updated active record querying guide to standardize on first_name for Client 2010-06-13 22:36:42 -04:00
Derek Willis
1c95b67857 updated active record querying guide to standardize on first_name for Client 2010-06-13 22:35:16 -04:00
Santiago Pastorino
2fadc1c5dd Remove unneeded .rb suffix on require statements 2010-06-13 19:50:38 -03:00
David Chelimsky
c125116013 docfix (email instead of emai)
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-13 22:10:45 +02:00
Xavier Noria
50df162a2b explains why AS::OrderedHash does not leverage inheritance 2010-06-13 22:02:29 +02:00
Josiah Ivey
52ed3404bc Routing guide: Fix path 2010-06-13 10:29:32 -05:00
Neeraj Singh
e574ca920d render(:inline) in a layout before yield replaces original content
[#4777 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-13 13:56:08 +02:00
Santiago Pastorino
b514b4d696 removes spurious .rb in require
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-13 13:56:08 +02:00
José Valim
a12079df9f Tidy up generators based on latest change on AM. 2010-06-13 13:56:08 +02:00
Rohit Arondekar
b7a305f0cb Rails Guides: AR Querying, .count should be at the end as it returns a number. [#4811 state:resolved] 2010-06-13 03:05:56 -07:00
Santiago Pastorino
27f337d54f truncate documentation an examples added for :safe option 2010-06-13 06:11:23 -03:00
Santiago Pastorino
8d1b742979 gems versions bumped up 2010-06-13 05:48:25 -03:00
wycats
3b4a13b7a9 CI changes per Chad's request 2010-06-13 00:06:35 -07:00
Santiago Pastorino
6d19a4a664 Change implementation to do it without asking each time for block_given?
Signed-off-by: Xavier Noria <fxn@hashref.com>
2010-06-13 07:27:26 +02:00
Xavier Noria
36143d26cb revises implementation of AS::OrderedHash#merge! 2010-06-13 06:37:54 +02:00
Xavier Noria
3359af63a5 Revert "hash merging with a block ignores non-existing keys altogether"
This reverts commit 72f9fec607.

It is wrong, this feature is a little undocumented, doing some research.
2010-06-13 05:53:42 +02:00