mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity
29,361 Commits 61 Branches 565 Tags 420 MiB
Commit Graph

8656 Commits

Author SHA1 Message Date
Rafael Mendonça França 9ec63eb049 Rack::SSL -> ActionDispatch::SSL 2012-03-17 13:36:35 -03:00
Santiago Pastorino f987220756 Add missing require 2012-03-17 12:43:04 -03:00
Santiago Pastorino d266c2e0da Remove unused require 2012-03-17 12:43:04 -03:00
Vijay Dev 9d06b49913 Merge branch 'master' of github.com:lifo/docrails 
Conflicts:
	railties/guides/source/getting_started.textile
 2012-03-17 20:30:08 +05:30
José Valim 39514af7e7 Merge pull request #5480 from drogus/rendering-issues 
Fix for #5440
 2012-03-17 11:24:19 -03:00
kennyj 131083b819 Should use an argument in http_digest_authentication_test.rb 2012-03-17 20:23:28 +09:00
José Valim cb0585eabe Merge pull request #5470 from sandeepravi/warning_fixes 
fixed - warning: instance variable @controller not initialized
 2012-03-17 00:18:39 -07:00
Luke Gruber 08c4d8eac3 use consistent explicit module inclusion 
aid ease of understanding and readability for tests
 2012-03-16 21:54:25 -04:00
Sandeep 5ae53d5cde fixed - warning: instance variable @controller not initialized 2012-03-16 19:42:00 +05:30
Sandeep e7f8d50695 fixed - warning: ambiguous first argument; put parentheses or even spaces 2012-03-16 19:07:41 +05:30
Piotr Sarnacki fc6b961b09 Merge pull request #5365 from avakhov/ac-layouts-excpetion-msgs 
Fix exceptions messages in AC layouts
 2012-03-16 03:25:09 -07:00
Piotr Sarnacki e2b6751312 Merge pull request #5454 from luke-gru/luke-dev 
allow zero-arity proc for AbstrController::layout
 2012-03-15 16:07:06 -07:00
Brian Lopez 6ce21af8aa fix typo in redirect test 2012-03-15 15:15:10 -07:00
Brian Lopez cfcdd334de strip null bytes from Location header as well 
add tests for stripping \r\n chars since that's already happening
 2012-03-15 14:42:57 -07:00
Luke Gruber aca6937760 allow zero-arity proc for AbstrController::layout 
proc without parameters can now be given to
AbstractController::layout
 2012-03-15 16:40:23 -04:00
Aaron Patterson 8f5f92cf8e Merge pull request #5337 from mreinsch/static_invalid_byte_sequence 
fix ArgumentError being raised in case of invalid byte sequences
 2012-03-15 10:14:01 -07:00
José Valim fbc9d0f44f Simplify helpers handling. Ensure Metal can run AC hooks. 2012-03-15 08:48:38 +01:00
Piotr Sarnacki 5b94e73d1a Remove ActionController::TestCase#rescue_action_in_public! 
This method has no effect since exception handling was
moved to middlewares and ActionController tests do not
use any middlewares.
 2012-03-15 04:14:49 +01:00
David Heinemeier Hansson e884f4b6b7 Allow you to force the authenticity_token to be rendered even on remote forms if you pass true 2012-03-14 19:28:57 -04:00
David Heinemeier Hansson a4c120f165 Do not include the authenticity token in forms where remote: true as ajax forms use the meta-tag value 2012-03-14 19:08:34 -04:00
José Valim 6db930cb5b Remove --http. 2012-03-14 22:30:01 +01:00
Piotr Sarnacki 1efeb072bf Merge pull request #5357 from bagilevi/sweeper-undefined-method-ignored 
Don't ignore call to undefined method in Sweeper
 2012-03-14 12:53:19 -07:00
Sergey Nartimov f7714eca47 use content_tag in button_to helper 2012-03-14 20:01:02 +03:00
Santiago Pastorino 35262b7cd2 Add API apps CHANGELOG entry 2012-03-14 13:02:03 -03:00
Santiago Pastorino 4c16791f35 Add ActionController::HTTP 
More info http://edgeguides.rubyonrails.org/api_app.html

[Carlos Antonio da Silva & Santiago Pastorino]
 2012-03-14 12:46:23 -03:00
Vijay Dev ab1b352a1c Merge pull request #5421 from parndt/master 
Added missing 'end' to documentation example
 2012-03-14 05:32:32 -07:00
Matthew Daubert 7fd790e682 Minor clarification in documentation language and spelling 2012-03-13 21:10:53 -04:00
Guillermo Iguaran 272d3d72e8 Remove remaining sprockets tests 2012-03-13 18:00:32 -05:00
Guillermo Iguaran b1a36a70c0 Remove sprockets dependency on actionpack 2012-03-13 18:00:32 -05:00
Guillermo Iguaran 7ea2c94046 Remove tests and fixtures for Sprockets on ActionPack 2012-03-13 18:00:31 -05:00
Guillermo Iguaran a2fc3a0f49 Remove sprockets integration on ActionPack 2012-03-13 18:00:31 -05:00
Philip Arndt 9e8a938047 Added missing end to example 2012-03-14 10:11:55 +13:00
José Valim ae67a63fe9 Merge pull request #572 from sikachu/remove_activeresource 
Remove Active Resource source files from the repository.
 2012-03-13 14:04:03 -07:00
Sergey Nartimov 9fbb1767b5 add include_hidden option to checkbox tag 2012-03-13 23:17:49 +03:00
Prem Sichanugrist f1637bf2bb Remove Active Resource source files from the repository 
Dear Active Resource,

It's not that I hate you or anything, but you didn't get much attention lately. There're so many alternatives out there, and I think people have made their choice to use them than you. I think it's time for you to have a big rest, peacefully in this Git repository.

I will miss you,

@sikachu.
 2012-03-13 14:55:44 -04:00
Vasiliy Ermolovich 2731ffae74 fix typo in AP CHANGELOG [ci skip] 2012-03-13 21:24:41 +03:00
Vijay Dev 800c70a8f9 Merge branch 'master' of github.com:lifo/docrails 2012-03-13 23:29:30 +05:30
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 4cb71eaf46 Added documentation for the ActionController::MimeResponds::Collector class. 2012-03-13 02:36:59 -05:00
Mark Thomson fb094acc56 Updated description of #retrieve_collector_from_mimes 2012-03-13 02:16:38 -05:00
Santiago Pastorino 2ad34f46a1 Remove unused method 2012-03-12 16:09:40 -03: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 f12f071ece Documented the removal of size from text_field based helpers and cols, rows from text_area helper. 2012-03-12 10:39:45 +13: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
Mark Thomson 64cd57aba9 Revised explanation of fields_for usage. 
Minor tweak to previous comments on form_for and form_helper.rb preamble
 2012-03-11 03:15:38 -05: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 d5d241cb2c @controller already includes url_helpers in with_routing method 2012-03-10 19:27:03 -02:00
Santiago Pastorino 687db9f86d Add missing require 2012-03-10 19:15:29 -02:00
Santiago Pastorino 4751a699c9 AbstractController.action_methods should return a Set 2012-03-10 18:37:30 -02:00
Mark Thomson 52bbff4e89 Added clarification to description of how initial form values are derived. 2012-03-10 14:27:36 -06: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
Mark Thomson 23a00110cf Merge branch '3.9.12' 2012-03-10 02:30:49 -06:00
Mark Thomson 69142aa4dd Revised explanation of form_for usage 2012-03-10 01:51:13 -06:00
Alexey Vakhov c16f4f1f38 Fix exceptions messages in AC layouts 2012-03-10 09:57:50 +04:00
Alexey Vakhov 23c4efbb5b Fix layout method doc formatting 2012-03-10 09:45:13 +04: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
Alexey Vakhov 2562404624 Fix comment about layout folders lookup 2012-03-09 19:32:43 +04:00
Vijay Dev ba35527fe7 Minor changelog fixes [ci skip] 2012-03-09 12:29:29 +05:30
Rafael Mendonça França d804790634 Fix my name in the CHANGELOG to follow the convention 
Also add missing entries and use the formating convention
 2012-03-09 00:54:21 -03:00
Mark Thomson 05801ffe2d Additional preamble comments in form_helper.rb. 2012-03-08 19:10:37 -06:00
Mark Thomson 177734836f Small correction to the description of the role of the form builder. 
(endpoints are generated by form_for without reference to the form builder)
 2012-03-08 15:46:08 -06:00
Vijay Dev 8a714c4d80 fix incorrect changelog headings [ci skip]. 
Last commit message should not have said 'Rails 4' either
 2012-03-09 02:30:49 +05:30
Vijay Dev db6542178c changelog updates for Rails 4 [ci skip] 2012-03-09 02:22:17 +05:30
Vijay Dev 188d1d2787 Merge branch 'master' of github.com:lifo/docrails 2012-03-09 00:07:59 +05:30
Michael Reinsch 7d5fbf846b fix ArgumentError being raised in case of invalid byte sequences 2012-03-08 20:41:25 +09:00
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 787617760c Add test case for #5307 2012-03-07 09:35:17 -03: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
Levente Bagi b4b0fddb24 Don't ignore call to undefined method in Sweeper 2012-03-06 16:24:04 +00:00
Sergio Arbeo e4e1388318 Adds :layout option to render :partial when a collection is given. 2012-03-06 16:20:56 +01:00
José Valim f0ad8532f3 Use latest rack-cache. 2012-03-06 10:12:59 +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
Mario Visic 4c31ba9386 Failing test for mime responder respond_with using a block. 2012-03-05 20:21:01 -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
Vijay Dev cf75417f22 document the shortcut to the root route helper [ci skip] 
This was implemented in 2ee4dd856d
 2012-03-05 22:46:06 +05:30
Piotr Sarnacki 4d391a4fde Merge pull request #5269 from castlerock/remove_unwanted_require_karnel_reporting 
AS/kernel/reporting no where used in ts_isolated
 2012-03-04 08:35:16 -08:00
Vishnu Atrai 1380d32864 AS/kernel/reporting no where used in ts_isolated 2012-03-04 21:30:48 +05:30
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
claudiob 05c6caf48c Add release dates to documentation 
Set "March 1, 2012" as the release date for 3.2.2, 3.1.4, 3.0.12
 2012-03-01 11:20:03 -08: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
Vijay Dev 3abf1f559e adds a nodoc [ci skip] 
We have an empty api doc page otherwise :)
 2012-03-01 00:15:35 +05:30
Aaron Patterson 8cecb47696 reduced localhost check to two method calls 2012-02-28 17:48:26 -08:00
Brian Durand 3fbc8f385b remove unnecessary memcache equire in ActionDispatch::Session::CacheStore 2012-02-28 18:14:47 -06:00
Alexey Vakhov b27c29ef4a Fix layout lookup for anonymous controller 2012-02-28 14:42:57 +04:00
Gabe Hollombe e87f1aa021 Change asset_host config language to be more helpful and accurate 2012-02-28 08:41:38 +07:00
Rafael Mendonça França a6074c34e5 Add a new line after the textarea opening tag. 
Closes #393
 2012-02-27 13:52:55 -03:00
Rafael Mendonça França 2ff884c748 Fix collection_check_boxes and collection_radio_buttons when using local 
variables in the form builder
 2012-02-26 19:35:51 -03:00
Rafael Mendonça França 80680e9f1e Add documentation to object method of CollectionHelpers::Builder 2012-02-26 19:35:15 -03:00
Rafael Mendonça França 5979ad31fd Move all the helpers to protected section 2012-02-26 19:04:05 -03:00
Vishnu Atrai a37c4742ee content_tag used instead string for option 2012-02-26 18:11:49 +05:30
Andrew White 74bc920e84 Adding tests for non-optional glob parameters 2012-02-26 00:33:15 +00:00
Vasiliy Ermolovich 2bc879a43d use content_tag instead strings 2012-02-25 21:05:33 +03:00
Vijay Dev 1e25d6217c Merge branch 'master' of github.com:lifo/docrails 
Conflicts:
	actionmailer/CHANGELOG.md
 2012-02-25 21:52:59 +05:30
José Valim 29054ba173 Merge pull request #5117 from nashby/form-option-refactor 
FormOptionsHelper refactor
 2012-02-25 06:05:23 -08:00
Paco Guzman 152a393d4f Update changelogs with rails 3.0-stable branch info 2012-02-25 13:50:08 +01:00
kennyj fd5a298a73 Remove wrong and redundant code. 2012-02-25 20:14:14 +09:00
Xavier Noria 3008188cd6 consistently mention first patch, then put 
There was a mix, sometimes patch first, sometimes put first.
Use always patch first, since this is going to be the
primary verb for updates.
 2012-02-24 16:35:48 -08:00
Xavier Noria b7a094536d uses PATCH for the forms of persisted records, and routes PATCH and PUT to the update action of resources 2012-02-24 16:25:41 -08:00
Matt Fawcett d7bf930df5 Fix the assert_recognizes test method so that it works when there are 
constraints on the querystring. Issue #2781
 2012-02-24 13:16:31 +00:00
Justin Woodbridge 62b1f1a62d Fix typo in match :to docs 2012-02-23 17:31:56 -05:00
Vasiliy Ermolovich f0a5d32537 correct fetching :name option in form fields 2012-02-23 22:04:09 +03:00
Andrew White 5093915aae Document the :host option for force_ssl 2012-02-23 13:35:15 +00:00
Andrew White c04a08470f Update documentation for force_ssl - closes #5023. 2012-02-23 13:25:13 +00:00
Pat Allan ab838900f8 SSL should not be disabled by default in any environment. 2012-02-23 13:25:13 +00:00
José Valim ed988eece0 Avoid inspecting the whole route set, closes #1525 2012-02-23 12:49:18 +01:00
José Valim 06d2d4c40b Merge pull request #5138 from avakhov/remove-unused-global-var 
Remove unused global variable in controller filters test
 2012-02-23 00:38:06 -08:00
Alexey Vakhov 2b1c85365b Remove unused global variable in controller filters test 2012-02-23 11:36:20 +04:00
Alexey Vakhov 9e1b2d8174 Remove skip_filter block param 2012-02-23 11:25:31 +04:00
Aaron Patterson 3f8dc559ec Merge pull request #5084 from johndouthat/patch-1 
Remove reference to rails_legacy_mapper, which isn't compatible with 3.2...
 2012-02-22 15:57:15 -08:00
Xavier Noria 5497432d71 updates CHANGELOGs to register changes in 002713c 2012-02-22 21:09:57 +01:00
Aaron Patterson a328f2ffd2 add some tests, yay! 2012-02-22 11:05:03 -08:00
Rafael Mendonça França 60585d2ef2 Only set ActionView configuration inside the on_load block 2012-02-22 16:54:26 -02:00
Aaron Patterson cdc1885d41 Merge pull request #5132 from rafaelfranca/fix-build 
Fix routes inspection order
 2012-02-22 10:05:40 -08:00
Rafael Mendonça França a870d06c0a Fix routes inspection order 2012-02-22 16:03:24 -02:00
Aaron Patterson ef5670effd Merge pull request #5119 from kennyj/fix_5114 
Testcase for GH #5114.
 2012-02-22 09:55:26 -08:00
Xavier Noria 7f2548e34d Merge pull request #5130 from dlee/revised_patch_verb 
Add config.default_method_for_update to support PATCH
 2012-02-22 09:00:53 -08:00