aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* More granular console SQL colorationChris Tonkinson2015-06-231-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new coloration approach makes it easier to scan the rails console for specific types of activity with more fine-grained visual cues. Virtual terminal ANSI color escape codes are used when displaying SQL statements in the rails console. The former implementation alternates line prefix information (including the statement name and execution latency) between CYAN and MAGENTA. This visually differentiates any SQL statements in the log and is useful for quickly scanning for database activity. While a great idea and a solid foundation, alternating between just two colors on an even/odd basis (much like striping an HTML table) can be improved upon. This patch replaces the even/odd striping with a more comprehensive scheme that applies coloration based on the type of statement being run. Every statement logged has its prefix (name and latency) colored white (as the statement body was previously). The statement body is now colored according to the nature of the statement: - INSERT statements are GREEN (symbolic of creation or genesis) - SELECT statements are BLUE (typically used for informational displays, as SELECT statements do not normally have side-effects) - DELETE statements are RED (commonly used to indicate the danger of a destructive action) - UPDATE statements are YELLOW (it's like a less extreme RED :P) - TRANSACTION statements are CYAN (arbitrary) - and any other statements are MAGENTA (again, arbitrary)
* Merge pull request #20674 from yui-knk/fix/guide2Rafael Mendonça França2015-06-231-1/+1
|\ | | | | [ci skip] Make clear what `this method` is
| * [ci skip] Make clear what `this method` isyui-knk2015-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | In this sentence, there are three candidates of `this method` * default_url_options * url_for * helper method(s) so make it clear.
* | A few documentation fixes [ci skip]Robin Dupret2015-06-233-8/+8
| |
* | Remove the paragraph about Rails::Server#middlewareRobin Dupret2015-06-231-18/+0
|/ | | | | | | | | | | As of 56903585, the Rack::ContentLength middleware isn't included by default anymore. The only remaining middleware is Rack::Lock ; since it's only included when using WEBrick, it's certainly not worth documenting it in the guides. [ci skip]
* Merge pull request #20673 from aditya-kapoor/correct-preload-docYves Senn2015-06-231-1/+1
|\ | | | | | | [ci skip] correct for ActiveRecord::Associations::Preloader
| * [ci skip] correct for ActiveRecord::Associations::Preloader:Aditya Kapoor2015-06-231-1/+2
| |
* | docs, add missing closing bracket. [ci skip]Yves Senn2015-06-231-1/+1
|/
* Merge pull request #20552 from jamesdabbs/belongs-to-polymorphic-force-reloadYves Senn2015-06-233-1/+10
|\ | | | | | | Fix `undefined method uncached` for polymorphic belongs_to #20426
| * Fix `undefined method uncached` for polymorphic belongs_to #20426James Dabbs2015-06-132-1/+2
| | | | | | | | | | | | | | Unitialized polymorphic `belongs_to` associations raise an error while attempting to reload, as they attempt to make an uncached reload, but don't have a klass to fetch uncachedly. In this case, `loaded?` should be `false` anyway.
* | Merge pull request #20545 from dcrec1/20541Yves Senn2015-06-233-3/+39
|\ \ | | | | | | | | | thrown ActiveRecord::AssociationTypeMismatch when assigning a wrong value for a namespaced association
| * | thrown ActiveRecord::AssociationTypeMismatch when assigning a wrong value ↵Diego Carrion2015-06-223-3/+31
| | | | | | | | | | | | | | | for a namespaced association fixes #20541
* | | Merge pull request #20667 from y-yagi/do_not_show_failed_messagesRafael Mendonça França2015-06-222-3/+10
|\ \ \ | | | | | | | | do not show "Failed tests" message when a failed test is not
| * | | do not show "Failed tests" message when a failed test is notyuuji.yaginuma2015-06-232-3/+10
| | | |
* | | | Merge pull request #20664 from vngrs/remove_mistaken_end_from_docClaudio B.2015-06-221-1/+1
|\ \ \ \ | | | | | | | | | | Remove mistaken end from controller_path doc [ci skip]
| * | | | Remove mistaken end from controller_path doc [ci skip]Mehmet Emin İNAÇ2015-06-221-1/+1
| | |/ / | |/| |
* | | | Merge pull request #19431 from hmarr/head-routingRafael Mendonça França2015-06-222-4/+4
|\ \ \ \ | | | | | | | | | | Respect routing precedence for HEAD requests
| * | | | Respect routing precedence for HEAD requestsHarry Marr2015-03-202-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the issue described in #18764 - prevents Rack middleware from swallowing up HEAD requests that should have been matched by a higher-precedence `get` route, but still allows Rack middleware to respond to HEAD requests.
* | | | | Merge pull request #20665 from vngrs/add_nodoc_to_validations_helpersRafael Mendonça França2015-06-221-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Add nodoc to the Validations::Helpers [ci skip]
| * | | | | Add nodoc to the Validations::Helpers [ci skip]Mehmet Emin İNAÇ2015-06-221-1/+1
|/ / / / /
* | | | | Merge pull request #20663 from andreynering/patch-1Rafael Mendonça França2015-06-221-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | | Minor fixes [ci skip]
| * | | | Minor fixes [ci skip]Andrey Nering2015-06-221-2/+2
|/ / / /
* | | | docs, :scissors: wrongly placed heading. [ci skip]Yves Senn2015-06-221-2/+0
| | | | | | | | | | | | | | | | | | | | The heading "Active Model Length Validator" was shown on the "ActiveModel::Validations" page without any text following it.
* | | | refactor, don't duplicate presence validator logic.Yves Senn2015-06-221-10/+4
| | | | | | | | | | | | | | | | | | | | This is a small refactoring that simplifies the Active Record specific lenght validator.
* | | | docs, update Active Model reference for AR length validator. [ci skip]Yves Senn2015-06-221-1/+4
| | | |
* | | | AR absence validator respects `marked_for_destruction?`. Closes #20449.Yves Senn2015-06-224-0/+106
| |/ / |/| | | | | | | | Associated objects that were marked for destruction are considered absent.
* | | Merge pull request #20656 from repinel/move-validations-helper-methodsYves Senn2015-06-222-10/+13
|\ \ \ | | | | | | | | Move the validations HelperMethods to its own file
| * | | Move the validations HelperMethods to its own fileRoque Pinel2015-06-212-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | Closes #11209 [Roque Pinel & Steven Yang]
* | | | Merge pull request #20659 from ↵Yves Senn2015-06-221-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | vngrs/strong_parameters_unpermitted_parameters_wrong_doc_fix Fix the documentation about ActionController::UnpermittedParameters [ci skip]
| * | | | Fix the documentation about ActionController::UnpermittedParameters [ci skip]Mehmet Emin İNAÇ2015-06-221-2/+4
|/ / / /
* | | | Merge pull request #20655 from y-yagi/remove_unused_variableRichard Schneeman2015-06-211-1/+0
|\ \ \ \ | | | | | | | | | | remove unused variable in reporter test
| * | | | remove unused variable in reporter testyuuji.yaginuma2015-06-221-1/+0
| | | | |
* | | | | Merge pull request #20658 from vngrs/strong_parameters_parameter_wrong_doc_fixRichard Schneeman2015-06-211-5/+5
|\ \ \ \ \ | | | | | | | | | | | | Fix the documentation about ActionController::ParameterMissing [ci skip]
| * | | | | Fix the documentation about ActionController::ParameterMissing [ci skip]Mehmet Emin İNAÇ2015-06-221-5/+5
| | |/ / / | |/| | |
* | | | | Merge pull request #20654 from repinel/remove-duplicate-privateRichard Schneeman2015-06-211-2/+0
|\ \ \ \ \ | |/ / / / |/| | | | Remove duplicate private statement
| * | | | Remove duplicate private statementRoque Pinel2015-06-211-2/+0
| | | | |
* | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-06-218-11/+9
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Conflicts: guides/source/configuring.md
| * | | | Remove broken linksGaurish Sharma2015-06-211-2/+0
| | | | | | | | | | | | | | | [ci skip]
| * | | | [ci skip] Fix to Fixed-width Fontyui-knk2015-06-143-4/+4
| | | | | | | | | | | | | | | | | | | | LookupContext is class name
| * | | | [ci skip] Add '.'yui-knk2015-06-141-1/+1
| | | | |
| * | | | [ci skip] Add `.`yui-knk2015-06-101-1/+1
| | | | |
| * | | | Remove misplaced period on "Configuring" guide.Hendy Tanata2015-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | [ci skip] Fix minutes to seconds in `select_second`yui-knk2015-06-092-2/+2
| | | | | | | | | | | | | | | | | | | | This is same type commit of https://github.com/rails/rails/pull/20463
| * | | | [ci skip] Fix order to match options orderyui-knk2015-06-071-1/+1
| | | | |
* | | | | applies project style guidelinesXavier Noria2015-06-201-7/+7
| | | | | | | | | | | | | | | | | | | | Just saw these in passing while reading this file.
* | | | | removes unnecessary backslashes in regexpsXavier Noria2015-06-201-3/+3
| | | | | | | | | | | | | | | | | | | | Colons are not metacharacters.
* | | | | Merge pull request #20636 from dcrec1/isolated_testYves Senn2015-06-201-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | fix test not failing when executed isolated
| * | | | fix test not failing when executed isolatedDiego Carrion2015-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | the test was created in 7659fb6 the fixtures were added in c092dbe
* | | | | Include `Enumerable` in `ActiveRecord::Relation`Sean Griffin2015-06-195-37/+21
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After discussing, we've decided it makes more sense to include it. We're already forwarding every conflicting method to `to_a`, and there's no conflation of concerns. `Enumerable` has no mutating methods, and it just allows us to simplify the code. No existing methods will have a change in behavior. Un-overridden Enumerable methods will simply delegate to `each`. [Sean Griffin & bogdan]
* | | | Use `Enumerable#sum` on `ActiveRecord::Relation` when a block is givenSean Griffin2015-06-193-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This matches our behavior in other cases where useful enumerable methods might have a different definition in `Relation`. Wanting to actually enumerate over the records in this case is completely reasonable, and wanting `.sum` is reasonable for the same reason it is on `Enumerable` in the first place.