Commit Graph

7050 Commits

Author SHA1 Message Date
Vasiliy Ermolovich
54a75e1a0f add 'include_hidden' option to select tag, closes #5402 2012-03-13 20:00:50 +03:00
Egor Homakov
829e379700 'module' is reserved word. Sample of code with error - not cool. 2012-03-13 15:13:05 +04:00
Mark Thomson
fb094acc56 Updated description of #retrieve_collector_from_mimes 2012-03-13 02:16:38 -05:00
Aaron Patterson
fd22471313 Merge pull request #5375 from nertzy/assert_template_with_regexp
assert_template matches against Regexp
2012-03-12 10:13:16 -07:00
Aaron Patterson
dea486d00e Merge pull request #5380 from benmmurphy/escape_unicode_paragraph_separator
ensure u2029 is escaped in escape_javascript helper
2012-03-12 10:09:34 -07:00
José Valim
6c0d5a19a4 Merge pull request #5366 from parndt/fix_issue_5324
Fixes #5324 by removing default size options from input:text and default cols and rows options from textarea.
2012-03-11 15:04:23 -07:00
Philip Arndt
8b5198a417 Fix unintended removal of 'cols' from a text_area example. 2012-03-12 10:33:47 +13:00
benmmurphy
c8168a7cdc ensure u2029 is escaped in escape_javascript helper 2012-03-11 17:28:02 +00:00
Grant Hutchins
b142bd84d8 assert_template matches against Regexp
This allows for more strict template assertions,
while maintaining backward compatibility.

For example, if you use assert_template("foo/bar")
and "foo/bar/baz" was rendered, the test passes.

But if you use assert_template(%r{\Afoo/bar\Z}),
you will catch that a different template was
rendered.

Also, if you passed an unsupported argument to
assert_template() in the past, it would silently
succeed. Now it raises an ArgumentError.
2012-03-10 19:25:12 -05:00
Michael Koziarski
411a826583 Merge pull request #5326 from lest/patch-2
configure how unverified request will be handled
2012-03-10 16:16:35 -08:00
Santiago Pastorino
4751a699c9 AbstractController.action_methods should return a Set 2012-03-10 18:37:30 -02:00
Philip Arndt
3384ee24ad Fixes #5324 by removing default size options from input:text and default cols and rows options from textarea. 2012-03-10 23:30:39 +13:00
Sergey Nartimov
245941101b configure how unverified request will be handled
can be configured using `:with` option in `protect_from_forgery` method
or `request_forgery_protection_method` config option

possible values:
- :reset_session (default)
- :exception

new applications are generated with:

    protect_from_forgery :with => :exception
2012-03-09 19:33:06 +03:00
Vijay Dev
188d1d2787 Merge branch 'master' of github.com:lifo/docrails 2012-03-09 00:07:59 +05:30
Vijay Dev
35922c0f82 copy edits [ci skip] 2012-03-07 20:32:25 +05:30
José Valim
7638004d7d Set the rendered_format on respond_to. 2012-03-07 15:02:58 +01:00
José Valim
bbdb54ad15 Just change the formats on first render, closes #5307, closes #5308. 2012-03-07 14:56:38 +01:00
Carlos Antonio da Silva
945ee35933 Add some docs for ActionController::Base.without_modules 2012-03-06 23:50:55 -03:00
José Valim
d87ec9d310 Merge pull request #5310 from Serabe/layout_for_partials_with_collections
Adds :layout option to render :partial when a collection is given.
2012-03-06 15:11:28 -08:00
Sergio Arbeo
6e0a763d00 Adds line to change log and update documentation. 2012-03-07 00:06:42 +01:00
Carlos Antonio da Silva
8d5c742df4 Refactor AD::UploadedFile, and raise sooner if tempfile is not present 2012-03-06 18:34:20 -03:00
Santiago Pastorino
bc5ac778c0 Remove unused ActionController::SessionManagement 2012-03-06 17:57:12 -02:00
Santiago Pastorino
b90d24b00e Avoid ImplicitRender just call render directly 2012-03-06 17:52:54 -02:00
Vijay Dev
7c90d91c3c Clean up module docs [ci skip]
Removed some useless docstrings and no-doc'ed some.
2012-03-07 01:04:14 +05:30
Sergio Arbeo
e4e1388318 Adds :layout option to render :partial when a collection is given. 2012-03-06 16:20:56 +01:00
José Valim
f97e3ed111 Merge pull request #5298 from sikachu/master-fix-responder
Always passing a respond block from to responder
2012-03-06 00:49:47 -08:00
Prem Sichanugrist
284041cf91 Always passing a respond block from to responder
We should let the responder to decide what to do with the given
overridden response block, and not short circuit it.

Fixes #5280
2012-03-05 21:06:02 -05:00
Dwayne Litzenberger
8e26d29887 Compute asset paths from the request if ENV["RAILS_RELATIVE_URL_ROOT"] is not set.
This should fix the following issue:

"Rails is not a Rack Application (SCRIPT_NAME vs. relative_url_root ?)"
https://github.com/rails/rails/issues/910
2012-03-05 19:46:01 -05:00
José Valim
dc80715207 Merge pull request #5290 from steveklabnik/master
Added parsing of arbitrary media type parameters.
2012-03-05 12:17:30 -08:00
Steve Klabnik
8c4b3a4dea Added parsing of arbitrary media type parameters.
Based on #4918.

Related to #4127.
2012-03-05 15:10:23 -05:00
Sergey Nartimov
1e0387e8a1 force response body to be read in assert_template 2012-03-05 22:21:04 +03:00
Brian Cardarella
2ee4dd856d Route root helper shortcut
Allow the root route helper to accept just a string
2012-03-03 22:25:05 -05:00
José Valim
ecf4db15bc Merge pull request #5246 from lest/patch-2
simplify namespace assignment in fields_for
2012-03-03 11:07:49 -08:00
Vishnu Atrai
d8996d3cab remove usages of AS::OrderedHash 2012-03-03 23:48:29 +05:30
Vijay Dev
f9e26940b3 Merge branch 'master' of github.com:lifo/docrails 2012-03-03 22:08:24 +05:30
Santiago Pastorino
14f06dd871 Turn off verbose mode of rack-cache, we still have X-Rack-Cache to check that info
Closes #5245
2012-03-03 00:18:46 -02:00
Sergey Nartimov
4e8fbc0c22 simplify namespace assignment in fields_for 2012-03-02 22:44:53 +03:00
Piotr Sarnacki
0e94208a0f Can't cache url_options on a controller level
It fails if routes from to railties are called in one context,
for example: blog.posts_path and main_app.users_path
2012-03-02 18:47:15 +01:00
Sergey Nartimov
0e6b588b3d don't pass unnecessary argument 2012-03-02 19:01:53 +03:00
José Valim
1a046ab9bf Merge pull request #5242 from rails/opt_routes
Optimize routes generation in simple cases.

If you pass to the route helper the same amount of arguments
as the required segments, route generation will be optimized
as a string interpolation. After this commit, `post_path(post)`
is about 6.5 times faster, `post_url(post)` is about 5 times.
2012-03-02 06:56:40 -08:00
Piotr Sarnacki
aeeebe1fdc Fix #5238, rendered_format is not set when template is not rendered 2012-03-02 12:46:50 -02:00
Sergey Nartimov + José Valim
cd5dabab95 Optimize url helpers. 2012-03-02 15:01:20 +01:00
Anuj Dutta
1adad4442b Removed max-stale from the setting the cache-headers in the response as max-stale is a cache request header. 2012-03-02 07:22:16 +00:00
José Valim
d7014bc7ea Optimize path helpers. 2012-03-02 01:59:03 +01:00
Ben Pickles
81d3493c17 Allow fieldsets to be created without a block. 2012-03-01 19:51:56 +00:00
Aaron Patterson
139963c99a Merge branch 'master-security'
* master-security:
  Ensure [] respects the status of the buffer.
  delete vulnerable AS::SafeBuffer#[]
  use AS::SafeBuffer#clone_empty for flushing the output_buffer
  add AS::SafeBuffer#clone_empty
  fix output safety issue with select options

Conflicts:
	actionpack/lib/action_view/helpers/tags/base.rb
2012-03-01 09:56:04 -08:00
Jeremy Kemper
ceb66b6126 Tap, tap goes the middleware 2012-02-29 18:43:55 -07:00
Aaron Patterson
f9995ce0e0 Merge pull request #5203 from avakhov/anonymous-controller-layout
Fix layout lookup for anonymous controller
2012-02-29 12:03:15 -08:00
Aaron Patterson
1d215286c9 Merge pull request #5219 from mattfawcett/2781-fix-querystring-route-constraint-for-testing
Fix for #2781
2012-02-29 11:57:02 -08:00
Vijay Dev
4244a09c53 fix api doc [ci skip] 2012-03-01 01:22:20 +05:30