Commit Graph

42352 Commits

Author SHA1 Message Date
Godfrey Chan
6de4888e04 Fixed minor typo in test code 2014-02-11 01:54:17 -08:00
Rafael Mendonça França
d4b7aa735a Tests for the HybridSerializer 2014-02-11 01:54:17 -08:00
Godfrey Chan
25f68ac6a2 Removed an old test 2014-02-11 01:54:17 -08:00
Godfrey Chan
fafe8ece9d Added HybridSerializer to upgrade existing marshal cookies (wip: need tests) 2014-02-11 01:54:16 -08:00
Godfrey Chan
54641fa2e3 Just very so slightly better test coverage 2014-02-11 01:54:16 -08:00
Godfrey Chan
b927d67dec Renamed session_serializer option to cookies_serializer 2014-02-11 01:54:16 -08:00
Carlos Antonio da Silva
f0d8996dcc Merge pull request #14008 from udaykadaboina/jqueryUpgrade
Upgraded jquery-rails gem version
2014-02-11 07:21:37 -02:00
Yves Senn
92f567ab30 docs, hide inflector comment targeting only contributors. [ci skip]
This is a follow up to: 07c70245a1

As suggested by @fxn this comment should not be visible in the API:
07c70245a1 (commitcomment-5331658)
2014-02-11 09:08:16 +01:00
Zachary Scott
5c3eda874f Add tip about using RDoc's --pipe command to quickly test the output of
a piece of documentation.

This can be useful for trying out combinations of markup and code, as
discussed in rails/rails@225bcad
2014-02-10 23:29:33 -08:00
Rafael Mendonça França
488885a223 Merge pull request #14007 from kintamanimatt/missing_directory_slashes
Add missing directory slashes [ci skip]
2014-02-10 21:05:49 -02:00
Matthew Nicholas Bradley
67e6deea1c Add missing directory slashes [ci skip] 2014-02-10 22:55:37 +00:00
Rafael Mendonça França
73a431a50b Avoid using deprecated arel constants 2014-02-10 19:33:48 -02:00
Rafael Mendonça França
e063dbc602 Merge pull request #13919 from jcoyne/fix_jruby_encoding
Fix tidy_bytes for JRuby
2014-02-10 14:46:36 -02:00
Yves Senn
3b868cc99d docs, link to HTTP and CGI header definitions. [ci skip]
This was a reaction to: https://github.com/rails/rails/pull/9700#issuecomment-34550210
2014-02-10 15:51:51 +01:00
Yves Senn
56fa194daa docs, update broken link. [ci skip]
from https://github.com/rack/rack/blob/master/lib/rack/server.rb#L289-L300.
2014-02-10 15:32:01 +01:00
Justin Coyne
ae28e4beb3 Fix tidy_bytes for JRuby
The previous implementation was broken because JRuby (1.7.10) doesn't
have a code converter for UTF-8 to UTF8-MAC.
2014-02-10 08:10:44 -06:00
Yves Senn
07c70245a1 docs, mention that the current inflection rules are frozen. [ci skip]
Closes #13993.
2014-02-10 08:51:35 +01:00
Robin Dupret
3a428f38b2 Merge pull request #13998 from gaurish/doc-rails-threadsafe
`Rails.threadsafe!` mode is deprecated, Update Docs [ci skip]
2014-02-09 21:54:15 +01:00
Ben Cullen-Kerney
2868bab4df A pass over the Getting Started guide sections 1, 2, and 3 [ci skip]
* Add note about managing Ruby environments
* Point to curated lists of Ruby learning resources
* Expound on DRY and Convention over Configuration
* Remove note on superuser--thankfuly coders new to Rails don't have to sudo anymore :)
* Installation/verification instructions for SQLite3, since it's a dependency
2014-02-09 12:05:17 -08:00
Gaurish Sharma
395bcb5cfc Rails.threadsafe! mode is deprecated
[ci skip]
2014-02-10 00:53:51 +05:30
Rafael Mendonça França
e4911e9162 Merge pull request #13997 from dmitry/test_coverage_improvement
Test coverage improvement
2014-02-09 16:51:59 -02:00
Andrew White
462d7cb314 Set the :shallow_path as each scope is generated
If we set :shallow_path when shallow is called it can result in incorrect
paths if the resource is inside a namespace because namespace itself sets
the :shallow_path option to the namespace path.

We fix this by removing the :shallow_path option from shallow as that should
only be turning shallow routes on and not otherwise affecting the scope.
To do this we need to treat the :shallow option to resources differently to
other scope options and move it to before the nested block is called.

This change also has the positive side effect of making the behavior of the
:shallow option consistent with the shallow method.

Fixes #12498.
2014-02-09 10:46:07 -08:00
Dmitry Polushkin
8acd58f23c add test coverage for activemodel Dirty#reset_changes 2014-02-09 18:44:24 +00:00
Dmitry Polushkin
5af7cab02d add actionmailer test coverage for undefined delivery method 2014-02-09 18:41:41 +00:00
Vijay Dev
72e11abeaf Simplify doc [ci skip]
The `as` option was already explained in a previous example
and doesn't need to be repeated. Explain only the `locals` option
which the example is meant for.
2014-02-09 23:58:09 +05:30
Vijay Dev
ccd908f9ce Merge pull request #13630 from seapy/master
Fixed typo [ci skip]
2014-02-09 23:51:46 +05:30
Vijay Dev
8b5d08aca2 Merge pull request #13994 from elysdir/master
Clarifying confusing phrasing
2014-02-09 23:39:49 +05:30
Vijay Dev
92fdd65162 Merge branch 'master' of github.com:rails/docrails
Conflicts:
	guides/source/active_record_validations.md
	guides/source/api_documentation_guidelines.md
	guides/source/configuring.md
2014-02-09 23:33:55 +05:30
Jed Hartman
f25e41167d Clarifying confusing phrasing 2014-02-09 09:36:53 -08:00
Aaron Patterson
33be58b206 Merge pull request #13982 from dskang/fix-response-flatten-infinite-recursion
Fix response flatten infinite recursion
2014-02-09 08:50:28 -08:00
Rafael Mendonça França
a5ee843d91 Merge pull request #13990 from zzak/ap_dont_autoload_filter_parameters
FilterParameters is referenced at the class level from the Request
2014-02-09 11:58:10 -02:00
Carlos Antonio da Silva
e08514e822 Merge pull request #13985 from zzak/remove_old_todo_in_url_for_test
Remove outdated TODO from url_for test, this test was fixed in 900a2d30
2014-02-09 11:49:18 -02:00
Zachary Scott
a503444429 Remove end of line whitespace from bb87c16 2014-02-09 14:06:06 +01:00
Dmitry Polushkin
ec43584431 add activerecord test coverage for sanitize_sql_array
check it is handles empty statement
2014-02-09 12:05:42 +00:00
Dmitry Polushkin
424b2d8594 move alias method sanitize_conditions to a correct place 2014-02-09 12:04:26 +00:00
Zachary Scott
ae7580ac28 Fixed a grammatical error in Booleans section of API documentation guide
from e1e17a5
2014-02-09 12:30:00 +01:00
Xavier Noria
7afd92e60b adds a section about booleans in the API guidelines [ci skip] 2014-02-09 12:29:45 +01:00
Zachary Scott
605c81b9de Use full-length version of multiple from c7abc51 2014-02-09 12:29:00 +01:00
Yves Senn
4e4a92e78a docs, link MySQL manual for multi column indexes. [ci ckip].
Closes #9131.
2014-02-09 12:28:50 +01:00
Zachary Scott
17b0edde57 Specify what #starts_with? we're talking about. Also added a note what
kind of exception we should expect for this internal comment.
2014-02-09 12:27:43 +01:00
Zachary Scott
dbe3345c4f Fix grammar of internal comment and modify it's location 2014-02-09 12:27:36 +01:00
Zachary Scott
8d7923b7eb FilterParameters is referenced at the class level from the Request
Since it's already required in the file, we don't need to use autoload
too. This commit is symmetrical change to 0b10180 for Response.
2014-02-09 11:30:49 +02:00
Godfrey Chan
6ac2655eca Merge pull request #13983 from hsbt/remove-warning
use File.exist? instead of File.exists?
2014-02-09 01:14:00 -08:00
SHIBATA Hiroshi
a09c07890a use File.exist? instead of File.exists? 2014-02-09 17:39:55 +09:00
Dan Kang
069bc27385 Prevent [response].flatten from recursing infinitely.
Returning `self` from within the array returned by `to_ary`
caused this. Instead, we can just substitute another object.
It provides the `each` behavior required by the rack spec.
2014-02-08 23:22:04 -08:00
Aaron Patterson
76af5c1d30 use feature detection to decide which implementation to use
Decouple the code from the particular Ruby version.
2014-02-08 23:21:07 -08:00
Aaron Patterson
e4dc3035ce Merge pull request #13981 from Fortisque/kevin/postgresql_reaper_threadsafe
Reaper has access to threadsafe active? call
2014-02-08 23:12:07 -08:00
Zachary Scott
dfe9cf1ace Remove outdated TODO from url_for test, this test was fixed in 900a2d30 2014-02-09 04:20:56 +02:00
Myron Marston
cbd10e27d1 Add missing test for response destructuring. 2014-02-08 17:40:28 -08:00
Kevin Casey
02a3c0e771 Reaper has access to threadsafe active? call 2014-02-08 17:38:54 -08:00