| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-25 | 7 | -24/+24 |
| |\ | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/core_ext/kernel/requires.rb | ||||
| | * | Remove extra white spaces on ActionPack docs. | Sebastian Martinez | 2011-05-23 | 7 | -18/+18 |
| | | | |||||
| | * | Fixed documentation for scope with path. | Anuj Dutta | 2011-05-22 | 1 | -2/+2 |
| | | | |||||
| | * | fixes code highlight in shallow_path example | Diego Plentz | 2011-05-19 | 1 | -4/+4 |
| | | | |||||
| * | | removed deprecated methods, and related tests, from ActionPack | Josh Kalderimis | 2011-05-24 | 5 | -46/+3 |
| | | | |||||
| * | | Remove extra white-space on some exception messages. | Sebastian Martinez | 2011-05-23 | 1 | -1/+1 |
| | | | |||||
| * | | Replace references to ActiveSupport::SecureRandom with just SecureRandom, ↵ | Jon Leighton | 2011-05-23 | 2 | -2/+2 |
| | | | | | | | | | and require 'securerandom' from the stdlib when active support is required. | ||||
| * | | Restructure TemplateAssertions-related code to eliminate circular requires. | wycats | 2011-05-22 | 2 | -14/+6 |
| | | | | | | | Also, no need to include dependencies in AS::Concerns inside included blocks. | ||||
| * | | Make :status an attr_reader to avoid unnecessary warning when replacing status= | wycats | 2011-05-22 | 1 | -1/+2 |
| | | | |||||
| * | | Correct example and expand on description of :shallow option for resources | Andrew White | 2011-05-21 | 1 | -3/+7 |
| | | | |||||
| * | | fixing sym and string cookie name, two cookies to browser bug. | steve | 2011-05-19 | 1 | -3/+3 |
| |/ | |||||
| * | Dump and load rack-cache stuff. | José Valim | 2011-05-17 | 1 | -2/+6 |
| | | |||||
| * | Merge pull request #247 from goncalossilva/performance_test | Jeremy Kemper | 2011-05-17 | 1 | -13/+6 |
| |\ | | | | | Performance tests improved | ||||
| | * | Merge branch 'master' of https://github.com/rails/rails into performance_test | Gonçalo Silva | 2011-05-08 | 14 | -101/+145 |
| | |\ | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/testing/performance.rb | ||||
| | * \ | Merge branch 'master' of https://github.com/rails/rails into performance_test | Gonçalo Silva | 2011-04-17 | 9 | -257/+134 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' of https://github.com/rails/rails into performance_test | Gonçalo Silva | 2011-04-03 | 1 | -3/+3 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' of https://github.com/rails/rails into performance_test | Gonçalo Silva | 2011-03-30 | 1 | -1/+7 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' of https://github.com/rails/rails into performance_test | Gonçalo Silva | 2011-03-28 | 1 | -1/+1 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | remove deprecated documentation | Gonçalo Silva | 2011-03-28 | 1 | -3/+0 |
| | | | | | | | | |||||
| | * | | | | | | move "check for ruby-prof" from AD/testing/performance_test to ↵ | Gonçalo Silva | 2011-03-24 | 1 | -13/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AS/testing/performance, where it is actually required | ||||
| * | | | | | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-14 | 5 | -34/+35 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/date_helper.rb railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt | ||||
| | * | | | | | | | minor edits after going through what's new in docrails | Xavier Noria | 2011-05-14 | 1 | -2/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Follow code conventions on docs | Sebastian Martinez | 2011-05-10 | 2 | -5/+5 |
| | | | | | | | | | |||||
| | * | | | | | | | Missing an end in routing docs | James Miller | 2011-05-09 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | more fixed-fonts here | Sebastian Martinez | 2011-05-09 | 1 | -23/+23 |
| | | | | | | | | | |||||
| | * | | | | | | | added some fixed fonts | Sebastian Martinez | 2011-05-09 | 1 | -3/+3 |
| | | | | | | | | | |||||
| | * | | | | | | | Update the description of the :path option to #resources to reflect that it ↵ | Jacob Poulsgaard Tjoernholm | 2011-05-06 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sets the actual path, not a prefix. Most instances were already fixed. | ||||
| | * | | | | | | | minor correction to the ActionDispatch::Http::URL subdomain docs | Josh Kalderimis | 2011-05-04 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | typo | Jason Dew | 2011-05-13 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix previous commit by allowing a proc to be given as response_body. This is ↵ | José Valim | 2011-05-10 | 2 | -29/+53 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deprecated and is going to be removed in future releases. | ||||
| * | | | | | | | | prepend the assets route instead of appending, closes #436 | José Valim | 2011-05-08 | 1 | -3/+6 |
| | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | | Don't pluralize, camelize. | José Valim | 2011-05-06 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Only show dump of regular env methods on exception screen (not all the rack ↵ | David Heinemeier Hansson | 2011-05-04 | 2 | -5/+6 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | crap) [DHH] | ||||
| * | | | | | | Merge pull request #387 from smartinez87/remove_method. | José Valim | 2011-05-04 | 1 | -2/+3 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Use #remove_possible_method instead | ||||
| | * | | | | | | Use #remove_possible_method instead here | Sebastian Martinez | 2011-05-04 | 1 | -2/+3 |
| | | | | | | | | |||||
| * | | | | | | | Fix renew feature on cookies. | José Valim | 2011-05-04 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Fix .subdomain regression. | José Valim | 2011-05-04 | 1 | -1/+1 |
| |/ / / / / / | |||||
| * | | | | | | cache strings in the AST for faster comparison than include? | Aaron Patterson | 2011-05-03 | 1 | -6/+3 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #377 from joshk/rails_legacy_mapper_message. | José Valim | 2011-05-03 | 1 | -0/+5 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | raise an error if the old router draw method is used | ||||
| | * | | | | | | raise an error if the old router draw method is used, along with a message ↵ | Josh Kalderimis | 2011-05-03 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | advising them to either upgrade their routes or add rails_legacy_mapper to their Gemfile | ||||
| * | | | | | | | Sets the HTTP charset parameter for rescue response. | Matias Korhonen | 2011-05-03 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Rescues template HTML5 doctype and the utf8 charset meta tag, and better ↵ | Matias Korhonen | 2011-05-03 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | font choices for Mac users. | ||||
| * | | | | | | | Static middleware accepts cache control. | José Valim | 2011-05-03 | 1 | -4/+4 |
| |/ / / / / / | |||||
| * | | | | | | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2011-05-02 | 2 | -5/+24 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | More performance optimizations. | José Valim | 2011-05-03 | 1 | -5/+0 |
| | | | | | | | | |||||
| | * | | | | | | Improve performance for filtered parameters and add tests. | José Valim | 2011-05-03 | 1 | -0/+5 |
| | | | | | | | | |||||
| | * | | | | | | Allow ignore_accept_header through configuration option. | José Valim | 2011-05-02 | 1 | -0/+2 |
| | | | | | | | | |||||
| | * | | | | | | Add ignore_accept_header config to AD::Request. | José Valim | 2011-05-02 | 1 | -5/+22 |
| | | | | | | | | |||||
| * | | | | | | | Flunk makes a lot more sense, doesnt it (hat tip @tenderlove) | David Heinemeier Hansson | 2011-05-02 | 1 | -1/+1 |
| |/ / / / / / | |||||
| * | | | | | | Explicitly define main_app proxy | Piotr Sarnacki | 2011-04-25 | 1 | -2/+1 |
| | | | | | | | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |