Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | Using Object#in? and Object#either? in various places | Prem Sichanugrist | 2011-04-11 | 5 | -7/+13 | |
| | | | | | | | | | | | | | | | | | | | | There're a lot of places in Rails source code which make a lot of sense to switching to Object#in? or Object#either? instead of using [].include?. | |||||
| | * | | | Make csrf_meta_tags use the tag helper | James Robinson | 2011-04-08 | 1 | -4/+6 | |
| | | | | | | | | | | | | | | | | | | | | Improved formatting of csrf_helper and improved test coverage | |||||
| | * | | | Merge branch 'master' of github.com:rails/rails | Aaron Patterson | 2011-04-07 | 1 | -1/+1 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of github.com:rails/rails: Cache flash now Revert "Use freeze instead of close!" Revert "Eagerly load Signed and Permanent cookies" cookies here Eagerly load Signed and Permanent cookies Use freeze instead of close! | |||||
| | | * | | | Cache flash now | Santiago Pastorino | 2011-04-07 | 1 | -1/+1 | |
| | | | | | | ||||||
| | | * | | | Revert "Use freeze instead of close!" | Santiago Pastorino | 2011-04-07 | 2 | -5/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 29592a7f09dda2e7e1e0a915d9230fe6a9b5c0af. | |||||
| | | * | | | Revert "Eagerly load Signed and Permanent cookies" | Santiago Pastorino | 2011-04-07 | 1 | -17/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit dffeda377021ba8691381195f5a2889f8e040b93. | |||||
| | | * | | | Eagerly load Signed and Permanent cookies | Santiago Pastorino | 2011-04-07 | 1 | -10/+17 | |
| | | | | | | ||||||
| | | * | | | Use freeze instead of close! | Santiago Pastorino | 2011-04-06 | 2 | -14/+5 | |
| | | | | | | ||||||
| | * | | | | getting the flash hash under test | Aaron Patterson | 2011-04-06 | 1 | -0/+4 | |
| | | | | | | ||||||
| | * | | | | favor composition over inheritance, have FlashHash delegate to a Hash | Aaron Patterson | 2011-04-06 | 1 | -7/+40 | |
| | |/ / / | ||||||
| | * | | | CookieJar should prefer composition over inheritance | Aaron Patterson | 2011-04-06 | 1 | -6/+10 | |
| | | | | | ||||||
| | * | | | Make process reuse the env var passed as argument | Santiago Pastorino | 2011-04-06 | 1 | -5/+4 | |
| | | | | | ||||||
| | * | | | raise if someone tries to modify the cookies when it was already streamed ↵ | Santiago Pastorino | 2011-04-06 | 1 | -0/+12 | |
| | | | | | | | | | | | | | | | | | | | | back to the client or converted to HTTP headers | |||||
| | * | | | Add ClosedError message to the initializer | Santiago Pastorino | 2011-04-06 | 3 | -5/+10 | |
| | | | | | ||||||
| | * | | | do not return html safe strings from auto_link | Aaron Patterson | 2011-04-05 | 1 | -2/+2 | |
| | | | | | ||||||
| | * | | | raise if someone tries to modify the flash when it was already streamed back ↵ | Santiago Pastorino | 2011-04-05 | 1 | -1/+19 | |
| | | |/ | | |/| | | | | | | | | | to the client or converted to HTTP headers | |||||
| | * | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-04-03 | 11 | -22/+29 | |
| | |\ \ | ||||||
| | | * | | s/ERb/ERB/g | Akira Matsuda | 2011-04-03 | 7 | -12/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | The author of ERB sais, his eRuby implementation was originally named "ERb/ERbLight" and then renamed to "ERB" when started bundled as a Ruby standard lib. http://www2a.biglobe.ne.jp/~seki/ruby/erb.html | |||||
| | | * | | Trivial fix to HTTP Digest auth MD5 example | Jon Cooper | 2011-03-31 | 1 | -1/+1 | |
| | | | | | ||||||
| | | * | | Explain in the method doc that you need to call respond_to at the class ↵ | Amaia Castro | 2011-03-31 | 1 | -0/+3 | |
| | | |/ | | | | | | | | | | | | | level in order to use respond_with. | |||||
| | | * | Fix grammar, formatting, and cross references | John Firebaugh | 2011-03-28 | 1 | -8/+8 | |
| | | | | ||||||
| | | * | Add docs for ActionController::Metal class methods | Gabriel Horner | 2011-03-28 | 1 | -1/+5 | |
| | | | | ||||||
| | * | | Implicit actions named not_implemented can be rendered | Santiago Pastorino | 2011-04-02 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | Unify sprockets config options | Joshua Peek | 2011-03-30 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge branch 'master' into sprockets | Joshua Peek | 2011-03-30 | 14 | -56/+117 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: railties/lib/rails/application/configuration.rb | |||||
| * \ \ \ | Merge branch 'master' into sprockets | Joshua Peek | 2011-03-30 | 2 | -2/+9 | |
| |\ \ \ \ | ||||||
| * | | | | | Seperate asset directories | Joshua Peek | 2011-03-29 | 1 | -1/+3 | |
| | | | | | | ||||||
| * | | | | | Rename option to config.asset_pipeline | Joshua Peek | 2011-03-29 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Change back to /assets prefix | Joshua Peek | 2011-03-29 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | Only add fingerprints if perform_caching is on | Joshua Peek | 2011-03-29 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Copy use_sprockets config | Joshua Peek | 2011-03-29 | 2 | -2/+3 | |
| | | | | | | ||||||
| * | | | | | Use sprockets helpers if config.use_sprockets is set | Joshua Peek | 2011-03-29 | 2 | -6/+22 | |
| | | | | | | ||||||
| * | | | | | Tests for SprocketsHelper | Joshua Peek | 2011-03-29 | 1 | -5/+11 | |
| | | | | | | ||||||
| * | | | | | Update sprockets path generation method | Joshua Peek | 2011-03-28 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Add SprocketsHelper | Joshua Peek | 2011-03-28 | 2 | -0/+79 | |
| | | | | | | ||||||
| * | | | | | Remove sprockets exception from main asset helpers | Joshua Peek | 2011-03-28 | 2 | -20/+0 | |
| | | | | | | ||||||
| * | | | | | Add sprockets md5s to asset tags | Joshua Peek | 2011-03-22 | 2 | -0/+20 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'master' of https://github.com/rails/rails into performance_test | Gonçalo Silva | 2011-04-03 | 5 | -30/+68 | |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | ||||||
| * | | | | | Improve docs. | José Valim | 2011-03-31 | 1 | -0/+31 | |
| | | | | | | ||||||
| * | | | | | pass respond_with options to controller render when using a template for api ↵ | Josh Kalderimis | 2011-03-31 | 3 | -5/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | navigation Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | | | | | only try to display an api template in responders if the request is a get or ↵ | Josh Kalderimis | 2011-03-31 | 1 | -4/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there are no errors Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | | | | | when using respond_with with an invalid resource and custom options, the ↵ | Josh Kalderimis | 2011-03-31 | 1 | -1/+2 | |
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | default response status and error messages should be returned Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | | | | use assert_equal so we get normal error messages along with our custom ↵ | Aaron Patterson | 2011-03-30 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | failure message | |||||
| * | | | | Make action_method? public and change implicit rendering to override it instead. | José Valim | 2011-03-30 | 2 | -19/+20 | |
| | | | | | ||||||
* | | | | | Merge branch 'master' of https://github.com/rails/rails into performance_test | Gonçalo Silva | 2011-03-30 | 4 | -24/+32 | |
|\| | | | | ||||||
| * | | | | Pass the proper method_name instead of hardcoding to action_name. | José Valim | 2011-03-29 | 2 | -9/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/metal/implicit_render.rb | |||||
| * | | | | Dont call authenticate_or_request_with_http_basic twice | David Heinemeier Hansson | 2011-03-29 | 1 | -4/+2 | |
| | | | | | ||||||
| * | | | | Update the wildcard route to be non-greedy by default, therefore be able to ↵ | Prem Sichanugrist | 2011-03-29 | 1 | -1/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | match the (.:format) segment [#6605 state:resolved] After some discussion with Andrew White, it seems like this is a better approach for handling a wildcard route. However, user can still bring back the old behavior by supplying `:format => false` to the route. Signed-off-by: Andrew White <andyw@pixeltrix.co.uk> | |||||
| * | | | | Fix examples | David Heinemeier Hansson | 2011-03-28 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Added Base.http_basic_authenticate_with to do simple http basic ↵ | David Heinemeier Hansson | 2011-03-28 | 1 | -14/+16 | |
| | |_|/ | |/| | | | | | | | | | | authentication with a single class method call [DHH] |