aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* indent fix [ci skip]Vijay Dev2012-09-091-1/+1
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-09-0919-74/+149
|\
| * minor fixes and edits [ci skip]Vijay Dev2012-09-095-22/+14
| * add :nodoc: to AR::Store::IndifferentCoder [ci skip]Francesco Rodriguez2012-09-081-1/+1
| * add note about using block form of unscoped in AR Querying guide [ci skip]Francesco Rodriguez2012-09-081-5/+19
| * Fix a bunch of typos, reword some things for clarity.Jonathan Roes2012-09-071-43/+36
| * Fix a typo13342012-09-071-2/+2
| * default scope should return an ActiveRecord::Relation [ci skip]José Corcuera2012-09-071-1/+1
| * How to use default_scope as a class methodJosé Corcuera2012-09-071-0/+10
| * Added forgotten :message option to ActiveModel validates documentationAnatoly Makarevich2012-09-071-3/+3
| * Merge pull request #112 from cnaize/mastercnaize2012-09-071-1/+4
| |\
| | * extended examplecnaize2012-09-071-1/+4
| |/
| * Added information about dynamic delivery options to action mailer guidesAditya Sanghi2012-09-071-0/+18
| * Dynamic Delivery Method OptionsAditya Sanghi2012-09-071-0/+14
| * Redirect block with arity of 1 is deprecated.Semyon Perepelitsa2012-09-061-2/+2
| * Fixed non-working around callback exampleAaron Renner2012-09-061-1/+1
| * Doc: sweepers only work on Active Record Modelsschneems2012-09-052-2/+4
| * Fix a typoAndreas Loupasakis2012-09-061-1/+1
| * Fixed array wrongly translated in footnote in a guide [ci skip]Aldo "xoen" Giambelluca2012-09-051-1/+1
| * Add giant belongs_to 'please don't pluralize me' noteRyan Bigg2012-09-051-0/+2
| * update caching guide: stale? can also figure out last_modified on its ownKonstantin Haase2012-09-041-1/+12
| * Update caching guide: memcache-client was replaced with dalliGuillermo Iguaran2012-09-031-1/+1
| * Add section about tagged loggingGaurish Sharma2012-09-031-0/+16
| * Fix indenentation in comment to stop the end of comment from appearing in a <...Anuj Dutta2012-09-031-1/+1
| * Fixed validation issue and titles in Migrations guide [ci skip]Aldo "xoen" Giambelluca2012-09-021-6/+6
| * Fixed validation issue related to taken ID in Layout and Rendering guide [ci ...Aldo "xoen" Giambelluca2012-09-021-1/+1
| * Fixed validation issues in the "Configuring Rails Applications" guide [ci skip]Aldo "xoen" Giambelluca2012-09-021-1/+1
| * Fixed validation issues related to taken IDs in AR Querying guide [ci skip]Aldo "xoen" Giambelluca2012-09-021-4/+4
| * Underscore in _attr_readonly method name is back (Upgrading RoR guide) [ci skip]Aldo "xoen" Giambelluca2012-09-021-1/+1
| * Fixed validation issue in Upgrading Ruby on Rails guide [ci skip]Aldo "xoen" Giambelluca2012-09-021-1/+1
* | Merge pull request #7580 from spohlenz/mounted-url-helper-ivarsJosé Valim2012-09-092-1/+12
|\ \
| * | Use internal instance variable naming scheme for mounted URL helper proxiesSam Pohlenz2012-09-092-1/+12
* | | Merge pull request #7571 from arunagw/warning_removed_shadowingRafael Mendonça França2012-09-091-1/+1
|\ \ \ | |/ / |/| |
| * | removed warning: shadowing outer local variableArun Agrawal2012-09-091-1/+1
* | | Merge pull request #7548 from ernie/missing-attributes-query-fixCarlos Antonio da Silva2012-09-083-1/+8
|\ \ \
| * | | Raise MissingAttributeError on query methodsErnie Miller2012-09-083-1/+8
|/ / /
* | | Merge pull request #7577 from frodsan/fix_ap_responseRafael Mendonça França2012-09-081-25/+32
|\ \ \
| * | | set default_headers to nil after use it to avoid order dependent testsFrancesco Rodriguez2012-09-081-25/+32
* | | | Merge pull request #7576 from prijutme4ty/fix_require_necessary_for_generatin...Rafael Mendonça França2012-09-081-0/+1
|\ \ \ \
| * | | | Fixed missing requireIlya Vorontsov2012-09-081-0/+1
|/ / / /
* | | | Merge pull request #7574 from frodsan/chlog_arRafael Mendonça França2012-09-081-8/+9
|\ \ \ \ | |/ / / |/| | |
| * | | improve AR CHANGELOG [ci skip]Francesco Rodriguez2012-09-081-8/+9
|/ / /
* | | Tidy up excerpt separator logic a bitCarlos Antonio da Silva2012-09-081-17/+11
* | | Improve latest AR and AP changelog entriesCarlos Antonio da Silva2012-09-082-2/+10
* | | Refactor some date helpers to use merge!Carlos Antonio da Silva2012-09-081-5/+9
* | | Refactor nested attributes limit logic to lookup :limit option only onceCarlos Antonio da Silva2012-09-081-11/+12
* | | Merge pull request #7189 from GCorbel/excerpt_with_separationCarlos Antonio da Silva2012-09-083-11/+64
|\ \ \
| * | | Add a separation option for the excerpt functionGuirec Corbel2012-09-083-11/+64
| |/ /
* | | Merge pull request #7566 from etehtsea/schema-new-hashCarlos Antonio da Silva2012-09-085-61/+63
|\ \ \
| * | | Dump schema using new style hashKonstantin Shabanov2012-09-085-61/+63
| |/ /