aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed special character encoding issue with MemCacheStore in Ruby 1.9.2.Pan Thomakos2011-03-112-1/+42
|
* 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
| | | | | | This provides more safety to applications that put secret information in the query string, such as API keys or SSO tokens. Signed-off-by: Xavier Noria <fxn@hashref.com>
* Fix typoSantiago Pastorino2011-03-091-1/+1
|
* publicise ActionMailer::MailHelper.format_paragraphDiego Carrion2011-03-092-1/+21
| | | | | | [#6550 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* move the conditional definition of Float#round downXavier Noria2011-03-092-2/+2
| | | | | | | Rails 3 cherry-picks as little as possible from Active Support. In particular the framework requires the files where extensions are exactly defined, rather than convenience entry points like float.rb and friends. Because of that, it is better to define conditionally rather than require conditionally.
* 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 ↵Xavier Noria2011-03-094-16/+25
| | | | maintained), and rewrites the section about after and around filters in the controller guide
* refactored Engine.#find by giving an explicit name to a variable and ↵Diego Carrion2011-03-091-3/+3
| | | | | | | | reducing calls [#6529 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* 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
| | | | | This was conflicting with ActionView::Helpers::TextHelper#simple_format from within email templates.
* The root route example was the only using double quotes; switched it to ↵Chris Kalafarski2011-03-081-1/+1
| | | | single quotes for consistency
* 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
| | | | of Time.now does nothing
* 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
| | | | | | | | see: https://github.com/blog/738-sidejack-prevention-phase-2-ssl-everywhere
| * "SSL everywhere" for GitHub URLsAkira Matsuda2011-03-074-4/+4
| | | | | | | | see: https://github.com/blog/738-sidejack-prevention-phase-2-ssl-everywhere
| * s/a/an/Akira Matsuda2011-03-071-1/+1
| |
| * fix typosAkira Matsuda2011-03-071-2/+2
| |
* | do not test explicit equality of predicate methods, they should be allowed ↵Aaron Patterson2011-03-072-8/+4
| | | | | | | | to return truthy or falsey objects
* | 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 ↵Jon Leighton2011-03-072-1/+27
| | | | | | | | to be eager-loaded via a JOIN rather than via subsequent queries.
* | Merge branch 'master' of github.com:rails/railsAaron Patterson2011-03-0723-27/+179
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of github.com:rails/rails: (44 commits) Fixed indentation in actionmailer base_test [#6538 state:committed] remove unused assigned variable removes merge conflicts removes Examples headers introduced in 9b96de6 Revert "Fixed identation in actionmailer base_test" Report the correct value of nil.id in the exception message as different ruby implementations may have different values, for example Rubinius returns 53 for nil.id. Improve testing of cookies in functional tests: - 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 more style changes Some style changes style changes Revert "style changes" Raise ArgumentError if route name is invalid [#6517 state:resolved] style changes Allow model to be inherited from Hash [#6487 state:resolved] styles applied for usage added failing test for fields_for with a record object that inherits from Hash Fixed identation in actionmailer base_test wrong SQL statement commas to set off expressions that interrupt sentence flow typo changes ...
| * \ Merge branch 'active_model_unused_variable' of ↵Xavier Noria2011-03-071-1/+1
| |\ \ | | | | | | | | | | | | https://github.com/pacoguzman/rails into pacoguzman-active_model_unused_variable
| | * | remove unused assigned variablePaco Guzman2011-03-061-1/+1
| | |/
| * / Fixed indentation in actionmailer base_test [#6538 state:committed]Dalibor Nasevic2011-03-071-2/+2
| |/ | | | | | | Signed-off-by: Xavier Noria <fxn@hashref.com>
| * 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
| | | | | | | | | | | | | | | | | | | | | 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 Noria2011-03-061-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 changessuchasurge2011-03-062-2/+2
| | |
| | * Some style changessuchasurge2011-03-065-5/+11
| | |
| | * style changesJudeArasu2011-03-061-3/+5
| | |
| | * Revert "style changes"JudeArasu2011-03-061-3/+3
| | | | | | | | | | | | This reverts commit 1d4826937e438ebcd6a2f9e29d2e466a43fef7a8.
| | * style changesJudeArasu2011-03-061-3/+3
| | |
| | * styles applied for usageJudeArasu2011-03-061-3/+4
| | |
| | * Fixed identation in actionmailer base_testDalibor Nasevic2011-03-061-2/+2
| | |
| | * wrong SQL statementAkira Matsuda2011-03-061-1/+1
| | |
| | * merges railsXavier Noria2011-03-0598-1334/+2114
| | |\
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 21:59:43 +0000