aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* just require things onceAaron Patterson2011-12-211-4/+2
|
* append puts the routes after the default, which causes a 404. instead use ↵Aaron Patterson2011-12-211-1/+1
| | | | prepend
* just use def setupAaron Patterson2011-12-211-1/+2
|
* DeprecatedUnderscoreRead does not exist anymoreAaron Patterson2011-12-211-1/+0
|
* adding integration test for journey #7Aaron Patterson2011-12-211-0/+22
|
* switch to git journeyAaron Patterson2011-12-211-1/+1
|
* Merge pull request #4122 from qoobaa/mass_assignment_with_associated_objectJosé Valim2011-12-214-13/+66
|\ | | | | added failing tests for has_many, has_one and belongs_to associations wi...
| * added failing tests for has_many, has_one and belongs_to associations with ↵Jakub Kuźma2011-12-214-13/+66
| | | | | | | | strict mass assignment sanitizer, fixed build_record to not merge creation_attributes, removed failing nested attributes tests (that feature was broken anyway) #4051
* | Move SubTestTask. Soften up tests.Jeremy Kemper2011-12-213-48/+44
| |
* | Merge pull request #4119 from lucasmazza/render_without_optionsJosé Valim2011-12-212-4/+13
|\ \ | | | | | | raises an ArgumentError on TemplateRenderer#determine_template
| * | raises an ArgumentError if no valid options are given to ↵Lucas Mazza2011-12-212-4/+13
| | | | | | | | | | | | TemplateRenderer#determine_template
* | | Merge pull request #4104 from lest/remove-1-8-codeJosé Valim2011-12-214-59/+3
|\ \ \ | | | | | | | | remove Enumerable#each_with_object from core_ext as it is present in ruby 1.9
| * | | remove Enumerable#each_with_object from core_ext as it is present in ruby 1.9lest2011-12-214-59/+3
| | | |
* | | | Merge pull request #4109 from Karunakar/test1José Valim2011-12-211-2/+2
|\ \ \ \ | |_|/ / |/| | | Changed the old logger to new active support logger
| * | | Changed the old logger to new active support loggerKarunakar (Ruby)2011-12-211-2/+2
| | | |
* | | | Merge pull request #4116 from lest/remove-deprecatedJosé Valim2011-12-215-276/+1
|\ \ \ \ | | | | | | | | | | remove deprecated set and original methods for table_name, primary_key, etc
| * | | | remove deprecated set and original methods for table_name, primary_key, etcSergey Nartimov2011-12-215-276/+1
|/ / / /
* | | | Merge pull request #4115 from Karunakar/action_packAaron Patterson2011-12-212-2/+2
|\ \ \ \ | | | | | | | | | | Action pack logger methods changed to active supoort Logger methods
| * | | | Action pack logger methodschanged to active supoort Logger methodsKarunakar (Ruby)2011-12-222-2/+2
|/ / / /
* | | | Merge pull request #4110 from lest/remove-deprecated-underscore-readJon Leighton2011-12-213-41/+0
|\ \ \ \ | | | | | | | | | | remove deprecated underscore versions of attribute methods
| * | | | remove deprecated underscore versions of attribute methodsSergey Nartimov2011-12-213-41/+0
|/ / / /
* | | | caches should not be global, so no need to clear in the teardownAaron Patterson2011-12-211-4/+0
| | | |
* | | | removing deprecated methodsAaron Patterson2011-12-211-28/+0
| | | |
* | | | Merge pull request #4097 from guilleiguaran/safebuffer-html-escapeAaron Patterson2011-12-211-27/+15
|\ \ \ \ | | | | | | | | | | We don't need a special html_escape for 1.8 anymore
| * | | | We don't need a special html_escape for 1.8 anymoreGuillermo Iguaran2011-12-211-27/+15
| | |_|/ | |/| |
* | | | Restore `rake TEST=test/unit/foo_test.rb` support.Jeremy Kemper2011-12-211-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add your own test tasks as dependencies on the `test:run` task instead of `test` itself. namespace :test do task run: 'test:acceptance' Rails::SubTestTask.new acceptance: 'test:prepare' do |t| t.libs << 'test' t.pattern = 'test/acceptance/**/*_test.rb' end end
* | | | Rails::SubTestTask warns on test failure and moves on. Renamed from ↵Jeremy Kemper2011-12-211-45/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TestTaskWithoutDescription. This makes it easier to add your own tests to the default suite: task test: 'test:acceptance' namespace :test do Rails::SubTestTask.new acceptance: 'test:prepare' do |t| t.libs << 'test' t.pattern = 'test/acceptance/**/*_test.rb' end end Now `rake` runs unit, functional, integration, and acceptance tests.
* | | | 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
| | | | |