aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Expand)AuthorAgeFilesLines
* Expand changelog and upgrading rails guide with IdentityMap infoCarlos Antonio da Silva2012-03-131-0/+4
* Remove IdentityMapCarlos Antonio da Silva2012-03-133-13/+0
* Add sprockets-rails to generated Gemfile. This should be reverted after sproc...Guillermo Iguaran2012-03-131-0/+2
* The sprockets railtie was moved to sprockets/rails/railtieGuillermo Iguaran2012-03-134-4/+4
* Merge pull request #5415 from rafaelfranca/refactorJosé Valim2012-03-133-9/+9
|\
| * 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 repositoryPrem Sichanugrist2012-03-1313-152/+6
* | | 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 ex...Piotr Sarnacki2012-03-131-10/+0
* | | 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
|/ /
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-1313-57/+92
|\ \ | |/ |/|
| * Fix AM GuideAlexey Vakhov2012-03-131-1/+1
| * 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
| | * 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
|\ \
| * | 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 aestheti...David Heinemeier Hansson2012-03-131-0/+1
* | | Fixed problem when fixture_path is not always defined (incidentally, only whe...Philip Arndt2012-03-131-1/+3
* | | 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 produ...Aaron Patterson2012-03-124-4/+10
|/ /
* | 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...Philip Arndt2012-03-103-22/+22
* | | Merge pull request #5326 from lest/patch-2Michael Koziarski2012-03-102-5/+17
|\ \ \
| * | | configure how unverified request will be handledSergey Nartimov2012-03-092-5/+17
* | | | Fix broken testsSantiago Pastorino2012-03-101-1/+2
* | | | Change api_only to http_onlyCarlos Antonio da Silva2012-03-105-21/+20
* | | | Add some docs for MiddlewareStackProxy methods and api_only!Carlos Antonio da Silva2012-03-103-5/+49
| |/ / |/| |
* | | 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 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
|/ /