Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'active_model_unused_variable' of ↵ | Xavier Noria | 2011-03-07 | 1 | -1/+1 |
|\ | | | | | | | https://github.com/pacoguzman/rails into pacoguzman-active_model_unused_variable | ||||
| * | remove unused assigned variable | Paco Guzman | 2011-03-06 | 1 | -1/+1 |
| | | |||||
* | | Fixed indentation in actionmailer base_test [#6538 state:committed] | Dalibor Nasevic | 2011-03-07 | 1 | -2/+2 |
|/ | | | | Signed-off-by: Xavier Noria <fxn@hashref.com> | ||||
* | removes merge conflicts | Xavier Noria | 2011-03-06 | 2 | -15/+0 |
| | |||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-03-06 | 12 | -15/+47 |
|\ | |||||
| * | removes Examples headers introduced in 9b96de6 | Xavier Noria | 2011-03-06 | 1 | -10/+4 |
| | | | | | | | | | | | | | | Example headers are discouraged in the API guidelines. Code just flows with the text. They may be good in places where there's a lot of stuff and structure may add clarity | ||||
| * | Revert "Fixed identation in actionmailer base_test" | Xavier Noria | 2011-03-06 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | Please excuse the revert. Albeit the commit is totally innocent, docrails has a strong no-code policy we need to enforce. Please feel free to submit the fix as a patch and assign it to me, I'll apply right away. This reverts commit d8462510c5378f9204778ffb9df4fdbece7dccd0. | ||||
| * | more style changes | suchasurge | 2011-03-06 | 2 | -2/+2 |
| | | |||||
| * | Some style changes | suchasurge | 2011-03-06 | 5 | -5/+11 |
| | | |||||
| * | style changes | JudeArasu | 2011-03-06 | 1 | -3/+5 |
| | | |||||
| * | Revert "style changes" | JudeArasu | 2011-03-06 | 1 | -3/+3 |
| | | | | | | | | This reverts commit 1d4826937e438ebcd6a2f9e29d2e466a43fef7a8. | ||||
| * | style changes | JudeArasu | 2011-03-06 | 1 | -3/+3 |
| | | |||||
| * | styles applied for usage | JudeArasu | 2011-03-06 | 1 | -3/+4 |
| | | |||||
| * | Fixed identation in actionmailer base_test | Dalibor Nasevic | 2011-03-06 | 1 | -2/+2 |
| | | |||||
| * | wrong SQL statement | Akira Matsuda | 2011-03-06 | 1 | -1/+1 |
| | | |||||
| * | merges rails | Xavier Noria | 2011-03-05 | 98 | -1334/+2114 |
| |\ | |||||
| * | | commas to set off expressions that interrupt sentence flow | JudeArasu | 2011-03-05 | 1 | -1/+1 |
| | | | |||||
| * | | typo changes | JudeArasu | 2011-03-05 | 1 | -1/+1 |
| | | | |||||
| * | | typo changes | JudeArasu | 2011-03-05 | 1 | -1/+2 |
| | | | |||||
| * | | Railties typos. | R.T. Lechow | 2011-03-04 | 4 | -6/+6 |
| | | | |||||
| * | | Action Pack typos. | R.T. Lechow | 2011-03-04 | 11 | -15/+15 |
| | | | |||||
| * | | Active Record typos. | R.T. Lechow | 2011-03-04 | 6 | -10/+10 |
| | | | |||||
| * | | Active Support typos. | R.T. Lechow | 2011-03-04 | 7 | -7/+7 |
| | | | |||||
| * | | Active Resource typos. | R.T. Lechow | 2011-03-04 | 5 | -6/+6 |
| | | | |||||
| * | | Active Model typos. | R.T. Lechow | 2011-03-04 | 2 | -2/+2 |
| | | | |||||
| * | | Merge remote branch 'origin/master' | Jonathon D. Jones | 2011-03-03 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Properly escaped a + in the dynamic segments TIP | tashian | 2011-03-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | Adds link to Object.blank? from Object.present? | Jonathon D. Jones | 2011-03-03 | 1 | -1/+1 |
| |/ / | |||||
| * | | fixes a missmatched column in example | mjy | 2011-03-03 | 1 | -1/+1 |
| | | | |||||
| * | | Spelling mistake | JudeArasu | 2011-03-03 | 1 | -1/+2 |
| | | | |||||
| * | | Correct spelling for Base64 in action_mailer | Dalibor Nasevic | 2011-03-03 | 1 | -1/+1 |
| | | | |||||
| * | | Removed link to un-existing Issues page on Github | Dalibor Nasevic | 2011-03-01 | 1 | -3/+0 |
| | | | |||||
| * | | Added some new advice on applying patches | Lars Smit | 2011-02-28 | 1 | -0/+14 |
| | | | |||||
| * | | Fix incorrect example. | Ben Orenstein | 2011-02-27 | 1 | -2/+2 |
| | | | |||||
| * | | Fix incorrect word. | Ben Orenstein | 2011-02-27 | 1 | -1/+1 |
| | | | |||||
| * | | Pointing out that dynamic_form plugin must be installed to be able to use ↵ | Rodrigo Navarro | 2011-02-27 | 1 | -1/+14 |
| | | | | | | | | | | | | error_messages and error_messages_for view helpers. | ||||
| * | | Clean up wording. | Ben Orenstein | 2011-02-26 | 1 | -1/+1 |
| | | | |||||
| * | | use resources in place of map.resources | Vijay Dev | 2011-02-27 | 1 | -1/+1 |
| | | | |||||
| * | | Clarify comment by removing french reference ('a la'). Should improve ↵ | Ben Orenstein | 2011-02-26 | 1 | -1/+1 |
| | | | | | | | | | | | | readability for non-native english speakers. | ||||
| * | | Example descriptions and their examples were flipped. Fix. | Ben Orenstein | 2011-02-26 | 1 | -3/+3 |
| | | | |||||
| * | | Warn people that these methods are deprecated. | Ben Orenstein | 2011-02-26 | 1 | -0/+2 |
| | | | |||||
| * | | Correct example that did not do what it claimed. Rework explanation. | Ben Orenstein | 2011-02-26 | 1 | -5/+5 |
| | | | |||||
| * | | added information about TEST_DIR env variable | Ilya Zayats | 2011-02-26 | 1 | -0/+8 |
| | | | |||||
* | | | Report the correct value of nil.id in the exception message | Andrew White | 2011-03-06 | 2 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | as different ruby implementations may have different values, for example Rubinius returns 53 for nil.id. [#6444 state:resolved] | ||||
* | | | Improve testing of cookies in functional tests: | Andrew White | 2011-03-06 | 5 | -5/+84 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - cookies can be set using string or symbol keys - cookies are preserved across calls to get, post, etc. - cookie names and values are escaped - cookies can be cleared using @request.cookies.clear [#6272 state:resolved] | ||||
* | | | Raise ArgumentError if route name is invalid [#6517 state:resolved] | Andrew White | 2011-03-06 | 2 | -0/+34 |
| | | | |||||
* | | | Allow model to be inherited from Hash [#6487 state:resolved] | Alexander Uvarov | 2011-03-06 | 1 | -3/+4 |
| | | | | | | | | | | | | Signed-off-by: Andrew White <andyw@pixeltrix.co.uk> | ||||
* | | | added failing test for fields_for with a record object that inherits from Hash | Diego Carrion | 2011-03-06 | 1 | -0/+19 |
| | | | | | | | | | | | | Signed-off-by: Andrew White <andyw@pixeltrix.co.uk> | ||||
* | | | use Arel::Table#alias rather than passing the :as parameter | Aaron Patterson | 2011-03-05 | 2 | -4/+4 |
| |/ |/| | |||||
* | | revises the RDoc of Hash#reverse_merge | Xavier Noria | 2011-03-05 | 1 | -13/+7 |
| | |