Jeremy Kemper
7d5146efad
Merge pull request #5705 from lest/patch-3
...
split CDATA end token in cdata_section helper
2012-04-30 06:47:07 -07:00
José Valim
bca9a9e926
Merge pull request #6084 from brainopia/support_for_magic_domain_on_all_stores
...
Support cookie jar options for all cookie stores
2012-04-30 06:28:22 -07:00
José Valim
09de707f25
Merge pull request #6082 from brainopia/smarter_cookie_jar
...
Stream cookies only if needed
2012-04-30 06:27:01 -07:00
Sergey Nartimov
16df67b148
split CDATA end token in cdata_section helper
2012-04-30 16:08:06 +03:00
José Valim
02741121be
Merge pull request #3726 from JanDupal/fix-date-helper-hidden
...
fix Helpers::DateHelper with :use_hidden - hide separators
2012-04-30 06:05:08 -07:00
brainopia
2d18dd3471
Dont stream back cookie value if it was set to the same value
2012-04-30 17:04:17 +04:00
brainopia
ff2667d21a
Dont set cookie header for deletion of unexisting data
2012-04-30 17:04:17 +04:00
José Valim
81f6d7f2ad
Merge pull request #6077 from dmitriy-kiriyenko/improve_signature_of_time_in_words_helper
...
Replace boolean argument with an options hash.
2012-04-30 00:38:57 -07:00
Dmitriy Kiriyenko
4a2d53a514
Replace boolean argument with an options hash.
...
This replaces `include_seconds` argument with an option key
`include_seconds => true` in options hash.
Also `time_ago_in_words` now passes options hash, including a `locale`
key, which makes in compatible with `distance_of_time_in_words`.
2012-04-30 10:26:11 +03:00
José Valim
aa89bf78a2
Merge pull request #6078 from lest/patch-4
...
allow send_file/send_data to skip disposition header, closes #2973
2012-04-30 00:21:54 -07:00
Sergey Nartimov
9f64f20b8b
allow send_file/send_data to skip disposition header, closes #2973
2012-04-30 10:12:55 +03:00
Sergey Nartimov
c9f528defa
wrap translate defaults to use translate helper features, closes #1102
2012-04-30 09:44:39 +03:00
Rafael Mendonça França
3acdd652e9
Remove button_to_function
and link_to_function
helpers
2012-04-30 01:47:37 -03:00
Jeremy Kemper
363d7ee551
Merge pull request #6074 from mark-rushakoff/unused-variables
...
Remove some unused variable assignments
2012-04-29 21:27:09 -07:00
brainopia
4121938626
Support cookie jar options for all cookie stores
2012-04-30 04:14:51 +04:00
Andrew White
75df4c1165
Restore interpolation of path option in redirect routes
2012-04-29 23:19:23 +01:00
Andrew White
958daaa664
Escape interpolated params when redirecting - fixes #5688
2012-04-29 21:12:03 +01:00
Andrew White
1c7bcde92d
Add failing test case for #6053
2012-04-29 20:20:59 +01:00
José Valim
d99affed2f
Merge pull request #6059 from rafaelfranca/check_box_inverted
...
Change check_box to work inverting the checked and unchecked value
2012-04-29 11:57:09 -07:00
Rafael Mendonça França
a872ac9d6f
Change check_box to work inverting the checked and unchecked value
...
This fixes:
* Boolean with inverted logic
* Integer with inverted logic
* BigDecimal with inverted logic
Fixes #3995
2012-04-29 15:44:34 -03:00
Carlos Antonio da Silva
0568fb5b9e
Allow access to current object_counter variable from layout when rendering with partial + collection
2012-04-29 14:45:06 -03:00
Carlos Antonio da Silva
d0c9c93c4a
Allow layout to access current object being rendered when using render partial + object
2012-04-29 14:45:06 -03:00
Carlos Antonio da Silva
e72374d0ff
Allow layout rendering to access current object being rendered when using partial + collection
2012-04-29 14:45:05 -03:00
Mark Rushakoff
54683f3a34
Remove unused assignment in actionpack date helper test
2012-04-29 10:09:28 -07:00
Carlos Antonio da Silva
65df4c53c2
Add changelog entry for jsonp mimetype change, fix failing test
...
Fix failing test: Mime::JS generates "text/javascript"
2012-04-29 12:01:05 -03:00
Andrew White
7a80b69e00
Don't convert params if the request isn't HTML - fixes #5341
2012-04-29 10:15:54 +01:00
José Valim
d4dd1af341
Merge pull request #2321 from omjokine/master
...
JSONP should use mimetype application/javascript
2012-04-29 01:13:39 -07:00
Piotr Sarnacki
e6ab0d56cf
Lazy load default_form_builder
if it's passed as a string
...
closes #3341
2012-04-28 22:32:46 -07:00
Andrew White
5c18bdca32
Merge session arg with existing session instead of overwriting
...
This may break existing tests that are asserting the whole session contents
but should not break existing tests that are asserting individual keys - e.g:
class SomeControllerTest < ActionController::TestCase
setup do
session['user_id'] = 1
end
test "some test" do
get :some_action, nil, { 'another_var' => 2 }
# This assertion will now fail
assert_equal({ 'another_var' => 2 }, session)
# This assertion will still pass
assert_equal 2, session['another_var]
end
end
Fixes #1529 .
2012-04-28 22:36:16 +01:00
Sergey Nartimov
67e8004ffd
remove calls to deprecated find(:first) in actionpack test suite
2012-04-26 21:50:35 +03:00
Yehuda Katz
47be2f101c
Fix the build
2012-04-25 16:43:01 -05:00
Jeremy Kemper
bb0906e2d7
Merge pull request #5980 from gazay/valid_ips
...
Remote ip logic and validation. IPv6 support.
2012-04-25 05:18:04 -07:00
Alexey Gaziev
6da2bc5fcc
Valid ips v4 and v6. Right logic for working with X-FORWARDED-FOR header and tests.
2012-04-25 14:50:59 +04:00
Jose and Yehuda
56cdc81c08
Remove default match without specified method
...
In the current router DSL, using the +match+ DSL
method will match all verbs for the path to the
specified endpoint.
In the vast majority of cases, people are
currently using +match+ when they actually mean
+get+. This introduces security implications.
This commit disallows calling +match+ without
an HTTP verb constraint by default. To explicitly
match all verbs, this commit also adds a
:via => :all option to +match+.
Closes #5964
2012-04-24 22:52:26 -05:00
Alexey Vakhov
7322bd45f0
Use leap years trick in distance_of_time_in_words only for distances between real date points
2012-04-24 15:58:02 +04:00
Marcelo Casiraghi
5fdd4cd9e4
fixed non matching documentation behaviour with method semantics on distance_of_time_in_words
2012-04-24 15:56:35 +04:00
Alexey Vakhov
ff5b0d699d
Distance of time in words should work correct if from time > to_time
2012-04-24 15:56:35 +04:00
Aaron Patterson
ed8108300b
Merge pull request #5865 from tiegz/minor_fixes
...
Catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead
2012-04-20 16:23:27 -07:00
Rafael Mendonça França
4b85acba43
Remove unused test code.
...
ActionController::RoutingError are raised in router execution time and can not be
rescued in a controller.
2012-04-16 23:38:31 -03:00
Tieg Zaharia
5d8d639f00
converting some tests to assert_raises, and DRY'ing retrieve_variable changes
2012-04-16 15:33:15 -04:00
Tieg Zaharia
dfab28b2ca
catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead
2012-04-16 13:56:32 -04:00
Santiago Pastorino
1db54dffaf
Merge pull request #5746 from jmbejar/index_method_form_builder
...
Add method FormBuilder#index
2012-04-11 19:43:50 -07:00
Jorge Bejar
47cbfbb98a
Add index method to FormBuilder. Useful when you use field_for and need to know the index number into the iteration.
2012-04-11 23:11:38 -03:00
Frankie Roberto
283133a59c
Adding itemscope to list of boolean attributes.
...
'itemscope' is defined within HTML5 for use in microdata markup. See
http://www.whatwg.org/specs/web-apps/current-work/multipage/microdata.ht
ml#attr-itemscope
2012-04-09 12:23:46 +01:00
Santiago Pastorino
4c1dcb0537
Merge pull request #5783 from rafaelfranca/default_url_options
...
Document that default_url_options must return a hash with symbolized keys
2012-04-08 20:10:14 -07:00
Rafael Mendonça França
9efe01ef0d
default_url_options does not receive one argument anymore
2012-04-08 23:44:00 -03:00
Santiago Pastorino
500c9a161c
Revert "Merge pull request #5750 from ahoward/master"
...
This reverts commit 174cf8b22064c3999dfa685014d5b31ac993bb54, reversing
changes made to 7ecd6a731bd60665bc6de94095137f0b2c4ada2a.
The reverted commit improved the performance in the wrong place, now we
have added this 6ddbd1844a6fd6aca2992f5f75c9f605cf89808f improvement.
2012-04-08 22:44:37 -03:00
Jeremy Kemper
0032da1b3e
Merge pull request #5748 from ai/no_type_in_html5
...
Remove unnecessary in HTML 5 type attribute with default value
2012-04-08 06:56:44 -07:00
Rafael Mendonça França
ddbd1e4adb
Make url_for work when option is nil and default_url_options has
...
stringified keys
2012-04-05 15:14:00 -03:00
Aaron Patterson
174cf8b220
Merge pull request #5750 from ahoward/master
...
mo fasta and mo betta the url_for
2012-04-05 09:31:39 -07:00