Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | truncate() should not try to produce HTML-safe output | Wincent Colaiuta | 2010-06-17 | 2 | -22/+8 | |
| | | | | | | | | | | 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> | |||||
* | Merge branch 'master' of github.com:rails/rails | José Valim | 2010-06-17 | 11 | -142/+166 | |
|\ | ||||||
| * | pdoc tasks publishe APIs in api.rubyonrails.org | Xavier Noria | 2010-06-16 | 5 | -5/+5 | |
| | | ||||||
| * | use RDoc 2.2 to generate the documentation of individual components | Xavier Noria | 2010-06-16 | 7 | -4/+15 | |
| | | ||||||
| * | removes the documentation group from the Gemfile, thus making RDoc 2.2 ↵ | Xavier Noria | 2010-06-16 | 1 | -4/+1 | |
| | | | | | | | | | | | | | | | | 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. | |||||
| * | use assert_in_delta() for floating point comparisons in tests [#4871 ↵ | Aaron Patterson | 2010-06-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Carl Lerche <carllerche@mac.com> | |||||
| * | migrates the Jamis template to RDoc 2.x, the root Rakefile requires RDoc 2.2 | Xavier Noria | 2010-06-16 | 3 | -129/+145 | |
| | | | | | | | | To understand the changes in horo.rb check rdoc/template.rb in a RDoc 2.x | |||||
* | | Add a failing test for ticket #4874 | José Valim | 2010-06-17 | 1 | -0/+14 | |
|/ | ||||||
* | Merge remote branch 'rails/master' | Xavier Noria | 2010-06-14 | 1 | -18/+21 | |
|\ | ||||||
| * | refactors AR::Base#reset_table_name | Xavier Noria | 2010-06-14 | 1 | -19/+20 | |
| | | ||||||
| * | Documentation for #quoted_table_name method | Thiago Pradi | 2010-06-14 | 1 | -0/+2 | |
| | | | | | | | | Signed-off-by: Xavier Noria <fxn@hashref.com> | |||||
* | | edit pass: the names of Rails components have a space, ie, "Active Record", ↵ | Xavier Noria | 2010-06-14 | 30 | -48/+48 | |
| | | | | | | | | not "ActiveRecord" | |||||
* | | Fix minor typos and inconsistencies, and one minor grammar change | rspeicher | 2010-06-14 | 1 | -6/+6 | |
| | | ||||||
* | | edit pass in #define_callbacks rdoc | Xavier Noria | 2010-06-14 | 1 | -20/+22 | |
| | | ||||||
* | | adding to the :kind documentation for ActiveSupport callbacks | Neeraj Singh | 2010-06-14 | 1 | -0/+5 | |
| | | ||||||
* | | clearer documentation of how scope applies to ActiveSupport callbacks | Neeraj Singh | 2010-06-14 | 1 | -20/+32 | |
| | | ||||||
* | | truncate safe method description changes | Neeraj Singh | 2010-06-14 | 1 | -1/+1 | |
| | | ||||||
* | | Added headings to serializers. | Rizwan Reza | 2010-06-14 | 3 | -3/+7 | |
| | | ||||||
* | | Revised the rest of the files from ActiveModel. | Rizwan Reza | 2010-06-14 | 3 | -23/+36 | |
| | | ||||||
* | | Revised and added headings. | Rizwan Reza | 2010-06-14 | 3 | -1/+7 | |
| | | ||||||
* | | Revised naming.rb and lint.rb | Rizwan Reza | 2010-06-14 | 2 | -5/+5 | |
| | | ||||||
* | | Added headings and revised active_model.rb/lint.rb grammatically | Rizwan Reza | 2010-06-14 | 1 | -1/+3 | |
| | | ||||||
* | | Minor changes to active_model/errors.rb | Rizwan Reza | 2010-06-14 | 1 | -8/+16 | |
| | | ||||||
* | | Minor changes to active_model/callbacks.rb and dirty.rb | Rizwan Reza | 2010-06-14 | 2 | -7/+12 | |
| | | ||||||
* | | Minor changes to active_model/attribute_methods | Rizwan Reza | 2010-06-14 | 1 | -24/+30 | |
| | | ||||||
* | | Minor changes to callbacks and conversion API docs. | Rizwan Reza | 2010-06-14 | 2 | -13/+17 | |
|/ | ||||||
* | Merge branch 'master' of git://github.com/rails/rails | Rizwan Reza | 2010-06-14 | 28 | -152/+185 | |
|\ | ||||||
| * | docfix (email instead of emai) | David Chelimsky | 2010-06-13 | 1 | -3/+3 | |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | explains why AS::OrderedHash does not leverage inheritance | Xavier Noria | 2010-06-13 | 1 | -0/+11 | |
| | | ||||||
| * | render(:inline) in a layout before yield replaces original content | Neeraj Singh | 2010-06-13 | 3 | -1/+9 | |
| | | | | | | | | | | | | [#4777 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | removes spurious .rb in require | Santiago Pastorino | 2010-06-13 | 1 | -1/+1 | |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Tidy up generators based on latest change on AM. | José Valim | 2010-06-13 | 3 | -4/+4 | |
| | | ||||||
| * | CI changes per Chad's request | wycats | 2010-06-13 | 1 | -2/+2 | |
| | | ||||||
| * | Change implementation to do it without asking each time for block_given? | Santiago Pastorino | 2010-06-13 | 1 | -6/+4 | |
| | | | | | | | | Signed-off-by: Xavier Noria <fxn@hashref.com> | |||||
| * | revises implementation of AS::OrderedHash#merge! | Xavier Noria | 2010-06-13 | 3 | -21/+24 | |
| | | ||||||
| * | Revert "hash merging with a block ignores non-existing keys altogether" | Xavier Noria | 2010-06-13 | 2 | -17/+18 | |
| | | | | | | | | | | | | This reverts commit 72f9fec607c4a72b2e88995d0cb32b16b96e9068. It is wrong, this feature is a little undocumented, doing some research. | |||||
| * | hash merging with a block ignores non-existing keys altogether | Xavier Noria | 2010-06-13 | 2 | -18/+17 | |
| | | ||||||
| * | re-organized test for merge into separate tests | Paul Barry | 2010-06-13 | 1 | -13/+21 | |
| | | | | | | | | Signed-off-by: Xavier Noria <fxn@hashref.com> | |||||
| * | Support passing a block to ActiveSupport::OrderedHash's merge and merge! ↵ | Paul Mucur | 2010-06-13 | 3 | -3/+22 | |
| | | | | | | | | | | | | | | | | [#4838 state:committed] For better consistency with Ruby's own Hash implementation. Signed-off-by: Xavier Noria <fxn@hashref.com> | |||||
| * | Revert "Revert "Validators should at model level and not at AR:Base level ↵ | wycats | 2010-06-12 | 1 | -0/+10 | |
| | | | | | | | | | | | | [Closes #4804]"" This reverts commit d67549306567b219089f2355fe432d31d0ebf8a1. | |||||
| * | Bump rack-mount version to 0.6.4 | Santiago Pastorino | 2010-06-12 | 1 | -1/+1 | |
| | | ||||||
| * | require conversions to use String#ord | Santiago Pastorino | 2010-06-12 | 1 | -0/+1 | |
| | | ||||||
| * | Revert "Validators should at model level and not at AR:Base level [Closes ↵ | wycats | 2010-06-12 | 1 | -10/+0 | |
| | | | | | | | | | | | | #4804]" This reverts commit e11bb95d56ed77b10d54d9dfe5a3cc4aa48b3a61. | |||||
| * | registers 4146a44 in CHANGELOG | Xavier Noria | 2010-06-12 | 1 | -0/+5 | |
| | | ||||||
| * | removes spurious .rb in require | Xavier Noria | 2010-06-12 | 1 | -1/+1 | |
| | | ||||||
| * | Move ActionMailer::TC to AV::TC::Behavior | David Chelimsky | 2010-06-12 | 3 | -45/+55 | |
| | | | | | | | | | | | | [#4843 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Change sanitize to escape in test names of text_helper_test [#4844 ↵ | rohit | 2010-06-12 | 1 | -9/+9 | |
| | | | | | | | | state:resolved] | |||||
| * | subject is automatically looked up on I18n using mailer_name and action_name ↵ | José Valim | 2010-06-12 | 3 | -2/+4 | |
| | | | | | | | | as scope as in t('.subject') | |||||
| * | Use load_paths on AR benchmarks so it uses the bundler setup instead of ↵ | José Valim | 2010-06-12 | 1 | -5/+5 | |
| | | | | | | | | system gems. | |||||
| * | No need to call convert_key before except. | José Valim | 2010-06-12 | 1 | -1/+0 | |
| | |