aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Ignore :includes on through associationsAndrew White2011-05-244-1/+16
|
* Merge pull request #1243 from smartinez87/warningsJosé Valim2011-05-233-13/+13
|\ | | | | Fix 'warning: ambiguous first argument; put parentheses or even spaces'.
| * Parenthesize arguments when the first one is a Regexp literal.Sebastian Martinez2011-05-233-13/+13
| | | | | | | | This fixes 'warning: ambiguous first argument; put parentheses or even spaces'.
* | Make sure that Sprockets::Helpers::RailsHelper can be foundwycats2011-05-232-1/+8
|/
* Merge pull request #1241 from smartinez87/extra-spaceSantiago Pastorino2011-05-237-8/+8
|\ | | | | Remove extra white-space on exception message.
| * Remove extra white-space on some exception messages.Sebastian Martinez2011-05-237-8/+8
| |
* | 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
* fixing 1.8 support for new fixture testsAaron Patterson2011-05-233-4/+9
|
* removing CSV fixture supportAaron Patterson2011-05-232-58/+10
|
* fixture file will validate fixture formatAaron Patterson2011-05-232-1/+26
|
* return an empty array for empty yaml filesAaron Patterson2011-05-232-1/+20
|
* use top level file constant for join, etcAaron Patterson2011-05-231-4/+4
|
* adding AR::Fixtures::File class to wrap a fixture fileAaron Patterson2011-05-233-0/+90
|
* Removed ActiveSupport::SecureRandom in favour of SecureRandom from the ↵Jon Leighton2011-05-237-29/+8
| | | | standard library. (It has been deprecated in the 3-1-stable branch.)
* Replace references to ActiveSupport::SecureRandom with just SecureRandom, ↵Jon Leighton2011-05-2313-20/+22
| | | | and require 'securerandom' from the stdlib when active support is required.
* Merge pull request #1231 from joshk/ruby-debuggerJosé Valim2011-05-239-45/+47
|\ | | | | Ruby debugger corrections
| * Removed the AS core_ext/kernel/debugger breakpoint method as this method is ↵Josh Kalderimis2011-05-232-10/+44
| | | | | | | | added by ruby-debug and should be left as is. Missing tests added.
| * Removed AS core_ext/kernel/requires as it's not used and is bad practice.Josh Kalderimis2011-05-237-35/+3
| |
* | Merge pull request #1230 from smartinez87/changelogJosé Valim2011-05-231-0/+2
|\ \ | |/ |/| Add entry to AP changelog
| * Add entry to AP changelogSebastian Martinez2011-05-231-0/+2
|/
* Merge pull request #1228 from fcheung/db_time_fix2José Valim2011-05-232-1/+29
|\ | | | | 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-232-1/+29
| | | | | | | | after the render
* | Move content length to the server, this brings the same behavior as in rack 1.2.José Valim2011-05-233-9/+7
| |
* | Require rubygems (chill out, just for rails internal tests).José Valim2011-05-231-0/+1
| |
* | Merge pull request #1184 from gnufied/masterAaron Patterson2011-05-231-0/+1
|\ \ | | | | | | Fixes connection_not established error while running db:schema:dump
| * | fix connection not established error while running rake taskBhavin Kamani2011-05-211-0/+1
| | | | | | | | | | | | db:schema:dump
* | | 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-226-18/+61
|\ \ \ | | | | | | | | | | | | | | | | | | | | 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-222-2/+2
| | | |
* | | | Revert "Take into account time spent in AR even if a redirect occurs or if ↵David Heinemeier Hansson2011-05-222-31/+3
| | | | | | | | | | | | | | | | | | | | | | | | it is after the render" because it's causing test failures about missing db_during_render. This reverts commit 60b55baca9e381deb3a0a85580f089f4caf551d4.
* | | | Merge pull request #1221 from sikachu/fix_testsDavid Heinemeier Hansson2011-05-222-2/+8
|\ \ \ \ | | | | | | | | | | Make sure that we're able to run Action Pack test standalone.
| * | | | 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`
* | | | Fix problem with loading polymorphic associations which have been defined in ↵Jon Leighton2011-05-225-15/+35
| | | | | | | | | | | | | | | | an abstract superclass. Fixes #552.
* | | | Merge pull request #1219 from fcheung/db_time_fixJosé Valim2011-05-222-3/+31
|\ \ \ \ | |_|_|/ |/| | | Take into account time spent in AR even if a redirect occurs or if it is
| * | | Take into account time spent in AR even if a redirect occurs or if it is ↵Frederick Cheung2011-05-222-3/+31
|/ / / | | | | | | | | | after the render
* | | Merge pull request #1215 from vatrai/remove_require_tzinfoJosé Valim2011-05-221-3/+1
|\ \ \ | | | | | | | | remove require active_support/tzinfo as file dosent exists #TODO fix
| * | | remove require active_support/tzinfo as file dosent exists #TODO fixVishnu Atrai2011-05-221-3/+1
| | | |
* | | | Merge pull request #1192 from arunagw/removal_extraJosé Valim2011-05-223-9/+0
|\ \ \ \ | |/ / / |/| | | No more need rubygems here.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 17:00:14 +0000