aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1324 from dmathieu/no_error_on_invalid_formatJosé Valim2011-05-262-1/+7
|\ | | | | Don't raise an exception if the format isn't recognized
| * don't raise an exception if the format isn't recognizeddmathieu2011-05-262-1/+7
| | | | | | | | 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-2524-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-241-1/+1
| | | | | | | | files
| * 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-2417-213/+6
| |
* | fixes Rake::GemPackageTask deprecation warnings from rake 0.9.0Vijay Dev2011-05-241-2/+2
| |
* | 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-235-25/+16
| | |
* | | Move javascript/css helpers into the Sprockets helper and just have them ↵wycats2011-05-233-55/+56
| | | | | | | | | | | | override the old behavior
* | | Start moving some logic from being embedded in AV into the Rails Sprockets ↵wycats2011-05-235-62/+60
|/ / | | | | | | extensions
* | Replace references to ActiveSupport::SecureRandom with just SecureRandom, ↵Jon Leighton2011-05-236-8/+8
| | | | | | | | and require 'securerandom' from the stdlib when active support is required.
* | Add entry to AP changelogSebastian Martinez2011-05-231-0/+2
| |
* | Merge pull request #1228 from fcheung/db_time_fix2José Valim2011-05-231-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 Cheung2011-05-231-0/+26
| | | | | | | | | | | | after the render
* | | Bump Rack versionwycats2011-05-221-1/+1
| | |
* | | Eliminate uninitialized instance variable warningwycats2011-05-221-2/+2
| | |
* | | Prepare the context in URLHelperTest so that there are no required ↵wycats2011-05-221-0/+2
| | | | | | | | | | | | uninitialized instance variables
* | | Merge pull request #1222 from arunagw/sprockets-fixesJosé Valim2011-05-222-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 Agrawal2011-05-232-8/+0
| | | |
* | | | Always initialize @title in caching test to avoid uninitialized instance ↵wycats2011-05-221-0/+3
| | | | | | | | | | | | | | | | variable warning
* | | | 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-225-18/+60
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/actionpack.gemspec activemodel/activemodel.gemspec
| * | | Require sprockets beta 8Joshua Peek2011-05-221-1/+1
| | | |
| * | | Add debug_asset supportJoshua Peek2011-05-224-17/+58
| | | |
| * | | Lock to stable sprockets betaJoshua Peek2011-05-221-1/+1
| | | |
| * | | Fix I18n dependency as final is out.José Valim2011-05-221-1/+1
| | | |
* | | | Revert "Take into account time spent in AR even if a redirect occurs or if ↵David Heinemeier Hansson2011-05-221-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 Sichanugrist2011-05-222-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 Cheung2011-05-221-0/+26
| |/ / |/| | | | | | | | after the render
* | | Move I18n dependency back to ActiveSupport.José Valim2011-05-221-1/+0
| | |
* | | 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-222-0/+144
|\ \ \ | |/ / |/| | Add method FormHelper#fields_for_with_index
| * | Add method fields_for_with_index to FormHelperJorge Bejar2011-05-212-0/+144
| | |
* | | Bump versions for rc1David Heinemeier Hansson2011-05-211-1/+1
| | |
* | | Merge pull request #1165 from arunagw/rubyforge_removeJosé Valim2011-05-211-1/+0
|\ \ \ | | | | | | | | Not updating rubyforge for new versions.
| * | | Not updating rubyforge for new versions. Result of "gem list -d rails" is ↵Arun Agrawal2011-05-201-1/+0
| |/ / | | | | | | | | | not useful.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 03:55:19 +0000