aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* remove AM delegating register_observer and register_interceptor to Mail and i...Josh Kalderimis2011-04-044-5/+138
* Add log message when loading records from Identity Map.Emilio Tagua2011-04-042-1/+17
* Use IM when trying to load records using ID.Emilio Tagua2011-04-046-9/+29
* Add railties to the LOAD_PATH if running from a Rails checkoutSantiago Pastorino2011-04-031-4/+2
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-04-0329-99/+119
|\
| * added .'s to headings in the initialization textile pageorta2011-04-031-3/+2
| * s/ERb/ERB/g (part II)Akira Matsuda2011-04-036-8/+8
| * s/ERb/ERB/gAkira Matsuda2011-04-0310-18/+18
| * Trivial fix to HTTP Digest auth MD5 exampleJon Cooper2011-03-311-1/+1
| * fix typoburningTyger2011-04-011-1/+1
| * Explain in the method doc that you need to call respond_to at the class level...Amaia Castro2011-03-311-0/+3
| * Grammar tweaks to the guides guidelinesJosiah Ivey2011-03-311-9/+10
| * Symbol to proc is preferred over longer form of mapRyan Bigg2011-03-311-1/+1
| * Cleanup of named_scope documentationRyan Bigg2011-03-311-8/+9
| * Fix typo in named_scope documentationRyan Bigg2011-03-311-1/+1
| * add space to conform with styleEadz2011-03-311-1/+1
| * Documented undocumented feature: Class methods on your model are automaticall...Eadz2011-03-311-0/+22
| * Minor rephrasing to improve grammar and readability.mhutchin2011-03-291-1/+1
| * Fixed typo and improved readability.mhutchin2011-03-291-1/+2
| * Fix formatting and broken markupJohn Firebaugh2011-03-281-11/+10
| * Fix grammar, formatting, and cross referencesJohn Firebaugh2011-03-281-8/+8
| * Add docs for ActionController::Metal class methodsGabriel Horner2011-03-281-1/+5
| * Merge branch 'master' of github.com:lifo/docrailsozzyaaron2011-03-292-36/+8
| |\
| | * Fix Basic Authentication examplesSebastian Martinez2011-03-282-3/+3
| | * Updated Basic Authentication guides to reflect new Base.http_basic_authentica...Sebastian Martinez2011-03-282-36/+8
| * | Added back the Callback debugging section by interrogating the _*_callbacks m...ozzyaaron2011-03-291-0/+18
| |/
| * Minor typo correction.mhutchin2011-03-271-1/+1
* | Bump up erubis to 2.7.0Santiago Pastorino2011-04-021-1/+1
* | Implicit actions named not_implemented can be renderedSantiago Pastorino2011-04-023-2/+15
* | Gem::Specification#has_rdoc= is deprecated since rubygems 1.7.0Santiago Pastorino2011-04-027-11/+0
* | default_executable is deprecated since rubygems 1.7.0Santiago Pastorino2011-04-011-1/+0
* | Moved Turn activation/dependency to railtiesDavid Heinemeier Hansson2011-03-318-38/+12
* | Direct logging of Active Record to STDOUT so it's shown inline with the resul...David Heinemeier Hansson2011-03-312-0/+6
* | Add using Turn with natural language test case names if the library is availa...David Heinemeier Hansson2011-03-314-17/+44
* | require turn only for minitestDavid Heinemeier Hansson2011-03-311-2/+6
* | Use Turn to format all Rails tests and enable the natural language case namesDavid Heinemeier Hansson2011-03-312-0/+6
* | Improve docs.José Valim2011-03-311-0/+31
* | pass respond_with options to controller render when using a template for api ...Josh Kalderimis2011-03-315-5/+25
* | only try to display an api template in responders if the request is a get or ...Josh Kalderimis2011-03-313-4/+31
* | when using respond_with with an invalid resource and custom options, the defa...Josh Kalderimis2011-03-312-1/+19
* | Delegate pending to skip if Minitest is availableDavid Heinemeier Hansson2011-03-301-21/+25
* | use assert_equal so we get normal error messages along with our custom failur...Aaron Patterson2011-03-301-3/+3
* | Bring back AMo#i18n_key methodSantiago Pastorino2011-03-303-8/+13
* | Merge branch 'master' of github.com:rails/railsAaron Patterson2011-03-303-19/+25
|\ \
| * | Make action_method? public and change implicit rendering to override it instead.José Valim2011-03-303-19/+25
* | | TableAlias leg ordering has changed, so change accordinglyAaron Patterson2011-03-301-1/+1
* | | test against AR class rather than the relation (thanks Andrew White!)Aaron Patterson2011-03-291-2/+2
* | | Merge branch 'master' into zomgAaron Patterson2011-03-2973-150/+972
|\| |
| * | order is not guaranteed by this select, so add an order and call first!Aaron Patterson2011-03-291-1/+1
| * | oracle stores this with microseconds, so convert to seconds before comparingAaron Patterson2011-03-291-1/+1