aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | remove some artifacts of dependent_restrict_raises that I missedJon Leighton2012-08-102-2/+0
* | | | DRY up handling of dependent optionJon Leighton2012-08-105-63/+22
* | | | Unprivatise all the thingsJon Leighton2012-08-107-170/+156
* | | | move dependency logic out of generated methodsJon Leighton2012-08-107-65/+64
* | | | Clean up dependent option validation.Jon Leighton2012-08-104-14/+7
* | | | Remove the dependent_restrict_raises option.Jon Leighton2012-08-1012-141/+87
* | | | Merge pull request #7286 from kennyj/fix_7191Rafael Mendonça França2012-08-102-13/+28
|\ \ \ \
| * | | | Fix #7191. Remove unnecessary transaction when assigning has_one associations.kennyj2012-08-082-13/+28
* | | | | Add 'X-Frame-Options' => 'SAMEORIGIN' and 'X-XSS-Protection' => '1; mode=bloc...Santiago Pastorino2012-08-101-0/+6
* | | | | Merge pull request #7315 from brainopia/fix_assertionAaron Patterson2012-08-091-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Test actual content of permanent cookiebrainopia2012-08-101-1/+1
|/ / / /
* | | | set the controller under test so we no longer need the reset! methodAaron Patterson2012-08-091-38/+4
* | | | Merge pull request #7310 from amerine/masterSantiago Pastorino2012-08-091-8/+1
|\ \ \ \
| * | | | Add html_escape note to CHANGELOGMark Turner2012-08-091-8/+1
|/ / / /
* | | | Do not mark strip_tags result as html_safeSantiago Pastorino2012-08-092-3/+3
* | | | push drawing once to it's own moduleAaron Patterson2012-08-091-32/+20
* | | | refactor the before_setup hooks to a moduleAaron Patterson2012-08-091-13/+12
* | | | switch callbacks to minitest hooksAaron Patterson2012-08-091-3/+6
* | | | Merge pull request #7302 from homakov/default_headersAaron Patterson2012-08-094-0/+38
|\ \ \ \
| * | | | some testsEgor Homakov2012-08-091-0/+27
| * | | | introduce default_headers configEgor Homakov2012-08-093-0/+11
| | |/ / | |/| |
* | | | initialize instance variablesAaron Patterson2012-08-093-0/+22
* | | | use a sized buffer to prevent the queue being too largeAaron Patterson2012-08-081-10/+10
|/ / /
* | | Merge pull request #7293 from Bertg/activemodel_naming_helpers_try_model_name...Aaron Patterson2012-08-081-5/+3
|\ \ \
| * | | Naming helpers should first check if passed object responds to model_nameBert Goethals2012-08-081-5/+3
* | | | Merge pull request #7294 from stevecj/fix-psql-reconnect-after-simulated-disc...Rafael Mendonça França2012-08-081-1/+1
|\ \ \ \
| * | | | Fix only-once stub logic.Steve Jorgensen2012-08-081-1/+1
* | | | | Remove highly uncommon option for moving the manifest pathDavid Heinemeier Hansson2012-08-081-3/+0
* | | | | Allow data attributes to be set as a first-level option for form_for, so you ...David Heinemeier Hansson2012-08-083-0/+27
* | | | | Merge pull request #7292 from stevecj/fix-psql-reconnect-after-simulated-disc...Rafael Mendonça França2012-08-081-8/+9
|\| | | | | |/ / / |/| | |
| * | | Fix just-plain-wrongness of psql auto-reconnect test.Steve Jorgensen2012-08-071-8/+9
* | | | Modernize the documentation for view caching somewhatDavid Heinemeier Hansson2012-08-082-53/+23
* | | | Deprecate `button_to_function` and `link_to_function` helpers.Rafael Mendonça França2012-08-073-2/+104
* | | | Remove antiquated example codeDavid Heinemeier Hansson2012-08-079-219/+0
* | | | Remove outdated examples and feature highlightsDavid Heinemeier Hansson2012-08-071-285/+0
* | | | Observers are no longer important enough to get this configuration option cal...David Heinemeier Hansson2012-08-071-3/+0
* | | | Add back missing requireRafael Mendonça França2012-08-071-0/+1
* | | | Fix the deprecation horizon. [ci skip]Rafael Mendonça França2012-08-071-1/+1
* | | | Deprecate ActiveSupport::JSON::VariableErich Menge2012-08-073-0/+27
|/ / /
* / / make assertions easier to track downAaron Patterson2012-08-071-9/+17
|/ /
* | Revert "Merge pull request #7202 from asanghi/perform_deliveries_in_mail"José Valim2012-08-074-23/+3
* | Revert "Merge pull request #7033 from kron4eg/master". Not a a fan at all of ...David Heinemeier Hansson2012-08-073-76/+4
* | Revert "The application generator generates `public/humans.txt` with some bas...David Heinemeier Hansson2012-08-073-14/+0
* | Merge pull request #7033 from kron4eg/masterSantiago Pastorino2012-08-073-4/+76
|\ \
| * | Restoring the '%' trim mode for ERb templates, allowing for a leading percent...Artiom Di2012-08-073-4/+76
* | | defines String#indent [closes #7263] [Xavier Noria & Ace Suares]Xavier Noria2012-08-075-0/+137
|/ /
* | Merge pull request #7277 from sikachu/master-js-include-tag-fixRafael Mendonça França2012-08-063-6/+20
|\ \
| * | Rearrange example output of javascript_include_tagPrem Sichanugrist2012-08-061-2/+2
| * | Do not include application.js if it doesn't existsPrem Sichanugrist2012-08-063-4/+18
|/ /
* | Merge pull request #7275 from asanghi/perform_deliveries_in_mailRafael Mendonça França2012-08-061-0/+7
|\ \