Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Fix handling SCRIPT_NAME from within mounted engine's | Piotr Sarnacki | 2012-08-11 | 7 | -41/+78 | |
* | | | | | Merge pull request #7321 from bogdan/refactor_routes_set | Santiago Pastorino | 2012-08-10 | 1 | -10/+7 | |
|\ \ \ \ \ | ||||||
| * | | | | | RouteSet: refactor internals | Bogdan Gusiev | 2012-08-10 | 1 | -10/+7 | |
* | | | | | | remove some artifacts of dependent_restrict_raises that I missed | Jon Leighton | 2012-08-10 | 2 | -2/+0 | |
* | | | | | | DRY up handling of dependent option | Jon Leighton | 2012-08-10 | 5 | -63/+22 | |
* | | | | | | Unprivatise all the things | Jon Leighton | 2012-08-10 | 7 | -170/+156 | |
* | | | | | | move dependency logic out of generated methods | Jon Leighton | 2012-08-10 | 7 | -65/+64 | |
* | | | | | | Clean up dependent option validation. | Jon Leighton | 2012-08-10 | 4 | -14/+7 | |
* | | | | | | Remove the dependent_restrict_raises option. | Jon Leighton | 2012-08-10 | 12 | -141/+87 | |
* | | | | | | Merge pull request #7286 from kennyj/fix_7191 | Rafael Mendonça França | 2012-08-10 | 2 | -13/+28 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix #7191. Remove unnecessary transaction when assigning has_one associations. | kennyj | 2012-08-08 | 2 | -13/+28 | |
* | | | | | | | Add 'X-Frame-Options' => 'SAMEORIGIN' and 'X-XSS-Protection' => '1; mode=bloc... | Santiago Pastorino | 2012-08-10 | 1 | -0/+6 | |
* | | | | | | | Merge pull request #7315 from brainopia/fix_assertion | Aaron Patterson | 2012-08-09 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | Test actual content of permanent cookie | brainopia | 2012-08-10 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | set the controller under test so we no longer need the reset! method | Aaron Patterson | 2012-08-09 | 1 | -38/+4 | |
* | | | | | | Merge pull request #7310 from amerine/master | Santiago Pastorino | 2012-08-09 | 1 | -8/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add html_escape note to CHANGELOG | Mark Turner | 2012-08-09 | 1 | -8/+1 | |
|/ / / / / / | ||||||
* | | | | | | Do not mark strip_tags result as html_safe | Santiago Pastorino | 2012-08-09 | 2 | -3/+3 | |
* | | | | | | push drawing once to it's own module | Aaron Patterson | 2012-08-09 | 1 | -32/+20 | |
* | | | | | | refactor the before_setup hooks to a module | Aaron Patterson | 2012-08-09 | 1 | -13/+12 | |
* | | | | | | switch callbacks to minitest hooks | Aaron Patterson | 2012-08-09 | 1 | -3/+6 | |
* | | | | | | Merge pull request #7302 from homakov/default_headers | Aaron Patterson | 2012-08-09 | 4 | -0/+38 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | some tests | Egor Homakov | 2012-08-09 | 1 | -0/+27 | |
| * | | | | | | introduce default_headers config | Egor Homakov | 2012-08-09 | 3 | -0/+11 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | initialize instance variables | Aaron Patterson | 2012-08-09 | 3 | -0/+22 | |
* | | | | | | use a sized buffer to prevent the queue being too large | Aaron Patterson | 2012-08-08 | 1 | -10/+10 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #7293 from Bertg/activemodel_naming_helpers_try_model_name... | Aaron Patterson | 2012-08-08 | 1 | -5/+3 | |
|\ \ \ \ \ | ||||||
| * | | | | | Naming helpers should first check if passed object responds to model_name | Bert Goethals | 2012-08-08 | 1 | -5/+3 | |
* | | | | | | Merge pull request #7294 from stevecj/fix-psql-reconnect-after-simulated-disc... | Rafael Mendonça França | 2012-08-08 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix only-once stub logic. | Steve Jorgensen | 2012-08-08 | 1 | -1/+1 | |
* | | | | | | | Remove highly uncommon option for moving the manifest path | David Heinemeier Hansson | 2012-08-08 | 1 | -3/+0 | |
* | | | | | | | Allow data attributes to be set as a first-level option for form_for, so you ... | David Heinemeier Hansson | 2012-08-08 | 3 | -0/+27 | |
* | | | | | | | Merge pull request #7292 from stevecj/fix-psql-reconnect-after-simulated-disc... | Rafael Mendonça França | 2012-08-08 | 1 | -8/+9 | |
|\| | | | | | | |/ / / / / |/| | | | | | ||||||
| * | | | | | Fix just-plain-wrongness of psql auto-reconnect test. | Steve Jorgensen | 2012-08-07 | 1 | -8/+9 | |
* | | | | | | Modernize the documentation for view caching somewhat | David Heinemeier Hansson | 2012-08-08 | 2 | -53/+23 | |
* | | | | | | Deprecate `button_to_function` and `link_to_function` helpers. | Rafael Mendonça França | 2012-08-07 | 3 | -2/+104 | |
* | | | | | | Remove antiquated example code | David Heinemeier Hansson | 2012-08-07 | 9 | -219/+0 | |
* | | | | | | Remove outdated examples and feature highlights | David Heinemeier Hansson | 2012-08-07 | 1 | -285/+0 | |
* | | | | | | Observers are no longer important enough to get this configuration option cal... | David Heinemeier Hansson | 2012-08-07 | 1 | -3/+0 | |
* | | | | | | Add back missing require | Rafael Mendonça França | 2012-08-07 | 1 | -0/+1 | |
* | | | | | | Fix the deprecation horizon. [ci skip] | Rafael Mendonça França | 2012-08-07 | 1 | -1/+1 | |
* | | | | | | Deprecate ActiveSupport::JSON::Variable | Erich Menge | 2012-08-07 | 3 | -0/+27 | |
|/ / / / / | ||||||
* / / / / | make assertions easier to track down | Aaron Patterson | 2012-08-07 | 1 | -9/+17 | |
|/ / / / | ||||||
* | | | | Revert "Merge pull request #7202 from asanghi/perform_deliveries_in_mail" | José Valim | 2012-08-07 | 4 | -23/+3 | |
* | | | | Revert "Merge pull request #7033 from kron4eg/master". Not a a fan at all of ... | David Heinemeier Hansson | 2012-08-07 | 3 | -76/+4 | |
* | | | | Revert "The application generator generates `public/humans.txt` with some bas... | David Heinemeier Hansson | 2012-08-07 | 3 | -14/+0 | |
* | | | | Merge pull request #7033 from kron4eg/master | Santiago Pastorino | 2012-08-07 | 3 | -4/+76 | |
|\ \ \ \ | ||||||
| * | | | | Restoring the '%' trim mode for ERb templates, allowing for a leading percent... | Artiom Di | 2012-08-07 | 3 | -4/+76 | |
* | | | | | defines String#indent [closes #7263] [Xavier Noria & Ace Suares] | Xavier Noria | 2012-08-07 | 5 | -0/+137 | |
|/ / / / | ||||||
* | | | | Merge pull request #7277 from sikachu/master-js-include-tag-fix | Rafael Mendonça França | 2012-08-06 | 3 | -6/+20 | |
|\ \ \ \ |