Commit Graph

7003 Commits

Author SHA1 Message Date
Larry Sprock
3b75ec92f5 Bring inline with master 2011-06-03 10:55:10 -07:00
Larry Sprock
8b8e18198b Don't need asset_path twice 2011-06-03 10:54:35 -07:00
Larry Sprock
9b55007486 Generate correct asset paths when using asset pipeline 2011-06-03 10:34:49 -07:00
wycats
80745f19c4 Another missed piece of the merge. I screwed up this merge. I am sorry :( 2011-06-03 10:14:02 -07:00
wycats
de6394208c Remove explicit sprockets usage. This should have come over in the merge, but for some reason it didn't. 2011-06-02 17:06:34 -07:00
wycats
5b300a9ea4 Pull back in asset_path 2011-06-02 16:10:38 -07:00
wycats
7a8d3d7603 Make sure that Sprockets::Helpers::RailsHelper can be found 2011-06-02 10:59:13 -07:00
wycats
ee018be796 Move the last pockets of Sprockets stuff into the Sprockets directory 2011-06-02 10:59:13 -07:00
wycats
476d679c33 Move javascript/css helpers into the Sprockets helper and just have them override the old behavior 2011-06-02 10:59:13 -07:00
wycats
866889c526 Start moving some logic from being embedded in AV into the Rails Sprockets extensions 2011-06-02 10:59:13 -07:00
jacott
db05478d92 fixed asset_paths when called from sprockets for relative_url_root 2011-05-28 08:50:00 +02:00
dmathieu
9cb8a18200 don't raise an exception if the format isn't recognized
Fixed while traveling to heuruko
2011-05-27 07:50:44 +02:00
tomhuda
e1043cc848 Move SCSS generators and default templates from Rails to the Sass Railtie (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
2011-05-24 16:13:39 -07:00
tomhuda
7eed5c0303 Change compressor API so that plugins can register default compressors for their stylesheet or JS engines and still allow the user to turn off compression 2011-05-24 16:13:32 -07:00
Jon Leighton
5a6927ec1e Replace references to ActiveSupport::SecureRandom with just SecureRandom, and require 'securerandom' from the stdlib when active support is required. 2011-05-23 20:24:44 +01:00
José Valim
72368610f0 Use Rack 1.3.0. 2011-05-23 00:33:48 -07:00
Joshua Peek
7ad24a7d96 Require sprockets beta 8 2011-05-22 20:10:13 -05:00
Joshua Peek
27159dff0f Add debug_asset support 2011-05-22 15:10:53 -05:00
Joshua Peek
cdc9c3c4af Lock to stable sprockets beta 2011-05-22 14:50:11 -05:00
José Valim
9164dda151 Fix I18n dependency as final is out. 2011-05-22 13:39:13 +02:00
David Heinemeier Hansson
82857adc56 Bump versions for rc1 2011-05-21 20:56:52 -05:00
José Valim
26703f4905 Merge pull request #1165 from arunagw/rubyforge_remove
Not updating rubyforge for new versions.
2011-05-21 04:55:37 -07:00
Andrew White
89d7133082 Correct example and expand on description of :shallow option for resources 2011-05-21 07:11:47 +01:00
José Valim
e4bcd5e7eb Merge pull request #1177 from joshk/ruby19_warnings
Fixed some ruby 19 warnings
2011-05-20 22:24:49 -07:00
Josh Kalderimis
c659505368 fixed some ruby 19 warnings, including circular requires and variable name reuse 2011-05-21 01:23:17 -04:00
José Valim
5eadb4d73d Temporarily ship with ContentLength middleware. 2011-05-20 22:20:51 +02:00
Arun Agrawal
f72f591c8c Not updating rubyforge for new versions. Result of "gem list -d rails" is not useful. 2011-05-20 17:43:40 +05:30
Arun Agrawal
36e330b215 Sprockets version update. 2011-05-19 23:46:26 +05:30
José Valim
bcdb68155a Merge pull request #1151 from joshk/wrap_params_options_change
renamed the wrap_parameters :only and :except options to :include and :ex
2011-05-19 07:51:11 -07:00
Josh Kalderimis
968596fa7f renamed the wrap_parameters :only and :except options to :include and :exclude to make it consistent with controller filters 2011-05-19 10:33:25 -04:00
steve
2d50887b24 adding test 2011-05-19 10:33:18 -04:00
steve
7c000af867 fixing sym and string cookie name, two cookies to browser bug. 2011-05-19 09:49:16 -04:00
Arun Agrawal
e3eaeb490a Example Usage updated for actionpack and actionmailer. 2011-05-19 09:17:49 +05:30
Arun Agrawal
8630cd420c README updated for for => each 2011-05-19 09:03:46 +05:30
Xavier Noria
b13d24e5b9 Merge branch 'master' of git://github.com/lifo/docrails 2011-05-18 22:50:44 +02:00
Prem Sichanugrist
6d3b89b372 Update Rack::Mount to 0.8.1 2011-05-18 11:32:34 -04:00
José Valim
324f1451b0 Dump and load rack-cache stuff. 2011-05-17 17:33:17 -04:00
Jeremy Kemper
b77e032ccf Merge pull request #247 from goncalossilva/performance_test
Performance tests improved
2011-05-17 14:28:40 -07:00
Joshua Peek
1d8d799a01 Bump sprockets dependency 2011-05-17 17:20:27 -04:00
Joshua Peek
59baf2fc9c Remove old call to sprockets context 2011-05-17 17:19:33 -04:00
José Valim
b81f77e2e2 Merge pull request #1093 from lucasmazza/patch-1
Using the correct CSS compressor for the yui-compressor gem.
2011-05-17 11:58:19 -07:00
José Valim
760dec17be Use anonymous? that works on both Ruby 1.8 and 1.9. 2011-05-17 14:51:44 -04:00
Vijay Dev
110a066bb4 fix coding error in readme reported in rails GH #980 2011-05-17 17:52:40 +05:30
David Chelimsky
13950a8cc9 add more robust test for wrapping params with anonymous class 2011-05-17 06:57:14 -04:00
Andy Lindeman
ee82e1c301 Add fix for error when an anonymous controller subclasses ApplicationController 2011-05-17 06:57:04 -04:00
David Chelimsky
14d5e3e459 better test name 2011-05-17 06:56:53 -04:00
David Chelimsky
29e8ca3698 add failing test for https://github.com/rails/rails/issues/1089 2011-05-17 06:56:46 -04:00
Lucas Mazza
79249f590d Using the correct CSS compressor for the yui-compressor gem. 2011-05-16 15:19:44 -07:00
José Valim
d043d65396 Merge pull request #570 from sikachu/decouple_actionpack
Make ParamsWrapper use a well-defined API and not rely on AR methods
2011-05-15 16:13:29 -07:00
Prem Sichanugrist
d77b306b63 Make ParamsWrapper calling newly introduced Model.attribute_names instead of .column_names 2011-05-15 19:07:44 -04:00