aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-128-20/+117
|\
| * Just define methods directly on the class rather than use the moduleAaron Patterson2011-03-111-14/+5
| * do not automatically add format to routes that end in a slashAaron Patterson2011-03-112-1/+52
| * Add missing require 'thread' to BufferedLogger.José Valim2011-03-111-0/+1
| * Add require 'date' to use Date.today in plugin template MIT-LICENSESamuel Kadolph2011-03-121-0/+1
| * Filter sensitive query string parameters in the log [#6244 state:committed]Prem Sichanugrist & Xavier Noria2011-03-114-5/+58
* | Resolve some TODO comments which I decided did not need anything doneJon Leighton2011-03-123-9/+5
* | Simplify implementation of ThroughReflection#chainJon Leighton2011-03-112-23/+3
* | Abstract some common code from AssociationScope and JoinDependency::JoinAssoc...Jon Leighton2011-03-114-97/+83
* | Refactor JoinAssociationJon Leighton2011-03-101-100/+54
* | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-1049-129/+231
|\|
| * Fix typoSantiago Pastorino2011-03-091-1/+1
| * publicise ActionMailer::MailHelper.format_paragraphDiego Carrion2011-03-092-1/+21
| * move the conditional definition of Float#round downXavier Noria2011-03-092-2/+2
| * copy-edits 532b770Xavier Noria2011-03-091-1/+1
| * Use Rubys own Float#round method in versions 1.9 and aboveAndrei Kulakov2011-03-102-2/+2
| * Filter params that return nil for to_param and allow through false valuesAndrew White2011-03-094-2/+13
| * revises links to the API websites of individual components (no longer maintai...Xavier Noria2011-03-094-16/+25
| * refactored Engine.#find by giving an explicit name to a variable and reducing...Diego Carrion2011-03-091-3/+3
| * stop being clever and just call methods on the Route objectAaron Patterson2011-03-082-1/+4
| * test/unit in ruby trunk adds a new instance variable. YAY!Aaron Patterson2011-03-081-0/+1
| * Rename conflicting ActionMailer::MailHelper#simple_format methodMat Brown2011-03-091-2/+2
| * The root route example was the only using double quotes; switched it to singl...Chris Kalafarski2011-03-081-1/+1
| * Add better test scenario for around callback return resultsAaron Pfeifer2011-03-081-0/+10
| * Allow access to a callback event's return result from around callbacksAaron Pfeifer2011-03-082-2/+32
| * removing stubs. 1.9.3 implements Date.today in C so mocking the return value ...Aaron Patterson2011-03-071-9/+4
| * fixing some tests on ruby 1.9.3Aaron Patterson2011-03-071-0/+23
| * reorganizes the RDoc of Hash#to_paramXavier Noria2011-03-071-6/+14
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-03-0729-87/+79
| |\
| | * formatting changesVijay Dev2011-03-072-15/+14
| | * Improved docs for Hash#to_param methodDalibor Nasevic2011-03-061-3/+2
| | * Configuration options are symbolsPaco Guzman2011-03-061-2/+2
| | * Remove Example headers. Code just flows with the text. 6ce844a3Paco Guzman2011-03-063-8/+2
| | * more "SSL everywhere" for GitHub URLsAkira Matsuda2011-03-0718-52/+52
| | * "SSL everywhere" for GitHub URLsAkira Matsuda2011-03-074-4/+4
| | * s/a/an/Akira Matsuda2011-03-071-1/+1
| | * fix typosAkira Matsuda2011-03-071-2/+2
* | | Rename Reflection#through_reflection_chain and #through_options to Reflection...Jon Leighton2011-03-105-50/+53
* | | Move the code which builds a scope for through associations into a generic As...Jon Leighton2011-03-109-215/+162
* | | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-0725-44/+193
|\| |
| * | do not test explicit equality of predicate methods, they should be allowed to...Aaron Patterson2011-03-072-8/+4
| * | refactor calls to to_param in expand_key methodAaron Patterson2011-03-071-9/+10
| * | Referencing a table via the ON condition in a join should force that table to...Jon Leighton2011-03-072-1/+27
| * | Merge branch 'master' of github.com:rails/railsAaron Patterson2011-03-0723-27/+179
| |\ \
| | * \ Merge branch 'active_model_unused_variable' of https://github.com/pacoguzman/...Xavier Noria2011-03-071-1/+1
| | |\ \
| | | * | remove unused assigned variablePaco Guzman2011-03-061-1/+1
| | | |/
| | * / Fixed indentation in actionmailer base_test [#6538 state:committed]Dalibor Nasevic2011-03-071-2/+2
| | |/
| | * removes merge conflictsXavier Noria2011-03-062-15/+0
| | * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-03-0612-15/+47
| | |\
| | | * removes Examples headers introduced in 9b96de6Xavier Noria2011-03-061-10/+4
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-15 20:22:47 +0000