Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Do not try to call `column_names` on the abstract class. | Prem Sichanugrist | 2011-05-15 | 2 | -2/+15 |
| | | | Normally the table for abstract class won't be existed, so we should not trying to call `#column_names` on it. | ||||
* | These extra array operations appear to be unnecessary. Reasoning: | Jon Leighton | 2011-05-14 | 1 | -8/+2 |
| | | | | | * It is not necessary to subtract 'id' from the list of copied attributes because record and mem_record are equal, so therefore their id attributes are also equal (so there is no harm in copying it, and this reduces the complexity of the code) * It is not necessary to intersect the attribute names, since record and mem_record are equal, so they have the same id and class, so they have the same columns in the database. If record has non-column attributes then it seems reasonable to also copy them onto mem_record (though I am not sure what situation this would ever happen in) | ||||
* | CollectionAssociation#merge_target_lists should write to the underlying ↵ | Jon Leighton | 2011-05-14 | 4 | -5/+17 |
| | | | | attributes when copying, rather than using the assignment method | ||||
* | An attempt to make CollectionAssociation#merge_target_lists make more sense. | Jon Leighton | 2011-05-14 | 1 | -16/+35 |
| | |||||
* | Added some docs to controller runtime. | José Valim | 2011-05-14 | 1 | -1/+4 |
| | |||||
* | Merge pull request #554 from ↵ | José Valim | 2011-05-14 | 2 | -1/+19 |
|\ | | | | | | | | | tomafro/reset-activerecord-runtime-before-each-request ActiveRecord::LogSubscriber.runtime should be reset at the start of each request | ||||
| * | Reset ActiveRecord::LogSubscriber runtime at the start of each request | Tom Ward | 2011-05-14 | 2 | -0/+18 |
| | | | | | | | | Previously the runtime was reset implicitly when #cleanup_view_runtime was called at the end of most requests. However, this doesn't happen when the request redirects, or send_file is called. Consequently, the ActiveRecord runtime recorded in the logs included the time taken for both the current request and the previous redirect. Explicitly resetting at the start of each request ensures that this can't happen, no matter what occurs previously. | ||||
| * | Escape regex in controller_runtime_test to actually check that the ↵ | Tom Ward | 2011-05-14 | 1 | -1/+1 |
|/ | | | | ActiveRecord message appears | ||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-14 | 42 | -220/+319 |
|\ | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/date_helper.rb railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt | ||||
| * | minor edits after going through what's new in docrails | Xavier Noria | 2011-05-14 | 3 | -10/+13 |
| | | |||||
| * | [GUIDES] Changed the `LANGUAGE` variable to `GUIDES_LANGUAGE` to minimize ↵ | Karel Minarik | 2011-05-14 | 1 | -4/+5 |
| | | | | | | | | conflicts with regular environment variables (eg. in Ubuntu) | ||||
| * | minor corrections | Vijay Dev | 2011-05-14 | 1 | -5/+5 |
| | | |||||
| * | Link the API documentation to non-edge instead | Prem Sichanugrist | 2011-05-13 | 1 | -1/+1 |
| | | |||||
| * | Adding guide for wrapping JSON/XML parameters, which also links to the API ↵ | Prem Sichanugrist | 2011-05-13 | 1 | -0/+26 |
| | | | | | | | | | | documentation. Note that it currently links to http://edgeapi.rubyonrails.org because it's Rails 3.1 feature. | ||||
| * | Prefer topic branches instead of master branch for users contributions | Guillermo Iguaran | 2011-05-12 | 1 | -5/+8 |
| | | |||||
| * | added an example for AC::UrlFor usage to make usage simpler. | Nick Sutterer | 2011-05-12 | 1 | -1/+13 |
| | | |||||
| * | added docs for AbC::UrlFor and AC::UrlFor. | Nick Sutterer | 2011-05-12 | 2 | -0/+12 |
| | | |||||
| * | fix spellings | Vijay Dev | 2011-05-11 | 2 | -2/+2 |
| | | |||||
| * | indentation fixes | Vijay Dev | 2011-05-11 | 1 | -24/+23 |
| | | |||||
| * | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-05-11 | 11 | -92/+98 |
| |\ | |||||
| | * | fix bad encoding on contributing to RoR page | Dan Pickett | 2011-05-10 | 1 | -1/+1 |
| | | | |||||
| | * | Follow code conventions on docs | Sebastian Martinez | 2011-05-10 | 5 | -13/+13 |
| | | | |||||
| | * | Fix styiling issues on DateHelper docs | Sebastian Martinez | 2011-05-10 | 1 | -64/+70 |
| | | | |||||
| | * | Fix styiling issues on AtomFeedHelper docs | Sebastian Martinez | 2011-05-10 | 1 | -4/+4 |
| | | | |||||
| | * | Remove extra whitespace. | Sebastian Martinez | 2011-05-10 | 1 | -1/+1 |
| | | | |||||
| | * | Fix styiling issue on TranslationHelper docs | Sebastian Martinez | 2011-05-10 | 1 | -4/+4 |
| | | | |||||
| | * | Fix styiling issue on ActionView::Template docs | Sebastian Martinez | 2011-05-10 | 1 | -5/+5 |
| | | | |||||
| * | | minor fix in assets usage | Vijay Dev | 2011-05-10 | 1 | -2/+2 |
| |/ | |||||
| * | typo fix | Trent Ogren | 2011-05-10 | 1 | -1/+1 |
| | | |||||
| * | Explain the implication of using :ignore_date on time_select | Aditya Sanghi | 2011-05-10 | 1 | -1/+2 |
| | | |||||
| * | :touch => :symbol also updates the updated_at attribute | Bruno Michel | 2011-05-10 | 1 | -1/+1 |
| | | |||||
| * | Missing an end in routing docs | James Miller | 2011-05-09 | 1 | -0/+1 |
| | | |||||
| * | more fixed-fonts here | Sebastian Martinez | 2011-05-09 | 1 | -23/+23 |
| | | |||||
| * | added some fixed fonts | Sebastian Martinez | 2011-05-09 | 1 | -3/+3 |
| | | |||||
| * | fixes github fork url | Vijay Dev | 2011-05-10 | 1 | -1/+1 |
| | | |||||
| * | Fixed typos in documentation for the date_select helper in ↵ | Philip Roberts | 2011-05-09 | 1 | -1/+1 |
| | | | | | | | | | | | | actionpack/action_view. The description for an example of the date_select method did not match the actual code example. | ||||
| * | Merge pull request #42 from sgerrand/master | sgerrand | 2011-05-09 | 1 | -2/+2 |
| |\ | | | | | | | Fixed typo in association configuration example | ||||
| | * | - Fixed typo in association parameters configuration (again) | Sasha Gerrand | 2011-05-09 | 1 | -2/+2 |
| | | | |||||
| * | | Merge pull request #41 from sgerrand/master | sgerrand | 2011-05-08 | 1 | -1/+1 |
| |\| | | | | | | | Corrected foreign key parameter placement in the self join example | ||||
| | * | - Fixed typo in the example of a self join on a model | Sasha Gerrand | 2011-05-09 | 1 | -1/+1 |
| | | | |||||
| | * | - Moved foreign key parameter to correct location for self join on a model ↵ | Sasha Gerrand | 2011-05-09 | 1 | -2/+2 |
| |/ | | | | | | | example | ||||
| * | Include examples for negative ordinalize in the guide | Vijay Dev | 2011-05-09 | 1 | -0/+2 |
| | | |||||
| * | improve comment in wrap_parameters template | Vijay Dev | 2011-05-09 | 1 | -1/+1 |
| | | |||||
| * | included examples for negative ordinalize | Vijay Dev | 2011-05-08 | 1 | -4/+7 |
| | | |||||
| * | Documentation fix. Corrected a copy/paste mistake for link_to_if documentation. | Ryan Sandridge | 2011-05-08 | 1 | -1/+1 |
| | | |||||
| * | Fixed documentation of select tag; options with html need to pass through ↵ | Jason | 2011-05-08 | 1 | -6/+6 |
| | | | | | | | | | | | | html_safe https://github.com/rails/rails/issues/447 https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/6759-api-document-incorrect | ||||
| * | Included more details on Rails coding conventions (from LH Source Style page) | Vijay Dev | 2011-05-08 | 1 | -4/+10 |
| | | |||||
| * | remove unnecessary use of 'Example' | Vijay Dev | 2011-05-07 | 1 | -6/+0 |
| | | |||||
| * | replaced eg using old router api with the one in the guides. Add info on ↵ | Vijay Dev | 2011-05-07 | 1 | -5/+8 |
| | | | | | | | | nesting with_options | ||||
| * | minor fixes | Vijay Dev | 2011-05-07 | 3 | -4/+3 |
| | |