aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5415 from rafaelfranca/refactorJosé Valim2012-03-133-9/+9
|\ | | | | Refactor the test_unit scaffold generator to use the key_value method
| * Refactor the test_unit scaffold generator to use the key_value methodRafael Mendonça França2012-03-133-9/+9
| |
* | Merge pull request #572 from sikachu/remove_activeresourceJosé Valim2012-03-1313-152/+6
|\ \ | | | | | | Remove Active Resource source files from the repository.
| * | Remove Active Resource source files from the repositoryPrem Sichanugrist2012-03-1313-152/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dear Active Resource, It's not that I hate you or anything, but you didn't get much attention lately. There're so many alternatives out there, and I think people have made their choice to use them than you. I think it's time for you to have a big rest, peacefully in this Git repository. I will miss you, @sikachu.
* | | Check for existence of exactly the called `fixture_path=` methodPiotr Sarnacki2012-03-131-2/+2
| | |
* | | Environment in engines tests is required on boot_rails, no need to require ↵Piotr Sarnacki2012-03-131-10/+0
| | | | | | | | | | | | explicitly
* | | Don't need to share engine's tests anymore, plugins are gonePiotr Sarnacki2012-03-132-370/+359
| | |
* | | Ensure that engine can be mounted at root (#4314)Piotr Sarnacki2012-03-131-0/+54
|/ / | | | | | | | | | | | | It's already fixed and the fix was actually in journey library, but with #4314 it reappeared second time, so probably this kind of integration test will be good to have to not allow it to sneak in after changes in journey or rails itself.
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-1313-57/+92
|\ \ | |/ |/|
| * Fix AM GuideAlexey Vakhov2012-03-131-1/+1
| | | | | | | | Use proc as default argument to recaculate recipients array every time
| * mark engines guide as wip [ci skip]Vijay Dev2012-03-131-0/+1
| |
| * copy-edit contributing guide [ci skip]Vijay Dev2012-03-131-2/+2
| |
| * [config guide] Add mass_assignment_sanitizer to Active Record config optionsRyan Bigg2012-03-121-0/+2
| |
| * Advise to keep secret token privateFilipe Moreira2012-03-121-0/+2
| |
| * Advise to keep secret token privateFilipe Moreira2012-03-121-0/+2
| |
| * Merge remote-tracking branch 'original_repo/master'Avi Tzurel2012-03-126-53/+65
| |\
| | * Add engines guide to documents.yamlRyan Bigg2012-03-111-0/+4
| | |
| | * [instrumentation] Add further action placeholdersRyan Bigg2012-03-111-0/+12
| | |
| | * [instrumentation guide] Cover deliver.action_mailer eventRyan Bigg2012-03-111-0/+18
| | |
| | * [instrumentation guide] Cover receive.action_mailer eventRyan Bigg2012-03-111-0/+27
| | |
| | * attr_accessor_with_default was deprecated and removed. Andrew France2012-03-111-49/+0
| | | | | | | | | Deprecated in 673372152032a886ba9196c69348386834590eab and removed in 9cafc28874a681082f9f7e1e445db91f195a25ae.
| | * fix fragment portion of some linksGrant McLean2012-03-102-3/+3
| | |
| | * Fix 'Security#Mass Assignment' URL typoAbe Voelker2012-03-091-1/+1
| | |
| * | Squash commits into a single commitAvi Tzurel2012-03-111-0/+2
| |/
| * Document validations and callbacks Array support for :if and :unless optionsJoão Britto2012-03-091-2/+16
| |
| * Close string quotesJoão Britto2012-03-091-1/+1
| |
* | Merge pull request #5397 from rafaelfranca/fix-scaffoldJosé Valim2012-03-134-4/+52
|\ \ | | | | | | Do not use the attributes hash in the scaffold functional tests
| * | Use the attributes hash explicitlyRafael Mendonça França2012-03-134-12/+44
| | |
| * | Do not use the attributes hash in the scaffold functional testsRafael Mendonça França2012-03-124-4/+20
| | |
* | | Actually commit the change!David Heinemeier Hansson2012-03-131-1/+0
| | |
* | | Undo unwarranted change to coding conventions. I am not a fan of the ↵David Heinemeier Hansson2012-03-131-0/+1
| | | | | | | | | | | | aesthetics of private/public at the root but more importantly, we should not be changing coding conventions with almost a decades worth of history at a whim. The conventions are there to have a consistent coding style, that is their primary purpose. When there is so much existing code with the existing style, any change will have to lift an enormous burden of proof as to why its overwhelmingly superior. That is not the case here, so this is being reverted.
* | | Fixed problem when fixture_path is not always defined (incidentally, only ↵Philip Arndt2012-03-131-1/+3
| | | | | | | | | | | | when ActiveRecord is according to test_help.rb).
* | | Fixes issue #5193 using the instructions provided in the issue.Philip Arndt2012-03-131-0/+3
| | |
* | | use AS::Logger so we are consistentAaron Patterson2012-03-121-1/+1
| | |
* | | allow people to specify custom formatters, use the default formatter in ↵Aaron Patterson2012-03-124-4/+10
|/ / | | | | | | production so that PID and timestamp are logged. fixes #5388
* | Add documentation for find_or_create_by_{attribute}! method.Andrew White2012-03-121-0/+2
| |
* | Merge pull request #5366 from parndt/fix_issue_5324José Valim2012-03-113-22/+22
|\ \ | | | | | | Fixes #5324 by removing default size options from input:text and default cols and rows options from textarea.
| * | Fixes #5324 by removing default size options from input:text and default ↵Philip Arndt2012-03-103-22/+22
| | | | | | | | | | | | cols and rows options from textarea.
* | | Merge pull request #5326 from lest/patch-2Michael Koziarski2012-03-102-5/+17
|\ \ \ | | | | | | | | configure how unverified request will be handled
| * | | configure how unverified request will be handledSergey Nartimov2012-03-092-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can be configured using `:with` option in `protect_from_forgery` method or `request_forgery_protection_method` config option possible values: - :reset_session (default) - :exception new applications are generated with: protect_from_forgery :with => :exception
* | | | Fix broken testsSantiago Pastorino2012-03-101-1/+2
| | | |
* | | | Change api_only to http_onlyCarlos Antonio da Silva2012-03-105-21/+20
| | | | | | | | | | | | | | | | [Carlos Antonio da Silva & Santiago Pastorino]
* | | | Add some docs for MiddlewareStackProxy methods and api_only!Carlos Antonio da Silva2012-03-103-5/+49
| |/ / |/| | | | | | | | [Carlos Antonio da Silva & Santiago Pastorino]
* | | Merge pull request #5356 from carlosantoniodasilva/rake-test-systemJosé Valim2012-03-094-106/+98
|\ \ \ | | | | | | | | Use one system call whenever possible, group rake and Dir.chdir calls
| * | | Use one system call whenever possible, group rake and Dir.chdir callsCarlos Antonio da Silva2012-03-084-106/+98
| | |/ | |/|
* / | Fix my name in the CHANGELOG to follow the conventionRafael Mendonça França2012-03-091-0/+5
|/ / | | | | | | Also add missing entries and use the formating convention
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-098-20/+59
|\ \
| * | Revert "Add rails glossary of common terms & concepts"Vijay Dev2012-03-082-428/+0
| | | | | | | | | | | | | | | | | | This reverts commit fd584a63deb8d2f1e8969d8527e7a9dbd9d68848. Reason: This is not suitable for a Rails guide in my opinion.
| * | Merge pull request #88 from kevingriffin/masterVijay Dev2012-03-071-5/+5
| |\ \ | | | | | | | | Correct "its" usage for "AJAX on Rails" page
| | * | Correct it's/its usage.Kevin Griffin2012-03-061-5/+5
| | | |