Commit Graph

5886 Commits

Author SHA1 Message Date
brainopia
c2687c390f Remove autoload for a couple of constants which don't exist anymore 2011-05-31 06:22:09 +04:00
Lee Reilly
4f234bfd79 Corrected some typos and American vs. Queen's English issues 2011-05-29 12:40:24 -07:00
José Valim
a46b03e728 Merge pull request #1203 from dchelimsky/stringify-parameter-values-in-tests
Stringify param values in controller tests.
2011-05-28 12:43:13 -07:00
jacott
db5adf2d42 fixed asset_paths when called from sprockets for relative_url_root 2011-05-28 18:19:11 +12:00
José Valim
ec08bfc035 Merge pull request #1324 from dmathieu/no_error_on_invalid_format
Don't raise an exception if the format isn't recognized
2011-05-26 02:29:23 -07:00
dmathieu
16571f9c42 don't raise an exception if the format isn't recognized
Fixed while traveling to heuruko
2011-05-26 11:18:30 +02:00
José Valim
7fd0a6de84 Merge pull request #1311 from kuldarkrabbi/master
action_view/template/handler.rb has been removed
2011-05-25 14:15:00 -07:00
Kuldar Krabbi
9a6833378a action_view/template/handler has been removed 2011-05-25 16:59:04 -04:00
Xavier Noria
00e1d0832e Merge branch 'master' of git://github.com/lifo/docrails
Conflicts:
	actionmailer/lib/action_mailer/base.rb
	activesupport/lib/active_support/core_ext/kernel/requires.rb
2011-05-25 22:48:47 +02:00
tomhuda
74ade51eee 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:04:28 -07:00
tomhuda
88cb89056b 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:04:28 -07:00
Josh Kalderimis
21317d8824 corrected the ActionMailer tests which broke due to some code removed from ActionPack 2011-05-25 00:57:50 +02:00
Josh Kalderimis
d182b6ee9c removed deprecated methods, and related tests, from ActionPack 2011-05-24 23:38:59 +02:00
Ernie Miller
15baa49871 Redundant condition in compute_asset_host is redundant. 2011-05-24 11:09:59 -04:00
tomhuda
00be5bd75d Remaining cleanup from changes to AssetTagHelper 2011-05-24 00:39:04 -07:00
Dmytrii Nagirniak
8f003de2c7 fix minor spelling mistakes in comments 2011-05-23 22:40:29 -07:00
wycats
9dabbd0cff Make sure that Sprockets::Helpers::RailsHelper can be found 2011-05-23 17:27:57 -07:00
Santiago Pastorino
8e7590c72c Merge pull request #1241 from smartinez87/extra-space
Remove extra white-space on exception message.
2011-05-23 17:09:35 -07:00
Sebastian Martinez
05f29ca2c9 Remove extra white-space on some exception messages. 2011-05-23 20:53:18 -03:00
wycats
a9f22dc272 Move the last pockets of Sprockets stuff into the Sprockets directory 2011-05-23 16:45:26 -07:00
wycats
76f947edf7 Move javascript/css helpers into the Sprockets helper and just have them override the old behavior 2011-05-23 16:45:26 -07:00
wycats
4b79029490 Start moving some logic from being embedded in AV into the Rails Sprockets extensions 2011-05-23 16:45:26 -07:00
Sebastian Martinez
fcdb5dc557 Remove extra white spaces on ActionPack docs. 2011-05-23 20:22:33 -03:00
Jon Leighton
d411c85a65 Replace references to ActiveSupport::SecureRandom with just SecureRandom, and require 'securerandom' from the stdlib when active support is required. 2011-05-23 20:25:44 +01:00
wycats
ddc584e89e Restructure TemplateAssertions-related code to eliminate circular requires.
Also, no need to include dependencies in AS::Concerns inside included blocks.
2011-05-22 23:13:44 -07:00
wycats
0afefa9504 Make :status an attr_reader to avoid unnecessary warning when replacing status= 2011-05-22 22:34:06 -07:00
Joshua Peek
5e519fb015 Merge branch '3-1-stable'
Conflicts:
	actionpack/actionpack.gemspec
	activemodel/activemodel.gemspec
2011-05-22 20:11:36 -05:00
Joshua Peek
27159dff0f Add debug_asset support 2011-05-22 15:10:53 -05:00
David Chelimsky
3f0c71c852 use to_param (and change method to name accordingly)
- exclude Rack::Test::UploadedFile to pass existing tests. Are there any
  other types we're missing?
2011-05-22 08:13:22 -04:00
José Valim
99b5020eb2 Edited actionpack/lib/action_view/helpers/form_helper.rb via GitHub 2011-05-22 04:27:28 -07:00
José Valim
2cd2f51ded Merge pull request #1189 from jmbejar/7c562d5e460d97b18e4f3367b3cfb13401732920
Add method FormHelper#fields_for_with_index
2011-05-22 04:26:31 -07:00
Anuj Dutta
023ca4fd48 Fixed documentation for scope with path. 2011-05-22 11:27:02 +01:00
David Chelimsky
9277e72a3c Stringify param values in controller tests.
This reduces false positives that come from using ints in params in
tests, which do not get converted to strings in the tests. In
implementations going through rack, they do get converted to strings.

- David Chelimsky and Sam Umbach
2011-05-22 02:47:54 -04:00
David Heinemeier Hansson
82857adc56 Bump versions for rc1 2011-05-21 20:56:52 -05:00
Jorge Bejar
7c562d5e46 Add method fields_for_with_index to FormHelper 2011-05-21 12:06:04 -03: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
Diego Plentz
0d310d590c fixes code highlight in shallow_path example 2011-05-19 17:38:15 -07:00
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
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
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
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
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