aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #14007 from kintamanimatt/missing_directory_slashesRafael Mendonça França2014-02-101-9/+9
|\ | | | | Add missing directory slashes [ci skip]
| * Add missing directory slashes [ci skip]Matthew Nicholas Bradley2014-02-101-9/+9
| |
* | Avoid using deprecated arel constantsRafael Mendonça França2014-02-102-3/+3
| |
* | Merge pull request #13919 from jcoyne/fix_jruby_encodingRafael Mendonça França2014-02-102-3/+10
|\ \ | | | | | | Fix tidy_bytes for JRuby
| * | Fix tidy_bytes for JRubyJustin Coyne2014-02-102-3/+10
| |/ | | | | | | | | The previous implementation was broken because JRuby (1.7.10) doesn't have a code converter for UTF-8 to UTF8-MAC.
* | docs, link to HTTP and CGI header definitions. [ci skip]Yves Senn2014-02-102-3/+5
| | | | | | | | This was a reaction to: https://github.com/rails/rails/pull/9700#issuecomment-34550210
* | docs, update broken link. [ci skip]Yves Senn2014-02-101-2/+2
|/ | | | from https://github.com/rack/rack/blob/master/lib/rack/server.rb#L289-L300.
* docs, mention that the current inflection rules are frozen. [ci skip]Yves Senn2014-02-101-0/+4
| | | | Closes #13993.
* Merge pull request #13998 from gaurish/doc-rails-threadsafeRobin Dupret2014-02-091-1/+1
|\ | | | | `Rails.threadsafe!` mode is deprecated, Update Docs [ci skip]
| * `Rails.threadsafe!` mode is deprecatedGaurish Sharma2014-02-101-1/+1
| | | | | | | | [ci skip]
* | Merge pull request #13997 from dmitry/test_coverage_improvementRafael Mendonça França2014-02-095-12/+46
|\ \ | | | | | | Test coverage improvement
| * | add test coverage for activemodel Dirty#reset_changesDmitry Polushkin2014-02-091-0/+19
| | |
| * | add actionmailer test coverage for undefined delivery methodDmitry Polushkin2014-02-092-10/+21
| | |
| * | add activerecord test coverage for `sanitize_sql_array`Dmitry Polushkin2014-02-091-0/+5
| | | | | | | | | | | | check it is handles empty statement
| * | move alias method `sanitize_conditions` to a correct placeDmitry Polushkin2014-02-091-2/+1
| | |
* | | Set the :shallow_path as each scope is generatedAndrew White2014-02-093-1/+95
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Simplify doc [ci skip]Vijay Dev2014-02-091-1/+1
| | | | | | | | | | | | 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.
* | Merge pull request #13630 from seapy/masterVijay Dev2014-02-091-2/+2
|\ \ | | | | | | Fixed typo [ci skip]
| * | Fixed typo [ci skip]seapy2014-01-081-2/+2
| | | | | | | | | | | | singular is more suited to
* | | Merge pull request #13994 from elysdir/masterVijay Dev2014-02-091-3/+3
|\ \ \ | | | | | | | | Clarifying confusing phrasing
| * | | Clarifying confusing phrasingJed Hartman2014-02-091-3/+3
| | | |
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-02-099-12/+13
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Conflicts: guides/source/active_record_validations.md guides/source/api_documentation_guidelines.md guides/source/configuring.md
| * | | Fixed a grammatical error in Booleans section of API documentation guideZachary Scott2014-02-091-1/+1
| | | | | | | | | | | | | | | | from e1e17a5
| * | | adds a section about booleans in the API guidelines [ci skip]Xavier Noria2014-02-091-0/+47
| | | |
| * | | Use full-length version of multiple from c7abc51Zachary Scott2014-02-091-1/+1
| | | |
| * | | docs, link MySQL manual for multi column indexes. [ci ckip].Yves Senn2014-02-091-1/+3
| | | | | | | | | | | | | | | | Closes #9131.
| * | | Specify what #starts_with? we're talking about. Also added a note whatZachary Scott2014-02-091-1/+2
| | | | | | | | | | | | | | | | kind of exception we should expect for this internal comment.
| * | | Fix grammar of internal comment and modify it's locationZachary Scott2014-02-091-1/+2
| | | |
| * | | Fixed spelling error: `extracetd` => `extracted`Calvin Tam2014-02-071-1/+1
| | | |
| * | | Remove old comments about suppressing warnings.Vipul A M2014-01-251-1/+1
| | | |
| * | | `framwork` => `framework`Vipul A M2014-01-241-1/+1
| | | |
| * | | `easiy` => `easy`Vipul A M2014-01-241-1/+1
| | | |
| * | | `requies` => `requires`Vipul A M2014-01-241-1/+1
| | | |
| * | | Remove duplicate configuration option for ActiveSupport [ci skip]Zachary Scott2014-01-161-1/+0
| | | | | | | | | | | | | | | | Fixes rails/rails#13732
| * | | add punctuationWaynn Lue2014-01-131-2/+2
| | | |
| * | | e-mail => email, and subject/verb agreementWaynn Lue2014-01-131-1/+1
| | | |
| * | | change to "check out"Waynn Lue2014-01-081-1/+1
| | | |
* | | | Merge pull request #13982 from dskang/fix-response-flatten-infinite-recursionAaron Patterson2014-02-092-1/+19
|\ \ \ \ | | | | | | | | | | Fix response flatten infinite recursion
| * | | | Prevent [response].flatten from recursing infinitely.Dan Kang2014-02-082-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Add missing test for response destructuring.Myron Marston2014-02-081-0/+9
| | | | |
* | | | | Merge pull request #13990 from zzak/ap_dont_autoload_filter_parametersRafael Mendonça França2014-02-091-1/+0
|\ \ \ \ \ | | | | | | | | | | | | FilterParameters is referenced at the class level from the Request
| * | | | | FilterParameters is referenced at the class level from the RequestZachary Scott2014-02-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge pull request #13985 from zzak/remove_old_todo_in_url_for_testCarlos Antonio da Silva2014-02-091-3/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove outdated TODO from url_for test, this test was fixed in 900a2d30
| * | | | | | Remove outdated TODO from url_for test, this test was fixed in 900a2d30Zachary Scott2014-02-091-3/+0
| |/ / / / /
* | | | | / Remove end of line whitespace from bb87c16Zachary Scott2014-02-091-4/+4
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #13983 from hsbt/remove-warningGodfrey Chan2014-02-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | use File.exist? instead of File.exists?
| * | | | | use File.exist? instead of File.exists?SHIBATA Hiroshi2014-02-091-1/+1
|/ / / / /
* | | | | use feature detection to decide which implementation to useAaron Patterson2014-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | Decouple the code from the particular Ruby version.
* | | | | Merge pull request #13981 from Fortisque/kevin/postgresql_reaper_threadsafeAaron Patterson2014-02-085-4/+15
|\ \ \ \ \ | | | | | | | | | | | | Reaper has access to threadsafe active? call
| * | | | | Reaper has access to threadsafe active? callKevin Casey2014-02-085-4/+15
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-16 14:14:48 +0000