aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-12-212-10/+10
|\
| * Doc fixes on Rails::Generators::Base.hook_for.Hendy Tanata2011-12-211-3/+3
| |
| * [docs] Ruby upgradeArun Agrawal2011-12-201-1/+1
| |
| * 4.0.0.beta now :-)Arun Agrawal2011-12-201-6/+6
| |
* | Merge pull request #4102 from arunagw/warning_removed_actionpackVijay Dev2011-12-211-1/+1
|\ \ | | | | | | warning removed
| * | removed warning "warning: ambiguous first argument; put parentheses or even ↵Arun Agrawal2011-12-211-1/+1
| | | | | | | | | | | | spaces"
* | | sync AS guide with the Ruby 1.9 related deletions in masterVijay Dev2011-12-211-73/+0
| | |
* | | Merge pull request #4105 from lest/bad-requiresPiotr Sarnacki2011-12-212-2/+0
|\ \ \ | | | | | | | | remove requires of core_ext/array/random_access that no longer exists
| * | | remove requires of core_ext/array/random_access that no longer existslest2011-12-212-2/+0
|/ / /
* | | Merge pull request #4103 from lest/remove-1-8-codeJosé Valim2011-12-213-26/+1
|\ \ \ | | | | | | | | remove Kernel#singleton_class from core_ext as it is present in ruby 1.9
| * | | remove Kernel#singleton_class from core_ext as it is present in ruby 1.9lest2011-12-213-26/+1
|/ / /
* | | Merge pull request #4101 from nashby/ruby-18-cleaningJosé Valim2011-12-213-59/+0
|\ \ \ | | | | | | | | remove Array#sample from core_ext
| * | | remove Array#sample from core_extVasiliy Ermolovich2011-12-213-59/+0
| |/ /
* | | Merge pull request #4094 from lest/remove-1-8-codeJosé Valim2011-12-211-8/+1
|\ \ \ | | | | | | | | remove check for string from request body setter
| * | | remove check for string from request body setterlest2011-12-211-8/+1
| | | | | | | | | | | | | | | | it was required on ruby 1.8
* | | | Merge pull request #4098 from Karunakar/active_model2José Valim2011-12-211-2/+2
|\ \ \ \ | | | | | | | | | | removed deprecated loggers
| * | | | Changed the require path for loggerKarunakar (Ruby)2011-12-211-1/+1
| | | | |
| * | | | removed deprecated loggersKarunakar (Ruby)2011-12-211-1/+1
| | |/ / | |/| |
* | | | Merge pull request #4100 from simi/masterJosé Valim2011-12-211-13/+13
|\ \ \ \ | |/ / / |/| | | rails version order in railties changelog
| * | | rails version order fixed and formatted in railties changelog Josef Šimánek2011-12-211-13/+13
|/ / /
* | | Merge pull request #4079 from drogus/http_digest_issueJosé Valim2011-12-217-8/+137
|\ \ \ | | | | | | | | Fix http digest authentication when url ends with `/` or `?`
| * | | Fix http digest authentication with trailing '/' or '?' (fixes #4038 and #3228)Piotr Sarnacki2011-12-212-10/+44
| | | |
| * | | Add original_fullpath and original_url methods to RequestPiotr Sarnacki2011-12-212-0/+32
| | | |
| * | | Add ORIGINAL_FULLPATH to envPiotr Sarnacki2011-12-213-1/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This behaves similarly to REQUEST_URI, but we need to implement it on our own because REQUEST_URI is not reliable. Note that since PATH_INFO does not contain information about trailing question mark, this is not 100% accurate, for example `/foo?` will result in `/foo` in ORIGINAL_FULLPATH
| * | | Added failing test to demonstrate digest authentication failureJarrod Carlson2011-12-201-0/+10
| | | |
* | | | Merge pull request #4095 from arunagw/using_uuidJosé Valim2011-12-212-2/+2
|\ \ \ \ | |_|/ / |/| | | Using uuid which is supported in 1.9
| * | | Using uuid which is supported in 1.9Arun Agrawal2011-12-212-2/+2
|/ / / | | | | | | Orignal commit #ada78066fdbccffb1da092a2470211fa252b3c99
* | | Merge pull request #4093 from arunagw/issue_3183José Valim2011-12-211-0/+7
|\ \ \ | | | | | | | | More tests deep including through habtm
| * | | More tests deep including through habtmArun Agrawal2011-12-211-0/+7
|/ / / | | | | | | fixes #3183
* | | Merge pull request #4090 from arunagw/more_more_more_187_removalJosé Valim2011-12-2110-93/+19
|\ \ \ | | | | | | | | Removed test which works only < 1.9
| * | | 'with_kcode' removed. Arun Agrawal2011-12-217-59/+19
| | | | | | | | | | | | | | | | Testing Sandbox removed.
| * | | Removed test which works only < 1.9Arun Agrawal2011-12-213-34/+0
| | | |
* | | | Merge pull request #4092 from qoobaa/other_than_numericality_validatorJosé Valim2011-12-213-2/+11
|\ \ \ \ | | | | | | | | | | added :other_than => :!= option to numericality validator
| * | | | added :other_than => :!= option to numericality validatorJakub Kuźma2011-12-213-2/+11
| |/ / /
* | | | Merge pull request #4089 from lest/remove-1-8-codeJosé Valim2011-12-211-30/+2
|\ \ \ \ | |/ / / |/| | | remove dead code as ruby 1.9.3 has Base64 module
| * | | remove dead code as ruby 1.9.3 has Base64 modulelest2011-12-211-30/+2
|/ / /
* | | Merge pull request #4076 from lest/remove-1-8-codeJosé Valim2011-12-212-38/+1
|\ \ \ | | | | | | | | remove support for ruby 1.8 in AS String extensions
| * | | remove support for ruby 1.8 in AS String extensionsSergey Nartimov2011-12-212-38/+1
|/ / /
* | | Merge pull request #4088 from rahul100885/rahul100885_workJosé Valim2011-12-213-58/+26
|\ \ \ | | | | | | | | Remove unused conditions for 1.9
| * | | Remove unused conditions for 1.9Rahul P. Chaudhari2011-12-213-58/+26
| | | |
* | | | Merge pull request #4086 from ugisozols/masterJosé Valim2011-12-2010-132/+0
|\ \ \ \ | |/ / / |/| | | Remove some of the ActiveSupport core extensions related to 1.8.
| * | | Remove some of the ActiveSupport core extensions related to 1.8.Uģis Ozols2011-12-2110-132/+0
|/ / /
* | | Merge pull request #4085 from arunagw/more_1_8_7_removalJosé Valim2011-12-202-25/+0
|\ \ \ | | | | | | | | No Ruby 1.8 stuff. No more checks in code.
| * | | No Ruby 1.8 stuff. No more checks in code.Arun Agrawal2011-12-212-25/+0
| | | |
* | | | Merge pull request #4071 from rahul100885/rahul100885_workJosé Valim2011-12-208-8/+8
|\ \ \ \ | |/ / / |/| | | Updated gemspec for ruby 1.9.3
| * | | Updated gemspec for ruby 1.9.3Rahul P. Chaudhari2011-12-218-8/+8
|/ / /
* | | Check for response to `#last` instead of `#first`.Brian Rose2011-12-201-1/+1
| | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | | Ensure option for select helper responds to `#first` before comparison.Brian Rose2011-12-202-1/+19
| | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | | skip hstore tests on PG databases that do not have hstoreAaron Patterson2011-12-201-2/+8
| | |
* | | do not compile regexp on every callAaron Patterson2011-12-201-16/+14
| | |