aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #22822 from maclover7/fix-22805Richard Schneeman2015-12-281-0/+1
|\ | | | | Add a missing require to ActiveSupport::NumericWithFormat
| * Add a missing require to ActiveSupport::NumericWithFormatJon Moss2015-12-281-0/+1
| |
* | Merge pull request #22053 from Empact/first-loadedYves Senn2015-12-284-16/+76
|\ \ | | | | | | | | | Fix #first(limit) to take advantage of #loaded? records if available
| * | Fix `first(limit)` to take advantage of `loaded?` records if availableBen Woosley2015-12-243-8/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I realized that `first(2)`, etc. was unnecessarily querying for the records when they were already preloaded. This was because `find_nth_with_limit` can not know which `@records` to return because it conflates the `offset` and `index` into a single variable, while the `@records` only needs the `index` itself to select the proper record. Because `find_nth` and `find_nth_with_limit` are public methods, I instead introduced a private method `find_nth_with_limit_and_offset` which is called internally and handles the `loaded?` checking. Once the `offset` argument is removed from `find_nth`, `find_nth_with_limit_and_offset` can be collapsed into `find_nth_with_limit`, with `offset` always equal to `offset_index`.
| * | Deprecate passing `offset` to `find_nth`Ben Woosley2015-12-242-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | All uses of the `offset` are passing `offset_index`. Better to push down the `offset` consideration into `find_nth`. This also works toward enabling `find_nth_with_limit` to take advantage of the `loaded?` state of the relation.
* | | tests, don't connect to mysql when running sqlite3 tests.Yves Senn2015-12-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This resolves the following error: ``` Error: TestAdapterWithInvalidConnection#test_inspect_on_Model_class_does_not_raise: TypeError: superclass mismatch for class Mysql2Adapter /Users/senny/Projects/rails/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb:35:in `<module:ConnectionAdapters>' /Users/senny/Projects/rails/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb:34:in `<module:ActiveRecord>' /Users/senny/Projects/rails/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb:6:in `<top (required)>' /Users/senny/Projects/rails/activesupport/lib/active_support/dependencies.rb:302:in `require' /Users/senny/Projects/rails/activesupport/lib/active_support/dependencies.rb:302:in `block in require' /Users/senny/Projects/rails/activesupport/lib/active_support/dependencies.rb:268:in `load_dependency' /Users/senny/Projects/rails/activesupport/lib/active_support/dependencies.rb:302:in `require' /Users/senny/Projects/rails/activerecord/lib/active_record/connection_adapters/connection_specification.rb:174:in `spec' /Users/senny/Projects/rails/activerecord/lib/active_record/connection_handling.rb:50:in `establish_connection' /Users/senny/Projects/rails/activerecord/test/cases/invalid_connection_test.rb:12:in `setup' ```
* | | Merge pull request #22809 from prathamesh-sonpatki/fix-broadcast-typoMatthew Draper2015-12-281-1/+1
|\ \ \ | | | | | | | | Removed extra "the" in the documentation of `broadcast_message` [ci skip]
| * | | Removed extra "the" in the documentation of `broadcast_message` [ci skip]Prathamesh Sonpatki2015-12-281-1/+1
|/ / /
* | | [ci skip] Fix typos in Active Support changelog.Kasper Timm Hansen2015-12-271-2/+2
| | | | | | | | | It's numeric and the framework is called Action Controller.
* | | Merge pull request #22771 from nwjsmith/document-broadcast-messagesEileen M. Uchitelle2015-12-271-1/+9
|\ \ \ | | | | | | | | Document `Logger#broadcast_messages` option
| * | | Document `Logger#broadcast_messages` optionNate Smith2015-12-231-1/+9
| | | |
* | | | Add CHANGELOG entry for #22759eileencodes2015-12-271-0/+4
| | | | | | | | | | | | | | | | CHANGELOG entry for petabyte and exabyte
* | | | Merge pull request #22759 from akshay-vishnoi/human-size-helperEileen M. Uchitelle2015-12-278-9/+43
|\ \ \ \ | | | | | | | | | | Add support for Petabyte and Exabyte in number to human size
| * | | | Add support for Petabyte and Exabyte in number to human sizeAkshay Vishnoi2015-12-228-9/+43
| | | | |
* | | | | Merge pull request #22801 from y-yagi/fix_link_to_prRichard Schneeman2015-12-271-1/+1
|\ \ \ \ \ | | | | | | | | | | | | fix link to pr [ci skip]
| * | | | | fix link to pr [ci skip]yuuji.yaginuma2015-12-271-1/+1
|/ / / / /
* | | | | Merge pull request #22791 from habermann24/action_cable_stylingRafael França2015-12-252-9/+1
|\ \ \ \ \ | | | | | | | | | | | | [ActionCable] remove not needed protected call and newlines
| * | | | | [ActionCable] remove not needed protected call and newlinesJan Habermann2015-12-252-9/+1
| | | | | |
* | | | | | Merge pull request #22792 from maclover7/patch-3Rafael França2015-12-251-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add Ruby 2.3.0 to Travis matrix
| * | | | | Add Ruby 2.3.0 to Travis matrixJon Moss2015-12-251-0/+1
|/ / / / /
* | | | | Merge pull request #22789 from prathamesh-sonpatki/fix-thor-default-type-errorYves Senn2015-12-251-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Changed default value of `:rc` option to `nil`
| * | | | | Changed default value of `:rc` option to `nil`Prathamesh Sonpatki2015-12-251-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This fixes an error thrown by Thor because type of default value of `:rc` option which is `:boolean` does not match with it's default type which is `string`. - Ref - https://github.com/erikhuda/thor/blob/master/lib/thor/parser/option.rb#L125
* | | | | Merge pull request #22787 from kamipo/fix_varbinary_with_default_empty_stringSean Griffin2015-12-242-13/+10
|\ \ \ \ \ | | | | | | | | | | | | Fix varbinary with default ''
| * | | | | Fix varbinary with default ''Ryuta Kamizono2015-12-242-13/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A `(?:var)?binary` with default '' is a correct definition. Remove `missing_default_forged_as_empty_string?` method for fixing this issue because this method is a workaround for older mysql legacy adapter (19c99ac, f7015336).
* | | | | | Merge pull request #22785 from timrogers/masterRichard Schneeman2015-12-242-14/+16
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Improve documentation for `config.ssl_options`
| * | | | | Improve RDoc documentation of ActionDispatch::SSLTim Rogers2015-12-242-13/+15
| | | | | |
| * | | | | Improve documentation of config.force_ssl in guidesTim Rogers2015-12-241-2/+2
| |/ / / /
* | | | | Merge pull request #22786 from jonatack/remove-whitespaceClaudio B2015-12-242-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | :scissors: whitespace in generated config files [skip ci]
| * | | | :scissors: whitespace in generated config files [skip ci]Jon Atack2015-12-242-2/+2
|/ / / /
* | | | Merge pull request #22778 from y-yagi/fix_submit_tag_with_symbol_valueYves Senn2015-12-243-1/+13
|\ \ \ \ | | | | | | | | | | | | | | | fix TypeError when using submit_tag with Symbol value
| * | | | fix TypeError when using submit_tag with Symbol valueyuuji.yaginuma2015-12-242-1/+8
| | | | |
* | | | | Merge pull request #22780 from pauloancheta/masterRichard Schneeman2015-12-231-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix typo on documentation
| * | | | | fix typo on commentsPaulo Ancheta2015-12-231-1/+1
|/ / / / /
* | | | | Merge pull request #22750 from nettofarah/patch-1Sean Griffin2015-12-231-1/+26
|\ \ \ \ \ | | | | | | | | | | | | Plugin Usage and Installation instructions
| * | | | | Plugin Usage and Installation instructionsNetto Farah2015-12-231-1/+26
| | | | | |
* | | | | | Move test coloring closer to where it's used.Kasper Timm Hansen2015-12-231-15/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Didn't like the constant being at the top of the file, gave it overdue importance. Now that `color_output` expects a result we can shorten some of the flexibility from earlier: * Inline COLOR_CODES constant (keep local variable for readability, but don't need names of colors at run time). * Inline color variable in `color_output`. Looks just as clear without it.
* | | | | | Remove local variable color.Kasper Timm Hansen2015-12-231-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Focus `color_output`'s intent on coloring output by a result. We aren't meant to pass it arbitrary codes to color output.
* | | | | | Rename color to color_output.Kasper Timm Hansen2015-12-231-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The word color is being thrown all around with slightly different meanings. Right now, I understand it. But I'd like to be more immediately clear.
* | | | | | Remove unused blue color.Kasper Timm Hansen2015-12-231-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | I got the blues because we aren't coloring any lines blue.
* | | | | | Color failure line by result code.Kasper Timm Hansen2015-12-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The static red color wouldn't paint skips in their designated yellow. Use the color name we got from the result label earlier, which marks skips as yellow.
* | | | | | Rewrite aggregated results suppression.Kasper Timm Hansen2015-12-231-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I should have replaced the summary reporter with a subclass the first time I wrote this. For whatever reason, I didn't. Do it right and slim the methods added to Minitest in the process.
* | | | | | [ci skip] Clarify why we're clearing reporters.Kasper Timm Hansen2015-12-231-1/+1
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Minitest by default includes a summary reporter and a progress reporter. To print colored output, we have to replace the progress reporter.
* | | | | Merge pull request #22756 from lucasmazza/lm-test-reporter-colored-outputKasper Timm Hansen2015-12-233-4/+82
|\ \ \ \ \ | | | | | | | | | | | | Add colored output to the new test reporter.
| * | | | | Add colored output to the new test reporter.Lucas Mazza2015-12-223-4/+82
| | | | | |
* | | | | | Merge pull request #22777 from djpowers/patch-1Rafael França2015-12-231-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Improve readability of CacheHelper section
| * | | | | | Improve readability of CacheHelper sectionDave Powers2015-12-231-1/+1
|/ / / / / / | | | | | | | | | | | | [ci skip]
* | | | | | Merge pull request #22776 from kamipo/fix_tenseRafael França2015-12-231-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | release notes, use past tense. [ci skip]
| * | | | | | release notes, use past tense. [ci skip]Ryuta Kamizono2015-12-241-2/+2
|/ / / / / /
* | | | | | Merge pull request #20507 from rabbitt/bugfix/logger-threadsafetyRafael França2015-12-234-4/+120
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixes LoggerSilence#silence threadsafety
| * | | | | | Fixes LoggerSilence#silence threadsafetyCarl P. Corliss2015-12-234-4/+120
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - uses instance defined level if no custom local log level defined - Keeps track of local log level per [ thread + object-instance ] - prevents memory leakage by removing local level hash key/value on #silence method exit - avoids the use of Thread local variables
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 23:28:08 +0000