| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #1448 from ernie/attr_internal_require | José Valim | 2011-06-01 | 1 | -0/+2 |
| |\ | | | | | Require attr_internal before using in ActionView::Helpers | ||||
| | * | Require attr_internal before using in ActionView::Helpers | Ernie Miller | 2011-06-01 | 1 | -0/+2 |
| | | | |||||
| * | | Remove autoload for a couple of constants which don't exist anymore | brainopia | 2011-05-31 | 1 | -5/+0 |
| | | | |||||
| * | | Corrected some typos and American vs. Queen's English issues | Lee Reilly | 2011-05-29 | 2 | -6/+6 |
| | | | |||||
| * | | Merge pull request #1203 from dchelimsky/stringify-parameter-values-in-tests | José Valim | 2011-05-28 | 2 | -0/+29 |
| |\ \ | | | | | | | Stringify param values in controller tests. | ||||
| | * | | use to_param (and change method to name accordingly) | David Chelimsky | 2011-05-22 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | | - exclude Rack::Test::UploadedFile to pass existing tests. Are there any other types we're missing? | ||||
| | * | | Stringify param values in controller tests. | David Chelimsky | 2011-05-22 | 2 | -0/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This reduces false positives that come from using ints in params in tests, which do not get converted to strings in the tests. In implementations going through rack, they do get converted to strings. - David Chelimsky and Sam Umbach | ||||
| * | | | Fix typo in test. | Andrés Botero | 2011-05-28 | 1 | -1/+1 |
| | | | | |||||
| * | | | fixed asset_paths when called from sprockets for relative_url_root | jacott | 2011-05-28 | 3 | -11/+13 |
| | | | | |||||
| * | | | Merge pull request #1324 from dmathieu/no_error_on_invalid_format | José Valim | 2011-05-26 | 2 | -1/+7 |
| |\ \ \ | | | | | | | | | Don't raise an exception if the format isn't recognized | ||||
| | * | | | don't raise an exception if the format isn't recognized | dmathieu | 2011-05-26 | 2 | -1/+7 |
| | | | | | | | | | | | | | | | | | Fixed while traveling to heuruko | ||||
| * | | | | Merge pull request #1311 from kuldarkrabbi/master | José Valim | 2011-05-25 | 1 | -1/+0 |
| |\ \ \ \ | | | | | | | | | | | action_view/template/handler.rb has been removed | ||||
| | * | | | | action_view/template/handler has been removed | Kuldar Krabbi | 2011-05-25 | 1 | -1/+0 |
| | |/ / / | |||||
| * | | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-25 | 24 | -63/+63 |
| |\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/core_ext/kernel/requires.rb | ||||
| | * | | | changed http://api.rubyonrails.com to http://api.rubyonrails.org in readme ↵ | Karunakar (Ruby) | 2011-05-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | files | ||||
| | * | | | fix minor spelling mistakes in comments | Dmytrii Nagirniak | 2011-05-23 | 1 | -3/+3 |
| | | | | | |||||
| | * | | | Remove extra white spaces on ActionPack docs. | Sebastian Martinez | 2011-05-23 | 22 | -53/+53 |
| | | | | | |||||
| | * | | | 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 |
| | | | | | |||||
| * | | | | Move SCSS generators and default templates from Rails to the Sass Railtie ↵ | tomhuda | 2011-05-24 | 1 | -19/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (d435726312601edb3ba6f97b34f562221f72c1f8). * Sass gem registers a compressor * Sass gem registers generators for assets and scaffold * Create a default stylesheet_engine ("css") for apps that remove the Sass gem | ||||
| * | | | | Change compressor API so that plugins can register default compressors for ↵ | tomhuda | 2011-05-24 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | | their stylesheet or JS engines and still allow the user to turn off compression | ||||
| * | | | | corrected the ActionMailer tests which broke due to some code removed from ↵ | Josh Kalderimis | 2011-05-25 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | ActionPack | ||||
| * | | | | removed deprecated methods, and related tests, from ActionPack | Josh Kalderimis | 2011-05-24 | 17 | -213/+6 |
| | | | | | |||||
| * | | | | fixes Rake::GemPackageTask deprecation warnings from rake 0.9.0 | Vijay Dev | 2011-05-24 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Redundant condition in compute_asset_host is redundant. | Ernie Miller | 2011-05-24 | 1 | -3/+3 |
| | |_|/ |/| | | |||||
| * | | | Remaining cleanup from changes to AssetTagHelper | tomhuda | 2011-05-24 | 4 | -12/+9 |
| | | | | |||||
| * | | | Make sure that Sprockets::Helpers::RailsHelper can be found | wycats | 2011-05-23 | 2 | -1/+8 |
| | | | | |||||
| * | | | Merge pull request #1241 from smartinez87/extra-space | Santiago Pastorino | 2011-05-23 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | Remove extra white-space on exception message. | ||||
| | * | | | Remove extra white-space on some exception messages. | Sebastian Martinez | 2011-05-23 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Move the last pockets of Sprockets stuff into the Sprockets directory | wycats | 2011-05-23 | 5 | -25/+16 |
| | | | | | |||||
| * | | | | Move javascript/css helpers into the Sprockets helper and just have them ↵ | wycats | 2011-05-23 | 3 | -55/+56 |
| | | | | | | | | | | | | | | | | | override the old behavior | ||||
| * | | | | Start moving some logic from being embedded in AV into the Rails Sprockets ↵ | wycats | 2011-05-23 | 5 | -62/+60 |
| |/ / / | | | | | | | | | | extensions | ||||
| * | | | Replace references to ActiveSupport::SecureRandom with just SecureRandom, ↵ | Jon Leighton | 2011-05-23 | 6 | -8/+8 |
| | | | | | | | | | | | | | and require 'securerandom' from the stdlib when active support is required. | ||||
| * | | | Add entry to AP changelog | Sebastian Martinez | 2011-05-23 | 1 | -0/+2 |
| | | | | |||||
| * | | | Merge pull request #1228 from fcheung/db_time_fix2 | José Valim | 2011-05-23 | 1 | -0/+26 |
| |\ \ \ | | | | | | | | | Take into account time spent in AR even if a redirect occurs or if it is after the render | ||||
| | * | | | Take into account time spent in AR even if a redirect occurs or if it is ↵ | Frederick Cheung | 2011-05-23 | 1 | -0/+26 |
| | | | | | | | | | | | | | | | | | after the render | ||||
| * | | | | Bump Rack version | wycats | 2011-05-22 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Eliminate uninitialized instance variable warning | wycats | 2011-05-22 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Prepare the context in URLHelperTest so that there are no required ↵ | wycats | 2011-05-22 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | uninitialized instance variables | ||||
| * | | | | Merge pull request #1222 from arunagw/sprockets-fixes | José Valim | 2011-05-22 | 2 | -8/+0 |
| |\ \ \ \ | | | | | | | | | | | We don't need to load version any more as Sprockets.beta8 is included. | ||||
| | * | | | | We don't need to load version any more as Sprockets.beta8 is included. | Arun Agrawal | 2011-05-23 | 2 | -8/+0 |
| | | | | | | |||||
| * | | | | | Always initialize @title in caching test to avoid uninitialized instance ↵ | wycats | 2011-05-22 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | variable warning | ||||
| * | | | | | 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. | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |
path: root/actionpack