| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | Restructure TemplateAssertions-related code to eliminate circular requires. | wycats | 2011-05-22 | 3 | -20/+13 | |
| | | | | | | | | | | | | | | | | 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 | |
| |/ / / / | ||||||
| * | | | | Merge branch '3-1-stable' | Joshua Peek | 2011-05-22 | 5 | -18/+60 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/actionpack.gemspec activemodel/activemodel.gemspec | |||||
| | * | | | | Require sprockets beta 8 | Joshua Peek | 2011-05-22 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | Add debug_asset support | Joshua Peek | 2011-05-22 | 4 | -17/+58 | |
| | | | | | | ||||||
| | * | | | | Lock to stable sprockets beta | Joshua Peek | 2011-05-22 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | Fix I18n dependency as final is out. | José Valim | 2011-05-22 | 1 | -1/+1 | |
| | | |_|/ | |/| | | ||||||
| * | | | | Revert "Take into account time spent in AR even if a redirect occurs or if ↵ | David Heinemeier Hansson | 2011-05-22 | 1 | -26/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | it is after the render" because it's causing test failures about missing db_during_render. This reverts commit 60b55baca9e381deb3a0a85580f089f4caf551d4. | |||||
| * | | | | Make sure that we're able to run Action Pack test standalone. | Prem Sichanugrist | 2011-05-22 | 2 | -2/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sprocket was trying to look for these two things: * `Rails::VERSION::STRING` * `.initializer(str)` in `Rails::Engine` This commit added require to version.rb into Abstract Unit, and mocking the `Rails::Engine.initializer` in `sprockets_helper_test.rb` | |||||
| * | | | | Take into account time spent in AR even if a redirect occurs or if it is ↵ | Frederick Cheung | 2011-05-22 | 1 | -0/+26 | |
| | |/ / |/| | | | | | | | | after the render | |||||
| * | | | Move I18n dependency back to ActiveSupport. | José Valim | 2011-05-22 | 1 | -1/+0 | |
| | | | | ||||||
| * | | | Edited actionpack/lib/action_view/helpers/form_helper.rb via GitHub | José Valim | 2011-05-22 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | Merge pull request #1189 from jmbejar/7c562d5e460d97b18e4f3367b3cfb13401732920 | José Valim | 2011-05-22 | 2 | -0/+144 | |
| |\ \ \ | |/ / |/| | | Add method FormHelper#fields_for_with_index | |||||
| | * | | Add method fields_for_with_index to FormHelper | Jorge Bejar | 2011-05-21 | 2 | -0/+144 | |
| | | | | ||||||
| * | | | Bump versions for rc1 | David Heinemeier Hansson | 2011-05-21 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge pull request #1165 from arunagw/rubyforge_remove | José Valim | 2011-05-21 | 1 | -1/+0 | |
| |\ \ \ | | | | | | | | | Not updating rubyforge for new versions. | |||||
| | * | | | Not updating rubyforge for new versions. Result of "gem list -d rails" is ↵ | Arun Agrawal | 2011-05-20 | 1 | -1/+0 | |
| | |/ / | | | | | | | | | | not useful. | |||||
| * | | | Correct example and expand on description of :shallow option for resources | Andrew White | 2011-05-21 | 1 | -3/+7 | |
| | | | | ||||||
| * | | | Merge pull request #1177 from joshk/ruby19_warnings | José Valim | 2011-05-20 | 2 | -2/+0 | |
| |\ \ \ | | | | | | | | | Fixed some ruby 19 warnings | |||||
| | * | | | fixed some ruby 19 warnings, including circular requires and variable name reuse | Josh Kalderimis | 2011-05-21 | 2 | -2/+0 | |
| | | | | | ||||||
| * | | | | Temporarily ship with ContentLength middleware. | José Valim | 2011-05-20 | 1 | -1/+1 | |
| | |/ / |/| | | ||||||
| * | | | Sprockets version update. | Arun Agrawal | 2011-05-19 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge pull request #1151 from joshk/wrap_params_options_change | José Valim | 2011-05-19 | 3 | -26/+26 | |
| |\ \ \ | | | | | | | | | renamed the wrap_parameters :only and :except options to :include and :ex | |||||
| | * | | | renamed the wrap_parameters :only and :except options to :include and ↵ | Josh Kalderimis | 2011-05-19 | 3 | -26/+26 | |
| | |/ / | | | | | | | | | | :exclude to make it consistent with controller filters | |||||
| * | | | adding test | steve | 2011-05-19 | 1 | -4/+8 | |
| | | | | ||||||
| * | | | fixing sym and string cookie name, two cookies to browser bug. | steve | 2011-05-19 | 1 | -3/+3 | |
| |/ / | ||||||
| * | | Example Usage updated for actionpack and actionmailer. | Arun Agrawal | 2011-05-19 | 2 | -11/+11 | |
| | | | ||||||
| * | | README updated for for => each | Arun Agrawal | 2011-05-19 | 1 | -3/+3 | |
| |/ | ||||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-18 | 1 | -1/+1 | |
| |\ | ||||||
| | * | fix coding error in readme reported in rails GH #980 | Vijay Dev | 2011-05-17 | 1 | -1/+1 | |
| | | | ||||||
| * | | Update Rack::Mount to 0.8.1 | Prem Sichanugrist | 2011-05-18 | 1 | -1/+1 | |
| | | | ||||||
| * | | Dump and load rack-cache stuff. | José Valim | 2011-05-17 | 2 | -2/+27 | |
| | | | ||||||
| * | | 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 | 111 | -1590/+2738 | |
| | |\ \ | | | | | | | | | | | | | | | | | 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 | 118 | -3441/+1347 | |
| | |\ \ \ | ||||||
| | * \ \ \ | Merge branch 'master' of https://github.com/rails/rails into performance_test | Gonçalo Silva | 2011-04-03 | 10 | -32/+132 | |
| | |\ \ \ \ | ||||||
| | * \ \ \ \ | Merge branch 'master' of https://github.com/rails/rails into performance_test | Gonçalo Silva | 2011-03-30 | 9 | -28/+127 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge branch 'master' of https://github.com/rails/rails into performance_test | Gonçalo Silva | 2011-03-28 | 13 | -14/+191 | |
| | |\ \ \ \ \ \ | ||||||
| | * | | | | | | | 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 | |||||
| * | | | | | | | | Bump sprockets dependency | Joshua Peek | 2011-05-17 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Remove old call to sprockets context | Joshua Peek | 2011-05-17 | 1 | -9/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge pull request #1093 from lucasmazza/patch-1 | José Valim | 2011-05-17 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Using the correct CSS compressor for the yui-compressor gem. | |||||
| | * | | | | | | | | Using the correct CSS compressor for the yui-compressor gem. | Lucas Mazza | 2011-05-16 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Use anonymous? that works on both Ruby 1.8 and 1.9. | José Valim | 2011-05-17 | 2 | -5/+7 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | add more robust test for wrapping params with anonymous class | David Chelimsky | 2011-05-17 | 3 | -28/+51 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Add fix for error when an anonymous controller subclasses ApplicationController | Andy Lindeman | 2011-05-17 | 1 | -1/+4 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | better test name | David Chelimsky | 2011-05-17 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | add failing test for https://github.com/rails/rails/issues/1089 | David Chelimsky | 2011-05-17 | 1 | -0/+7 | |
| |/ / / / / / / / | ||||||
| * | | | | | | | | Merge pull request #570 from sikachu/decouple_actionpack | José Valim | 2011-05-15 | 3 | -14/+12 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Make ParamsWrapper use a well-defined API and not rely on AR methods | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |
path: root/actionpack