Commit Graph

5948 Commits

Author SHA1 Message Date
Xavier Noria
146ec2d1df Merge branch 'master' of git://github.com/lifo/docrails 2011-06-18 10:11:47 +02:00
Bogdan Gusiev
69fdfab487 Select tag helpers: remove some code dups 2011-06-17 16:54:35 +03:00
R.T. Lechow
6ca18f9037 Typo. 2011-06-16 15:44:21 -04:00
wycats
1844572fd1 Make the API for compression consistent between JS and CSS. By default, users just need to say whether they want compression or not, and a default will be chosen by a Railtie. In the case of CSS, this default is already chosen by the sass-rails gem.
Users can still explicitly choose a compressor in their application.rb if they have a preference, but will usually want to let plugins choose defaults in their Railties.
2011-06-16 12:09:36 -07:00
Santiago Pastorino
eedbe1c827 Use html_safe 2011-06-16 12:46:11 -03:00
José Valim
f2c0fb32c0 Remove usage of memoizable from ActionPack. 2011-06-16 08:01:35 -03:00
Wen-Tien Chang
d7aac1f1e4 Also change the default route comment 2011-06-16 14:03:41 +08:00
Vijay Dev
77c8cd7516 form => form_for 2011-06-15 18:56:22 +05:30
Christine Yen
0a67b745be Tweak linebreak in ActionController::Redirecting doc 2011-06-15 03:18:28 -07:00
Christine Yen
c6381657b7 Clarify importance of *_attributes= writer methods for nested fields 2011-06-15 03:15:58 -07:00
Christine Yen
8da91036c0 Improve documentation around status code argument of redirect_to 2011-06-15 01:55:57 -07:00
Damien Mathieu
0438e92ae7 simplify to only one condition
Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
2011-06-15 09:51:36 +01:00
Andrew White
0ac0d7a0f0 Make MissingTranslation exception handler respect :rescue_format 2011-06-15 01:21:04 +01:00
Joshua Peek
56b301fa7a Fix appending sprockets paths 2011-06-14 14:39:34 -05:00
bagwanpankaj
c424fb29ab Removed warning while running test with ruby 1.9.2 2011-06-14 21:56:27 +05:30
Damien Mathieu
383fd143bf all requests are utf-8. Don't use the external encoding. 2011-06-14 17:01:33 +02:00
Damien Mathieu
383d56b5ee encode the uploaded file's name in the default external encoding - Closes #869 2011-06-14 14:34:30 +02:00
Robert Massaioli
d7a2431408 cycle: make an odd number be marked as odd.
Just a minor issue that was annoying me so I thought that I would jump in and fix it.
2011-06-13 14:58:56 +10:00
Piotr Sarnacki
f5e1548c1b Merge pull request #1552 from bogdan/select
Fixing select[multiple] html specification problem.
2011-06-11 08:21:22 -07:00
José Valim
e294009b07 No need for a configuration option here. 2011-06-11 17:10:16 +02:00
David Lee
9b305983e3 Remove utf8_enforcer_param config option 2011-06-11 01:58:26 -07:00
David Lee
91e3046b71 Make utf8_enforcer_tag an overrideable method 2011-06-11 01:58:26 -07:00
David Lee
fa3fc52069 Make utf8 enforcer param customizeable 2011-06-11 01:58:26 -07:00
David Lee
1cbe917237 There are no snowmen here 2011-06-11 01:58:26 -07:00
Santiago Pastorino and José Ignacio Costa
94df84a8a4 Revert "Make sure that we don't perform in-place mutation on SafeBuffer string"
This reverts commit 115e80dccc.
2011-06-10 23:08:00 -03:00
Aaron Patterson
a4ee5038c1 Merge pull request #1642 from sikachu/master-render-inline
Render inline fix for master
2011-06-10 16:29:58 -07:00
Xavier Noria
4699c93301 Merge branch 'master' of git://github.com/lifo/docrails 2011-06-11 00:59:46 +02:00
Prem Sichanugrist
115e80dccc Make sure that we don't perform in-place mutation on SafeBuffer string
This will make sure `render :inline` is working.

Closes #1633
2011-06-10 18:51:48 -04:00
Andrew White
0bcbcdfdad Ensure number helpers can handle HTML safe strings - closes #1597. 2011-06-10 11:32:28 +01:00
Xavier Noria
90c4885766 Merge pull request #1523 from raghunadhd/refactor_regex
rafactored the regex related code in the mapper class
2011-06-10 03:27:45 -07:00
ganesh
262a42b12e shallow_path example updated 2011-06-10 15:53:55 +05:30
Raghunadh
46ecb53fc2 removed the unnecessary back slashes from the regular expression 2011-06-10 13:39:24 +05:30
Prem Sichanugrist
8c8652c37f Make sure escape_javascript return SafeBuffer if the incoming argument is already html_safe 2011-06-09 14:30:02 -04:00
David Heinemeier Hansson
54b0aeba64 Indention style + whitespace for readability 2011-06-09 01:31:06 +02:00
David Heinemeier Hansson
93f30f0536 If you set a js_compressor, it means that you want shit compressed -- we dont need a second option to turn that on 2011-06-09 01:30:58 +02:00
Paul Gallagher
bf2f039a93 Make escape_javascript happy to handle SafeBuffers
* see GH#1553
* allow for the fact that gsub on SafeBuffer does not pass match variables $1, $2 etc to a block
2011-06-08 11:05:15 -04:00
Bogdan Gusiev
faba406fa1 Fixing select[multiple] html specification problem.
Generating hidden input with same name before each multiple select
2011-06-08 12:59:54 +03:00
José Valim
c6503f48bd Merge pull request #1547 from sikachu/safebuffer
Fix ActionPack tests on `master`
2011-06-07 23:39:49 -07:00
José Valim
185235333c Merge pull request #1542 from cmeiklejohn/dont_gsub_on_safebuffer
Don't operate on the safebuffer, operate on a string and convert.
2011-06-07 23:32:03 -07:00
Prem Sichanugrist
9e2e242655 Add proper fix to mail_to helper.
* Fix the problem on manipulating on the `ActiveSupport::SafeBuffer`
* Make sure that we run `escape_javascript` on the `String`, to avoid unexpected behavior.
2011-06-08 02:30:50 -04:00
Prem Sichanugrist
07f2481e15 Adapt [823aa223ef] to make sure we perform cloning before manipulation only on OutputBuffer.
After the fragment rendering, `Builder` returns the `String` object instead of `ActionView::OutputBuffer`. Somehow the same procedure which was in [823aa223ef] does not play nice with the String, and result in the fragment got lost.
2011-06-08 02:30:50 -04:00
Santiago Pastorino
1d3618a9b4 remove warning: assigned but unused variable 2011-06-08 00:26:09 -03:00
Christopher Meiklejohn
ef8b12a29e Don't operate on the safebuffer, operate on a string and convert. 2011-06-07 23:07:07 -04:00
Christopher Meiklejohn
823aa223ef Fragment caching needs to operate on the pure output, not the
safebuffer.
2011-06-07 22:36:51 -04:00
Joshua Peek
2684f17a17 Update asset helpers to use config.assets.prefix
Fixes #1489
2011-06-07 14:27:57 -07:00
Raghunadh
2e07c71106 rafactored the regex related code in the mapper class 2011-06-07 19:02:08 +05:30
Piotr Sarnacki
a6c5cc2377 Added missing assert to test checking form with namespaced isolated model and fixed helpers to work correctly in such case 2011-06-07 02:40:41 +02:00
Xavier Noria
5e21247131 Merge branch 'master' of git://github.com/lifo/docrails
Conflicts:
	activerecord/RUNNING_UNIT_TESTS
2011-06-06 22:23:30 +02:00
Guillermo Iguaran
c2c8ef57d6 Remove trailing white-spaces 2011-06-05 10:34:40 -05:00
Andrew White
e864ff7259 Add backward compatibility for testing cookies
This commit restores the ability to assign cookies for testing via
@request.env['HTTP_COOKIE'] and @request.cookies, e.g:

    @request.env['HTTP_COOKIE'] = 'user_name=david'
    get :index
    assert_equal 'david', cookies[:user_name]

and

    @request.cookies[:user_name] = 'david'
    get :index
    assert_equal 'david', cookies[:user_name]

Assigning via cookies[] is the preferred method and will take precedence
over the other two methods. This is so that cookies set in controller
actions have precedence and are carried over between calls to get, post, etc.
2011-06-05 12:34:27 +01:00