Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | adding connection parameter to check_pending for migrations | kayvan | 2014-02-11 | 1 | -5/+5 |
| | |||||
* | add a send so `apply` can be called. Fixes #13510 | Aaron Patterson | 2014-02-11 | 2 | -1/+33 |
| | | | | | | | THIS IS A HUGE HACK. Thor does not allow us to define public methods without turning them in to "thor tasks". That means we cannot subclass the `apply` method and make it public, so we have to make the method private and call `send` on it. | ||||
* | Revert "Don't symbolize tainted data." [ci skip] | Xavier Noria | 2014-02-11 | 1 | -5/+1 |
| | | | | | | | | Reason: i18n whitelists now locales without passing through symbols, see https://github.com/svenfuchs/i18n/blob/master/lib/i18n.rb#L278. Therefore, this snippet is no longer a good practice. This reverts commit ec0664a6eb8906fcd31a53a1efad69bdc7fe6f5b. | ||||
* | Merge pull request #14016 from devlinzed/i18n_doc_fix | Xavier Noria | 2014-02-11 | 1 | -1/+5 |
|\ | | | | | Documentation: Don't symbolize tainted data. [ci skip] | ||||
| * | Don't symbolize tainted data. | devlin zed | 2014-02-11 | 1 | -1/+5 |
|/ | | | | | | | `I18n.locale=` symbolizes its argument, so passing it `params[:locale]` allows one to DOS your application by visiting `...?locale=` URLS repeatedly, with unique values, until the never-GCed symbols monopolize the available memory. | ||||
* | Merge pull request #14015 from acapilleri/add_patch | Guillermo Iguaran | 2014-02-11 | 1 | -1/+1 |
|\ | | | | | add patch in HTTP Verb Constraints [ci skip] | ||||
| * | add patch in HTTP Verb Constraints [ci skip] | Angelo capilleri | 2014-02-11 | 1 | -1/+1 |
|/ | |||||
* | test case to illustrate current PostgreSQL composite behavior. | Yves Senn | 2014-02-11 | 1 | -0/+42 |
| | |||||
* | Merge pull request #13571 from bak/getting_started_guide | Vijay Dev | 2014-02-11 | 1 | -17/+32 |
|\ | | | | | A pass over the Getting Started guide sections 1, 2, and 3 [ci skip] | ||||
| * | A pass over the Getting Started guide sections 1, 2, and 3 [ci skip] | Ben Cullen-Kerney | 2014-02-09 | 1 | -17/+32 |
| | | | | | | | | | | | | | | | | * 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 | ||||
* | | Merge pull request #14008 from udaykadaboina/jqueryUpgrade | Carlos Antonio da Silva | 2014-02-11 | 1 | -1/+1 |
|\ \ | | | | | | | Upgraded jquery-rails gem version | ||||
| * | | Upgraded jquery-rails gem version | Uday Kadaboina | 2014-02-03 | 1 | -1/+1 |
| | | | |||||
* | | | docs, hide inflector comment targeting only contributors. [ci skip] | Yves Senn | 2014-02-11 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | This is a follow up to: https://github.com/rails/rails/commit/07c70245a128cfe42f134be8759963dc98f1a63e As suggested by @fxn this comment should not be visible in the API: https://github.com/rails/rails/commit/07c70245a128cfe42f134be8759963dc98f1a63e#commitcomment-5331658 | ||||
* | | | Merge pull request #14007 from kintamanimatt/missing_directory_slashes | Rafael Mendonça França | 2014-02-10 | 1 | -9/+9 |
|\ \ \ | | | | | | | | | Add missing directory slashes [ci skip] | ||||
| * | | | Add missing directory slashes [ci skip] | Matthew Nicholas Bradley | 2014-02-10 | 1 | -9/+9 |
| | | | | |||||
* | | | | Avoid using deprecated arel constants | Rafael Mendonça França | 2014-02-10 | 2 | -3/+3 |
| | | | | |||||
* | | | | Merge pull request #13919 from jcoyne/fix_jruby_encoding | Rafael Mendonça França | 2014-02-10 | 2 | -3/+10 |
|\ \ \ \ | | | | | | | | | | | Fix tidy_bytes for JRuby | ||||
| * | | | | Fix tidy_bytes for JRuby | Justin Coyne | 2014-02-10 | 2 | -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 Senn | 2014-02-10 | 2 | -3/+5 |
| | | | | | | | | | | | | | | | | This was a reaction to: https://github.com/rails/rails/pull/9700#issuecomment-34550210 | ||||
* | | | | docs, update broken link. [ci skip] | Yves Senn | 2014-02-10 | 1 | -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 Senn | 2014-02-10 | 1 | -0/+4 |
| | | | | | | | | | | | | Closes #13993. | ||||
* | | | Merge pull request #13998 from gaurish/doc-rails-threadsafe | Robin Dupret | 2014-02-09 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | `Rails.threadsafe!` mode is deprecated, Update Docs [ci skip] | ||||
| * | | `Rails.threadsafe!` mode is deprecated | Gaurish Sharma | 2014-02-10 | 1 | -1/+1 |
| | | | | | | | | | | | | [ci skip] | ||||
* | | | Merge pull request #13997 from dmitry/test_coverage_improvement | Rafael Mendonça França | 2014-02-09 | 5 | -12/+46 |
|\ \ \ | | | | | | | | | Test coverage improvement | ||||
| * | | | add test coverage for activemodel Dirty#reset_changes | Dmitry Polushkin | 2014-02-09 | 1 | -0/+19 |
| | | | | |||||
| * | | | add actionmailer test coverage for undefined delivery method | Dmitry Polushkin | 2014-02-09 | 2 | -10/+21 |
| | | | | |||||
| * | | | add activerecord test coverage for `sanitize_sql_array` | Dmitry Polushkin | 2014-02-09 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | check it is handles empty statement | ||||
| * | | | move alias method `sanitize_conditions` to a correct place | Dmitry Polushkin | 2014-02-09 | 1 | -2/+1 |
| | | | | |||||
* | | | | Set the :shallow_path as each scope is generated | Andrew White | 2014-02-09 | 3 | -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 Dev | 2014-02-09 | 1 | -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/master | Vijay Dev | 2014-02-09 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Fixed typo [ci skip] | ||||
| * | | | Fixed typo [ci skip] | seapy | 2014-01-08 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | singular is more suited to | ||||
* | | | | Merge pull request #13994 from elysdir/master | Vijay Dev | 2014-02-09 | 1 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | Clarifying confusing phrasing | ||||
| * | | | | Clarifying confusing phrasing | Jed Hartman | 2014-02-09 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2014-02-09 | 9 | -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 guide | Zachary Scott | 2014-02-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | from e1e17a5 | ||||
| * | | | | adds a section about booleans in the API guidelines [ci skip] | Xavier Noria | 2014-02-09 | 1 | -0/+47 |
| | | | | | |||||
| * | | | | Use full-length version of multiple from c7abc51 | Zachary Scott | 2014-02-09 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | docs, link MySQL manual for multi column indexes. [ci ckip]. | Yves Senn | 2014-02-09 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | Closes #9131. | ||||
| * | | | | Specify what #starts_with? we're talking about. Also added a note what | Zachary Scott | 2014-02-09 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | kind of exception we should expect for this internal comment. | ||||
| * | | | | Fix grammar of internal comment and modify it's location | Zachary Scott | 2014-02-09 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Fixed spelling error: `extracetd` => `extracted` | Calvin Tam | 2014-02-07 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Remove old comments about suppressing warnings. | Vipul A M | 2014-01-25 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | `framwork` => `framework` | Vipul A M | 2014-01-24 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | `easiy` => `easy` | Vipul A M | 2014-01-24 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | `requies` => `requires` | Vipul A M | 2014-01-24 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Remove duplicate configuration option for ActiveSupport [ci skip] | Zachary Scott | 2014-01-16 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | Fixes rails/rails#13732 | ||||
| * | | | | add punctuation | Waynn Lue | 2014-01-13 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | e-mail => email, and subject/verb agreement | Waynn Lue | 2014-01-13 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | change to "check out" | Waynn Lue | 2014-01-08 | 1 | -1/+1 |
| | | | | |