mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity
50,957 Commits 56 Branches 544 Tags 410 MiB
Commit Graph

12096 Commits

Author SHA1 Message Date
Prathamesh Sonpatki 199e277228 Updated request_forgery_protection docs [ci skip] 
- Changed Javascript to JavaScript.
 - Added full-stop which was missing, also wrapped the sentence to 80 chars.
 - Changed proc to Proc and oauth to OAuth.
 2015-04-28 09:52:53 +05:30
Arthur Neves 6d9ad0dd92
Add changelog for rake routes default fix 
[see #18392]
 2015-04-27 09:18:43 -04:00
Arthur Nogueira Neves 86929c00c0 Merge pull request #18392 from brainopia/fix_route_requirements 
Correct route requirements by overriding defaultls
 2015-04-27 09:15:22 -04:00
Rafael Mendonça França 505fa60be2 Merge pull request #19904 from zzak/rm_route_wrapper_internal_hacks 
Rm route wrapper internal hacks
 2015-04-26 17:27:17 -03:00
Arthur Neves 757a2bc3e3
Don't reference sprockets assets on action pack 
We need to ignore the `assets_prefix` when running a command like `rake
routes`. However we cannot reference asserts_prefix from action_pack as
that is a sprockets-rails concern.
See this is now implemented on sprockets-rails
85b89c44ad
 2015-04-26 11:25:33 -04:00
Prathamesh Sonpatki 0ad06f2545 Removed unused code from request_forgery_protection tests 2015-04-26 18:52:37 +05:30
Zachary Scott fc0460a32c Remove internal hacks dependent on Sprockets from RouteWrapper 2015-04-25 23:15:34 -07:00
Jorge Bejar 8c180cdaf6 Fix rake routes for api apps 
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
 2015-04-25 23:14:28 -07:00
Guo Xiang Tan 14d7e058a0 No need to capitalize verbs. [CI SKIP] 2015-04-26 00:18:56 +08:00
Akira Matsuda 9b3fa766d4 Why do we add a top-level constant here? 2015-04-25 17:07:54 +09:00
Rafael Mendonça França 03e987cd8f Merge pull request #19879 from bboe/RedirectTestCleanup 
Remove unused WorkshopsController class in redirect_test.
 2015-04-23 17:25:34 -03:00
Bryce Boe 0eaae0291b Remove unused WorkshopsController class in redirect_test. 2015-04-23 16:12:01 -04:00
Rafael Mendonça França 4128e70791 Add nodoc to some private constants [ci skip] 2015-04-23 14:57:30 -03:00
Rafael Mendonça França d949460f9b Merge pull request #19823 from sbhatore/doc_fix_1 
[ci skip] Description inside Signed and Encrypted CookieJars added
 2015-04-23 14:40:40 -03:00
Siddharth Bhatore f92f5b706b Squashed commit of the following: 
commit a88875ac6abaa4d8116b42af8cd71189ce3d44d3
Author: Siddharth Bhatore <sbhatore95@gmail.com>
Date:   Thu Apr 23 12:26:08 2015 +0530

    [ci skip] Update doc fix cookies

commit f175eaa7a21db898fc6c66334f770831028f9d00
Author: Siddharth Bhatore <sbhatore95@gmail.com>
Date:   Mon Apr 20 12:58:04 2015 +0530

    Description inside Signed and Encrypted CookieJars added
 2015-04-23 22:56:56 +05:30
Nick Cox 4c4fa41b37 [ci skip] Add, clean up docs in ActionDispatch ActionDispatch middleware 2015-04-22 21:06:08 -07:00
Santiago Pastorino 01dad5252b Merge pull request #19852 from sbhatore/doc_fix_cookies 
[ci skip] UpgradeLegacySignedCookieJar Doc fix
 2015-04-22 11:51:31 -04:00
Yves Senn cdbf685994 pass over CHANGELOGs. [ci skip] 2015-04-22 14:44:30 +02:00
Siddharth Bhatore 8f131a9ed5 [ci skip] UpgradeLegacySignedCookieJar Doc fix 2015-04-22 13:39:38 +05:30
Prem Sichanugrist 3a20e83795 Add missing require for String#strip_heredoc 
This method is being used in `#xml_http_request`, but was not properly
required. This causes `NoMethodError` on projects that are doing
integration test.
 2015-04-17 15:21:18 -04:00
yuuji.yaginuma 653246f3e5 remove extra `=` in form builder example [ci skip] 2015-04-15 23:06:01 +09:00
Arthur Nogueira Neves 7d4a1ab9ee Merge pull request #19757 from Strech/http-auth-realm-unquoting 
Tiny optimization of http auth Realm unquoting
 2015-04-14 17:00:32 -04:00
Rafael Mendonça França b4a9c59a47 Fix typos in the documentation [ci skip] 2015-04-14 12:56:43 -04:00
Rafael Mendonça França 9ec54d9500 Merge pull request #19736 from kmcphillips/master 
Set default form builder for a controller
 2015-04-14 11:23:49 -04:00
Strech (Sergey Fedorov) 53dedfcde9 Tiny optimization of http auth Realm unquoting 2015-04-14 19:56:07 +05:00
eileencodes db8897c2de Use `silence_warnings` on `StaticTests` 
When 7e504927 was merged setting `Encoding.default_internal` and
`Encoding.default_external` would throw a warning when the ActionPack
tests were run.

Example warning: `actionpack/test/dispatch/static_test.rb:12: warning:
setting Encoding.default_external`

This patch silences the warnings as other similar tests do for setting
default_internal and default_external.
 2015-04-14 08:54:13 -04:00
Guillermo Iguaran 33ea933d7b Merge pull request #19753 from jonatack/use-ruby-2-2-2 
Upgrade to Ruby 2.2.2
 2015-04-13 22:56:47 -05:00
Kevin McPhillips 2b8acdcd21 Override default form builder for a controller 2015-04-13 23:43:34 -04:00
Jon Atack 32f7491808 Upgrade to Ruby 2.2.2 
and fix the grammar in the ruby_version_check.rb user message.
 2015-04-14 08:41:56 +05:30
Zachary Scott 2778ba8ed5 Add note regarding CSRF for APIs, as a use-case for skipping it [ci skip] 2015-04-12 21:58:40 -07:00
Zachary Scott e1ebf146b5 Apply comments from @jeremy regarding why HTML and Javascript requests 
specifically are checked for CSRF, when dealing with the browser.

[ci skip]
 2015-04-12 21:56:01 -07:00
Vladimir Lyzo fd0f27ce79 update request_forgery_protection docs [ci skip] 2015-04-12 21:48:34 -07:00
Santiago Pastorino e085a7ddb8 Revert "Merge pull request #19682 from supercaracal/fix_force_ssl_redirection_flash_error" 
This reverts commit d215620340, reversing
changes made to bbbbfe1ac0.
 2015-04-12 22:26:35 -03:00
Taishi Kasuga 3449da4a6c fix a wrong feature test method name 2015-04-11 18:59:56 +09:00
Toshi MARUYAMA 7e50492709 [Rails4 regression] prevent thin and puma cause error in Non ASCII URL on Windows 
* https://github.com/rails/rails/issues/19187
* https://github.com/rails/rails/pull/19533
* https://github.com/macournoyer/thin/issues/268

These are serious Rails 4 regression for Redmine Bitnami Windows users.

https://community.bitnami.com/t/problems-with-3-0-1-installation-see-report-inside/30195/

It is not caused on webrick users.

Related:

* https://github.com/rack/rack/issues/732#issuecomment-67677272
* https://github.com/phusion/passenger/issues/1328
 2015-04-09 19:25:12 -03:00
Toshi MARUYAMA 2a73b5999e wrap "require 'drb/unix'" by bgin-end at test/abstract_unit.rb 
Related: #19617, #19187, #19533, #19689, #19675.

'drb/unix' does not exist on mingw.
 2015-04-09 19:25:11 -03:00
Taishi Kasuga 242c5c7ae4 fix fails to force_ssl_redirection if session_store is disabled 2015-04-09 11:21:00 +09:00
Rafael Mendonça França 8c8e9b34d5 Merge pull request #19700 from tancnle/trivial-shallow-nesting-depth-count 
A shorter and more concise version of select..size
 2015-04-08 20:08:06 -03:00
Tan Le 8d605b8ee8 A shorter and more concise version of select..size 2015-04-09 09:05:05 +10:00
Rafael Mendonça França 041c2c879a Merge pull request #19633 from y00rb/sort_router_parameters_duplicated_keys 
avoid error when sort mixture keys in symbol and string
 2015-04-08 19:01:11 -03:00
Yang Bo a77de09812 sort_by instead of sort 
it is avoid sort errot within different and mixed keys.
used `sort_by` + `block` to list parameter by keys.
keep minimum changes
 2015-04-08 22:18:56 +08:00
Bruce Park 164be37da5 remove new line between doc and method 2015-04-07 05:02:22 +00:00
Bruce Park 85eacc64a6 added docs for ActionDispatch::Request::Session#create 2015-04-07 01:23:51 +00:00
Rafael Mendonça França 8b88df94eb Merge pull request #19029 from iainbeeston/skipping-undefined-callbacks 
Raise ArgumentError if an unrecognised callback is skipped
 2015-04-06 19:07:21 -03:00
Santiago Pastorino 2c16acde0d Merge pull request #19666 from mikej/master 
fix missing "if" in API docs for ActionController::Parameters#permit
 2015-04-06 10:47:48 -03:00
eileencodes 188934cdac Fix ActionPack tests after changes to missing template logger 
After merging #19377 ActionPack tests were missing a require for
`ActiveSupport::LogSubscriber::TestHelper` and change didn't take
into account that logger could be nil. Added the require and only log to
info if logger exists.

This wasn't caught earlier because these tests only run after a merge.
 2015-04-06 09:03:13 -04:00
Eileen M. Uchitelle 6b98fbacf7 Merge pull request #19665 from eileencodes/fix-parse_query-method-signature 
Fix method signature of `parse_query` to match rack
 2015-04-06 08:34:20 -04:00
eileencodes 0eef12c0b3 Fix method signature of `parse_query` to match rack 
Recently rack was changed to have a second argument on the `parse_query`
method (in rack/rack#781). Rails relies on this and it's `parse_query`
method was complaining about missing the second argument. I changed the
arguments to `*` so we don't have this issue in the future.
 2015-04-06 08:30:32 -04:00
Michael Josephson e39f11f50a fix missing "if" in API docs for ActionController::Parameters#permit 2015-04-06 13:22:07 +01:00
Stephen Bussey 0de4a23d1c head no_content when there is no template or action performed 2015-04-05 15:46:50 -04:00