github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
25,953 Commits 34 Branches 105 Tags
493cf44682c19bd69eb2463d260c3bf29c7a23d7
Commit Graph

6416 Commits

Author SHA1 Message Date
Vijay Dev
e0efe48c45 Merge branch 'master' of github.com:lifo/docrails 2011-11-13 22:29:26 +05:30
José Valim
2591cc6692 Merge pull request #3617 from indirect/remote_ip 
refactor RemoteIp middleware
 2011-11-13 04:53:51 -08:00
Akira Matsuda
b74aedff3c Unneeded require memoizable 2011-11-12 23:15:54 +09:00
Andre Arko
317f4e2236 defer calculating the remote IP until requested 2011-11-12 00:45:31 -10:00
Andre Arko
9432163c60 refactor RemoteIp middleware 
- return the last forwarded IP before REMOTE_ADDR to handle proxies
- remove completely superfluous RemoteIpGetter class
- remove duplication of trusted proxies regexp
- remove unused constant from Request
- move comments from Request to where they are actually relevant
- edit comments for clarity of purpose

The original code (confusingly) tried to return REMOTE_ADDR both at the beginning and the end of the chain of options. Since REMOTE_ADDR is _always_ set, this is kind of silly. This change leaves REMOTE_ADDR as the last option, so that proxied requests will be assigned the correct remote IP address.
 2011-11-11 21:25:08 -10:00
Xavier Noria
c3035e1800 Merge pull request #3613 from mitio/fix-actionpack-responder-docs 
Fix wording and minor typos in the Responder RDoc
 2011-11-11 10:03:29 -08:00
Dimitar Dimitrov
a766d834a7 Fix wording and minor typos in the Responder RDoc 2011-11-11 19:52:38 +02:00
José Valim
bdd76fb5e3 Merge pull request #3592 from avakhov/av-highlight-regexp 
Fix and simplify highlight regexp
 2011-11-10 02:53:43 -08:00
José Valim
d2cfa982fd Merge pull request #3581 from amatsuda/metal_response_body_19 
AC::Metal#response_body= stores different value in Ruby 1.8 and 1.9
 2011-11-10 00:49:14 -08:00
Alexey Vakhov
b5c3987294 Fix and simplify highlight regexp 2011-11-10 11:26:42 +04:00
Alexey Vakhov
983a2dccaa Cosmetic fix in number_to_currency docs 2011-11-10 09:45:57 +04:00
Vijay Dev
cff1d751d0 Merge branch 'master' of github.com:lifo/docrails 
Conflicts:
	railties/guides/source/active_record_querying.textile
 2011-11-08 21:35:17 +05:30
Alexey Vakhov
979f3f894b Fix small typo in link_to_function doc 2011-11-08 18:01:19 +04:00
Bradford Folkens
bd559b0068 Fix trouble using :subdomain in development environment when using numeric addresses. 
See-also pull request #3561 from 3-1-stable

    Otherwise the following occurs:

    TypeError: can't convert nil into String
        /Users/bfolkens/dev/bfolkens-rails-core/actionpack/lib/action_dispatch/http/url.rb:75:in host_or_subdomain_and_domain'
        /Users/bfolkens/dev/bfolkens-rails-core/actionpack/lib/action_dispatch/http/url.rb:37:in url_for'
        /Users/bfolkens/dev/bfolkens-rails-core/actionpack/lib/action_dispatch/routing/url_for.rb:147:in test_subdomain_may_be_accepted_with_numeric_host'
        /Users/bfolkens/dev/bfolkens-rails-core/activesupport/lib/active_support/testing/setup_and_teardown.rb:67:in run'
        /Users/bfolkens/dev/bfolkens-rails-core/activesupport/lib/active_support/callbacks.rb:426:in send'
        /Users/bfolkens/dev/bfolkens-rails-core/activesupport/lib/active_support/callbacks.rb:81:in run'
 2011-11-08 07:52:35 -06:00
Ivan Evtukhovich
cf0a96bc6a DrbStore removed from cache backends 2011-11-07 18:57:55 +04:00
Vijay Dev
6ac56ac93b fix incorrect code example 2011-11-07 17:58:03 +05:30
Akira Matsuda
cc3e738d89 Fix AC::Metal#response_body= to store same value on Ruby 1.8 and 1.9 
This was because String#respond_to?(:each) differs in 1.8 and 1.9
 2011-11-07 16:24:54 +09:00
Dalibor Nasevic
759906d512 Fixed stale doc in AbstractController::Layouts 2011-11-06 14:43:11 +01:00
Vijay Dev
17947cebc0 Merge branch 'master' of github.com:lifo/docrails 2011-11-06 17:27:44 +05:30
Jon Leighton
8a2f0a9623 RUBY_ENGINE is not defined on 1.8 2011-11-06 10:54:59 +00:00
Jon Leighton
fc988115f7 Implement a workaround for a bug in ruby-1.9.3p0. 
The bug is that an error would be raised while attempting to convert a
template from one encoding to another.

Please see http://redmine.ruby-lang.org/issues/5564 for more details.

The workaround is to load all conversions into memory ahead of time,
and will only happen if the ruby version is *exactly* 1.9.3p0. The
hope is obviously that the underlying problem will be resolved in
the next patchlevel release of 1.9.3.
 2011-11-06 10:40:00 +00:00
Alexey Vakhov
949b3e743f Docs cosmetic fixes in Action View form_helper.rb 2011-11-06 11:46:28 +04:00
Vijay Dev
fdbc4e5f4e Merge branch 'master' of github.com:lifo/docrails 2011-11-05 20:45:11 +05:30
Waseem Ahmad
56207a3f01 Remove 'size' attribute from number_field form helper fixes #3454 
f.number_field generates <input type="number", size="30"../> which is
invalid HTML5. See: http://dev.w3.org/html5/spec/Overview.html#number-state
 2011-11-04 15:03:02 +05:30
Alexey Vakhov
a8468731f7 Fix javascript_include_tag examples in documentation 2011-11-03 09:02:11 +04:00
Alexey Vakhov
7463317115 Fix small typos in routing docs 2011-11-03 08:43:28 +04:00
Aviv Ben-Yosef
702aecb126 Fix typo in Dispatcher#controller documentation 2011-11-01 08:59:20 +02:00
Alexey Vakhov
5f4550889d Fix typo in constraints method documentation 2011-11-01 08:55:03 +04:00
Aaron Patterson
62a86748ae this should never return nil, so no use for "try" 2011-10-31 15:17:16 -04:00
Christopher Meiklejohn
6cbe4223a7 Ensure that the format isn't applied twice to the cache key, else it becomes impossible to target with expire_action. 2011-10-31 15:10:07 -04:00
Vijay Dev
c809de8291 Merge branch 'master' of github.com:lifo/docrails 2011-10-30 14:47:23 +05:30
Paul McMahon
07c4297282 Add missing type to number_field_tag documentation 2011-10-28 15:37:45 +09:00
Aaron Patterson
9027643798 scumbag 1.8: strings are enumerable :'( 2011-10-26 10:30:52 -07:00
José Valim
80768b739e Responders now return 204 No Content for API requests without a response body (as in the new scaffold) 2011-10-26 09:31:56 +02:00
Aaron Patterson
450257c95b properly handle lists of lists. Thanks @adrianpike for reporting! 2011-10-25 17:44:17 -07:00
mjy
e368583ba7 Adds missing closing regex slashes. 2011-10-25 15:08:28 -04:00
Nick Howard
a7641054d8 add namespacing when referring to ActionController::RedirectBackError 2011-10-25 10:39:20 -06:00
Brian Durand
2b04c2f66e Add ActionDispatch::Session::CacheStore as a generic way of storing sessions in a cache. 2011-10-21 13:13:29 -05:00
Vijay Dev
af1b5c54cf Merge branch 'master' of github.com:lifo/docrails 2011-10-20 23:20:44 +05:30
Marc Bowes
951a325c99 Remove the unneeded \d when sanitizing X-Request-Id. 2011-10-20 10:00:42 +03:00
José Valim
4ef7453694 Load object/blank and make use of presence. 2011-10-19 22:10:43 +02:00
José Valim
f1fecd9b4e Make tests run on 1.8.x, add integration setup. 2011-10-19 22:09:36 +02:00
David Heinemeier Hansson
ada78066fd Blah, SecureRandom#uuid is not supported in 1.8.7 -- cant wait for Rails 4.0 to drop compatibility with 1.8.x 2011-10-19 14:45:42 -05:00
José Valim
1b50207ed3 Require missing string access dependency. 2011-10-19 22:17:54 +03:00
José Valim
ddbb2cae31 Require securerandom as it is the proper dependency. 2011-10-19 22:15:25 +03:00
David Heinemeier Hansson
afde6fdd5e Added X-Request-Id tracking and TaggedLogging to easily log that and other production concerns 2011-10-19 12:59:33 -05:00
Alexey Vakhov
bed5825f77 Remove superfluous assignment in cookies 2011-10-18 22:57:55 +04:00
Alexey Vakhov
8f473dc9ae HTMl -> HTML: html scanner comment fix 2011-10-15 23:54:26 +04:00
Alexey Vakhov
f247c5f811 Update AC::RecordIdentifier example 2011-10-15 11:34:33 +04:00
Vijay Dev
e759c8882a Merge branch 'master' of github.com:lifo/docrails 2011-10-14 22:21:40 +05:30