aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | 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
| | |
* | | Temporarily ship with ContentLength middleware.José Valim2011-05-201-1/+1
| |/ |/|
* | Sprockets version update.Arun Agrawal2011-05-191-1/+1
| |
* | Merge pull request #1151 from joshk/wrap_params_options_changeJosé Valim2011-05-193-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 Kalderimis2011-05-193-26/+26
| |/ | | | | | | :exclude to make it consistent with controller filters
* | adding teststeve2011-05-191-4/+8
| |
* | 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-192-11/+11
|
* README updated for for => eachArun Agrawal2011-05-191-3/+3
|
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-181-1/+1
|\
| * fix coding error in readme reported in rails GH #980Vijay Dev2011-05-171-1/+1
| |
* | Update Rack::Mount to 0.8.1Prem Sichanugrist2011-05-181-1/+1
| |
* | Dump and load rack-cache stuff.José Valim2011-05-172-2/+27
| |
* | 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-08111-1590/+2738
| |\ \ | | | | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/testing/performance.rb
| * \ \ Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-04-17118-3441/+1347
| |\ \ \
| * \ \ \ Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-04-0310-32/+132
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-03-309-28/+127
| |\ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 12:45:12 +0000