| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #1324 from dmathieu/no_error_on_invalid_format | José Valim | 2011-05-26 | 1 | -1/+1 |
| |\ | | | | | 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 | 1 | -1/+1 |
| | | | | | | | | | 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 | 23 | -62/+62 |
| |\ \ | |/ |/| | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/core_ext/kernel/requires.rb | ||||
| | * | 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 | 9 | -108/+3 |
| | | | |||||
| * | | 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 | 4 | -23/+15 |
| | | | | |||||
| * | | | Move javascript/css helpers into the Sprockets helper and just have them ↵ | wycats | 2011-05-23 | 2 | -43/+44 |
| | | | | | | | | | | | | | override the old behavior | ||||
| * | | | Start moving some logic from being embedded in AV into the Rails Sprockets ↵ | wycats | 2011-05-23 | 4 | -62/+58 |
| |/ / | | | | | | | extensions | ||||
| * | | Replace references to ActiveSupport::SecureRandom with just SecureRandom, ↵ | Jon Leighton | 2011-05-23 | 4 | -4/+4 |
| | | | | | | | | | and require 'securerandom' from the stdlib when active support is required. | ||||
| * | | 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 | 1 | -15/+47 |
| |\ \ | | | | | | | | | | | | | | | | Conflicts: actionpack/actionpack.gemspec activemodel/activemodel.gemspec | ||||
| | * | | Add debug_asset support | Joshua Peek | 2011-05-22 | 1 | -15/+47 |
| | | | | |||||
| * | | | 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 | 1 | -0/+19 |
| |\ \ \ | |/ / |/| | | Add method FormHelper#fields_for_with_index | ||||
| | * | | Add method fields_for_with_index to FormHelper | Jorge Bejar | 2011-05-21 | 1 | -0/+19 |
| | | | | |||||
| * | | | Bump versions for rc1 | David Heinemeier Hansson | 2011-05-21 | 1 | -1/+1 |
| | | | | |||||
| * | | | 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 |
| | | | | |||||
| * | | | Merge pull request #1151 from joshk/wrap_params_options_change | José Valim | 2011-05-19 | 1 | -17/+17 |
| |\ \ \ | | | | | | | | | 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 | 1 | -17/+17 |
| | |/ / | | | | | | | | | | :exclude to make it consistent with controller filters | ||||
| * / / | 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 | 1 | -2/+2 |
| |/ | |||||
| * | 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 | 75 | -1235/+1864 |
| | |\ | | | | | | | | | | | | | 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 | 55 | -1759/+775 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' of https://github.com/rails/rails into performance_test | Gonçalo Silva | 2011-04-03 | 5 | -30/+68 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' of https://github.com/rails/rails into performance_test | Gonçalo Silva | 2011-03-30 | 4 | -24/+32 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' of https://github.com/rails/rails into performance_test | Gonçalo Silva | 2011-03-28 | 8 | -12/+64 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | 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 | ||||
| * | | | | | | | 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 |
| | | | | | | | | | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |