| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #19736 from kmcphillips/master | Rafael Mendonça França | 2015-04-14 | 10 | -1/+129 |
| |\ | | | | | Set default form builder for a controller | ||||
| | * | Override default form builder for a controller | Kevin McPhillips | 2015-04-13 | 10 | -1/+129 |
| | | | |||||
| * | | Use `silence_warnings` on `StaticTests` | eileencodes | 2015-04-14 | 1 | -6/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | When 7e504927 was merged setting `Encoding.default_internal` and `Encoding.default_external` would throw a warning when the ActionPack tests were run. Example warning: `actionpack/test/dispatch/static_test.rb:12: warning: setting Encoding.default_external` This patch silences the warnings as other similar tests do for setting default_internal and default_external. | ||||
| * | | Merge pull request #19751 from y-yagi/fix_indent_of_controller | Andrew White | 2015-04-14 | 2 | -4/+7 |
| |\ \ | | | | | | | fix indent in routes when using namespaced controllers | ||||
| | * | | fix indent in routes when using namespaced controllers | yuuji.yaginuma | 2015-04-14 | 2 | -4/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: namespace :foo do namespace :bar do get 'baz/index' end end After: namespace :foo do namespace :bar do get 'baz/index' end end | ||||
| * | | | Merge pull request #19755 from yuki24/activerecord/support-for-set | Yves Senn | 2015-04-14 | 3 | -0/+15 |
| |\ \ \ | | | | | | | | | | | | | Add support for Set to Relation#where | ||||
| | * | | | Add support for Set to Relation#where | Yuki Nishijima | 2015-04-13 | 3 | -0/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously `#where` used to treat `Set`objects as nil, but now it treats them as an array: set = Set.new([1, 2]) Author.where(:id => set) # => SELECT "authors".* FROM "authors" WHERE "authors"."id" IN (1, 2) | ||||
| * | | | | Merge pull request #19754 from yuki24/ruby-2.2.2-on-travis | Guillermo Iguaran | 2015-04-13 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | Use Ruby 2.2.2 on travis | ||||
| | * | | | | Use Ruby 2.2.2 on travis | Yuki Nishijima | 2015-04-13 | 1 | -1/+1 |
| | |/ / / | | | | | | | | | | | | | This is required to run https://github.com/rails/rails/pull/19752 successfully. | ||||
| * | | | | Merge pull request #19753 from jonatack/use-ruby-2-2-2 | Guillermo Iguaran | 2015-04-13 | 12 | -15/+15 |
| |\ \ \ \ | |/ / / |/| | | | Upgrade to Ruby 2.2.2 | ||||
| | * | | | Upgrade to Ruby 2.2.2 | Jon Atack | 2015-04-14 | 12 | -15/+15 |
| | | | | | | | | | | | | | | | | | and fix the grammar in the ruby_version_check.rb user message. | ||||
| * | | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2015-04-14 | 7 | -48/+34 |
| |\ \ \ \ | |_|/ / |/| | | | |||||
| | * | | | [ci skip] add missing file extension | Mikhail Dieterle | 2015-04-10 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | [ci skip] format rake output | Mikhail Dieterle | 2015-04-10 | 1 | -5/+3 |
| | | | | | |||||
| | * | | | [ci skip] fix helper name | Mikhail Dieterle | 2015-04-10 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | [ci skip] Wrap with double quotation | yui-knk | 2015-04-10 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | [ci skip] Add `,` | yui-knk | 2015-04-08 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | [ci skip] Remove unnecessary lines | yui-knk | 2015-04-01 | 1 | -2/+0 |
| | | | | | |||||
| | * | | | [ci skip] Add `:` | yui-knk | 2015-04-01 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | No need to mention unit tests in testing guide anymore | Kir Shatrov | 2015-03-31 | 1 | -2/+0 |
| | | | | | |||||
| | * | | | New test runner syntax in testing guide | Kir Shatrov | 2015-03-31 | 1 | -4/+4 |
| | | | | | |||||
| | * | | | Suggest new hash syntax in testing guide | Kir Shatrov | 2015-03-31 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | [ci skip] Remove unnecessary `>` | yui-knk | 2015-03-31 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Don't suggest `bin/rails test controllers` | Kir Shatrov | 2015-03-31 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | Add missing "of" to testing guide. | Hendy Tanata | 2015-03-30 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge branch 'kirs' | Matthew Draper | 2015-03-30 | 1 | -30/+23 |
| | |\ \ \ | |||||
| | | * | | | Switch to `bin/rails test` in testing guide | Kir Shatrov | 2015-03-30 | 1 | -30/+23 |
| | | | | | | | | | | | | | | | | rails/rails#18305 | ||||
| * | | | | | Merge pull request #19742 from vngrs/config_autoload_paths_wrong_doc | Carlos Antonio da Silva | 2015-04-13 | 1 | -3/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix the wrong documentation about config.autoload_paths [ci skip] | ||||
| | * | | | | | Fix the wrong documentation about config.autoload_paths [ci skip] | Mehmet Emin İNAÇ | 2015-04-13 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | config.autoload_paths is not changeable from environment specific configuration files. | ||||
| * | | | | | | Improve note about unique index and foreign key on has_one association | Carlos Antonio da Silva | 2015-04-13 | 1 | -6/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Related to f1af967e0055a33c45071848a049ff342e9c291e. [ci skip] | ||||
| * | | | | | | Merge pull request #19741 from greysteil/add-note-about-partial-index-support | Yves Senn | 2015-04-13 | 1 | -0/+2 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Document that partial indexes are only supported by Postgres and SQLite. | ||||
| | * | | | | | | Document that partial indexes are only supported by Postgres and SQLite. | Grey Baker | 2015-04-13 | 2 | -0/+8 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | Fixes #18106 | ||||
| * | | | | | | Merge branch 'feature/doc_request_forgery_protection_for_api' | Zachary Scott | 2015-04-12 | 1 | -7/+17 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Add note regarding CSRF for APIs, as a use-case for skipping it [ci skip] | Zachary Scott | 2015-04-12 | 1 | -0/+4 |
| | | | | | | | | |||||
| | * | | | | | | Apply comments from @jeremy regarding why HTML and Javascript requests | Zachary Scott | 2015-04-12 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | specifically are checked for CSRF, when dealing with the browser. [ci skip] | ||||
| | * | | | | | | update request_forgery_protection docs [ci skip] | Vladimir Lyzo | 2015-04-12 | 1 | -7/+8 |
| |/ / / / / / | |||||
| * | | | | | | Add a note regarding add_column restricted API [ci skip] | Zachary Scott | 2015-04-12 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should document current behavior, and this is design of API for now. Closes #17597 | ||||
| * | | | | | | Merge branch 'master' of github.com:rails/rails | Zachary Scott | 2015-04-12 | 3 | -31/+3 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Revert "Merge pull request #19682 from ↵ | Santiago Pastorino | 2015-04-12 | 3 | -31/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | supercaracal/fix_force_ssl_redirection_flash_error" This reverts commit d215620340be7cb29e2aa87aab22da5ec9e6e6a7, reversing changes made to bbbbfe1ac02162ecb5e9a7b560134a3221f129f3. | ||||
| * | | | | | | | Add note wrt foreign key constraint to ensure data integrity | Zachary Scott | 2015-04-12 | 1 | -0/+10 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks for patch @sgrif :trollface: Closes #18216 | ||||
| * | | | | | | Apply edits from @senny to close #19397 [ci skip] | Zachary Scott | 2015-04-12 | 1 | -4/+1 |
| | | | | | | | |||||
| * | | | | | | Apply comments from @rafaelfranca: we shouldn't recommend you use scaffold css | Zachary Scott | 2015-04-12 | 1 | -9/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Closes #19492 and fixes #19453 | ||||
| * | | | | | | Merge branch 'patch-1' | Zachary Scott | 2015-04-12 | 1 | -3/+5 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Enhance documentation of pluck with a hint to ids [ci skip] | wingfire | 2015-04-12 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation is giving an example that can be replaced by a more dry command. Give a hint that ids can be used instead of pluck(:id). | ||||
| * | | | | | | | Merge pull request #19564 from jonatack/counter_cache_docs | Zachary Scott | 2015-04-12 | 1 | -3/+11 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | [skip ci] Fix counter_cache in the Rails Guides | ||||
| | * | | | | | | | [skip ci] Fix counter_cache in the Rails Guides | Jon Atack | 2015-03-28 | 1 | -3/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the AR Associations Guide, this PR fixes: - The counter_cache declaration is now shown only in the `belongs_to` association. - The docs stated that the counter_cache declaration needs to be on the `has_many` side; now corrected to the `belongs_to` side. - Split the custom column explanation out to a separate paragraph. - Simplify the NOTE because it is true both with and without a custom column name. | ||||
| * | | | | | | | | Fix (intermittent?) test failure | Matthew Draper | 2015-04-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't actually need to enumerate the possible types here any more; that dates back to before e105e599e706780905d4c348394da989de3b200f, when they were symbols, and indistinguishable from other options. | ||||
| * | | | | | | | | Merge pull request #19738 from ojab/squish | Xavier Noria | 2015-04-12 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Speedup String#squish | ||||
| | * | | | | | | | | Speedup String#squish | ojab | 2015-04-12 | 1 | -2/+1 |
| | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | | Merge branch 'nishantmodak-view_paths' | Zachary Scott | 2015-04-12 | 1 | -1/+33 |
| |\ \ \ \ \ \ \ \ | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |