aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1324 from dmathieu/no_error_on_invalid_formatJosé Valim2011-05-261-1/+1
|\ | | | | Don't raise an exception if the format isn't recognized
| * don't raise an exception if the format isn't recognizeddmathieu2011-05-261-1/+1
| | | | | | | | Fixed while traveling to heuruko
* | Merge pull request #1311 from kuldarkrabbi/masterJosé Valim2011-05-251-1/+0
|\ \ | | | | | | action_view/template/handler.rb has been removed
| * | action_view/template/handler has been removedKuldar Krabbi2011-05-251-1/+0
| |/
* | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-2523-62/+62
|\ \ | |/ |/| | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/core_ext/kernel/requires.rb
| * fix minor spelling mistakes in commentsDmytrii Nagirniak2011-05-231-3/+3
| |
| * Remove extra white spaces on ActionPack docs.Sebastian Martinez2011-05-2322-53/+53
| |
| * Fixed documentation for scope with path.Anuj Dutta2011-05-221-2/+2
| |
| * fixes code highlight in shallow_path exampleDiego Plentz2011-05-191-4/+4
| |
* | Move SCSS generators and default templates from Rails to the Sass Railtie ↵tomhuda2011-05-241-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 ↵tomhuda2011-05-241-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 Kalderimis2011-05-251-0/+1
| | | | | | | | ActionPack
* | removed deprecated methods, and related tests, from ActionPackJosh Kalderimis2011-05-249-108/+3
| |
* | Redundant condition in compute_asset_host is redundant.Ernie Miller2011-05-241-3/+3
| |
* | Remaining cleanup from changes to AssetTagHelpertomhuda2011-05-244-12/+9
| |
* | Make sure that Sprockets::Helpers::RailsHelper can be foundwycats2011-05-232-1/+8
| |
* | Merge pull request #1241 from smartinez87/extra-spaceSantiago Pastorino2011-05-231-1/+1
|\ \ | | | | | | Remove extra white-space on exception message.
| * | Remove extra white-space on some exception messages.Sebastian Martinez2011-05-231-1/+1
| | |
* | | Move the last pockets of Sprockets stuff into the Sprockets directorywycats2011-05-234-23/+15
| | |
* | | Move javascript/css helpers into the Sprockets helper and just have them ↵wycats2011-05-232-43/+44
| | | | | | | | | | | | override the old behavior
* | | Start moving some logic from being embedded in AV into the Rails Sprockets ↵wycats2011-05-234-62/+58
|/ / | | | | | | extensions
* | Replace references to ActiveSupport::SecureRandom with just SecureRandom, ↵Jon Leighton2011-05-234-4/+4
| | | | | | | | and require 'securerandom' from the stdlib when active support is required.
* | Restructure TemplateAssertions-related code to eliminate circular requires.wycats2011-05-223-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=wycats2011-05-221-1/+2
| |
* | Merge branch '3-1-stable'Joshua Peek2011-05-221-15/+47
|\ \ | | | | | | | | | | | | | | | Conflicts: actionpack/actionpack.gemspec activemodel/activemodel.gemspec
| * | Add debug_asset supportJoshua Peek2011-05-221-15/+47
| | |
* | | Edited actionpack/lib/action_view/helpers/form_helper.rb via GitHubJosé Valim2011-05-221-0/+1
| | |
* | | Merge pull request #1189 from jmbejar/7c562d5e460d97b18e4f3367b3cfb13401732920José Valim2011-05-221-0/+19
|\ \ \ | |/ / |/| | Add method FormHelper#fields_for_with_index
| * | Add method fields_for_with_index to FormHelperJorge Bejar2011-05-211-0/+19
| | |
* | | Bump versions for rc1David Heinemeier Hansson2011-05-211-1/+1
| | |
* | | Correct example and expand on description of :shallow option for resourcesAndrew White2011-05-211-3/+7
| | |
* | | Merge pull request #1177 from joshk/ruby19_warningsJosé Valim2011-05-202-2/+0
|\ \ \ | |/ / |/| | Fixed some ruby 19 warnings
| * | fixed some ruby 19 warnings, including circular requires and variable name reuseJosh Kalderimis2011-05-212-2/+0
| | |
* | | Merge pull request #1151 from joshk/wrap_params_options_changeJosé Valim2011-05-191-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 Kalderimis2011-05-191-17/+17
| |/ / | | | | | | | | | :exclude to make it consistent with controller filters
* / / fixing sym and string cookie name, two cookies to browser bug.steve2011-05-191-3/+3
|/ /
* / Example Usage updated for actionpack and actionmailer.Arun Agrawal2011-05-191-2/+2
|/
* Dump and load rack-cache stuff.José Valim2011-05-171-2/+6
|
* Merge pull request #247 from goncalossilva/performance_testJeremy Kemper2011-05-171-13/+6
|\ | | | | Performance tests improved
| * Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-05-0875-1235/+1864
| |\ | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/testing/performance.rb
| * \ Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-04-1755-1759/+775
| |\ \
| * \ \ Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-04-035-30/+68
| |\ \ \
| * \ \ \ Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-03-304-24/+32
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-03-288-12/+64
| |\ \ \ \ \
| * | | | | | remove deprecated documentationGonçalo Silva2011-03-281-3/+0
| | | | | | |
| * | | | | | move "check for ruby-prof" from AD/testing/performance_test to ↵Gonçalo Silva2011-03-241-13/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | AS/testing/performance, where it is actually required
* | | | | | | Remove old call to sprockets contextJoshua Peek2011-05-171-9/+1
| | | | | | |
* | | | | | | Merge pull request #1093 from lucasmazza/patch-1José Valim2011-05-171-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Using the correct CSS compressor for the yui-compressor gem.
| * | | | | | | Using the correct CSS compressor for the yui-compressor gem.Lucas Mazza2011-05-161-1/+1
| | | | | | | |
* | | | | | | | Use anonymous? that works on both Ruby 1.8 and 1.9.José Valim2011-05-172-5/+7
| | | | | | | |