aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update Travis settings for RubiniusErik Michaels-Ober2014-02-122-7/+2
| | | | /cc @brixen
* Merge pull request #14023 from prathamesh-sonpatki/assert_redirected_toCarlos Antonio da Silva2014-02-121-1/+1
|\ | | | | [Testing Guide] Explain usage of assert_redirected_to with named routes and ActiveRecord objects [ci skip]
| * [Testing Guide] Explain usage of assert_redirected_to with named routes and ↵Prathamesh Sonpatki2014-02-121-1/+1
| | | | | | | | Active Record objects [ci skip]
* | adding missed changekayvan2014-02-111-1/+1
| |
* | adding connection parameter to check_pending for migrationskayvan2014-02-111-5/+5
| |
* | add a send so `apply` can be called. Fixes #13510Aaron Patterson2014-02-112-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 Noria2014-02-111-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_fixXavier Noria2014-02-111-1/+5
|\ \ | | | | | | Documentation: Don't symbolize tainted data. [ci skip]
| * | Don't symbolize tainted data.devlin zed2014-02-111-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_patchGuillermo Iguaran2014-02-111-1/+1
|\ \ | | | | | | add patch in HTTP Verb Constraints [ci skip]
| * | add patch in HTTP Verb Constraints [ci skip]Angelo capilleri2014-02-111-1/+1
|/ /
* | test case to illustrate current PostgreSQL composite behavior.Yves Senn2014-02-111-0/+42
| |
* | Merge pull request #13571 from bak/getting_started_guideVijay Dev2014-02-111-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-Kerney2014-02-091-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/jqueryUpgradeCarlos Antonio da Silva2014-02-111-1/+1
|\ \ \ | | | | | | | | Upgraded jquery-rails gem version
| * | | Upgraded jquery-rails gem versionUday Kadaboina2014-02-031-1/+1
| | | |
* | | | docs, hide inflector comment targeting only contributors. [ci skip]Yves Senn2014-02-111-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_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
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 05:03:21 +0000