aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #26859 from headius/mask_use_of_rubyvm_on_jrubyAaron Patterson2016-10-211-0/+2
|\ | | | | Skip test that depends on RubyVM when it is not available (JRuby).
| * Skip test that depends on RubyVM when it is not available (JRuby).Charles Oliver Nutter2016-10-211-0/+2
|/
* Revert "Undefine assings in IntegrationTest"Rafael Mendonça França2016-10-212-10/+0
| | | | | | This reverts commit 5dde413e1d14c42eb87071db20d075a7b962cb01. Reason: The gem defines it so we don't need to remove
* Merge pull request #26819 from lastgabs/add-examples-active-job-test-helperRafael França2016-10-211-0/+24
|\ | | | | Add examples of queue_adapter and perform_enqueued jobs to API Docs.
| * Add examples of queue_adapter and perform_enqueued jobs to API Docs.Gabi Stefanini2016-10-211-0/+24
| |
* | Merge pull request #26050 from bogdanvlviv/optimistic_lockingAaron Patterson2016-10-215-20/+157
|\ \ | |/ |/| Fixed: Optimistic locking does not work correctly
| * Added ability update locking_column valuebogdanvlviv2016-10-214-7/+90
| |
| * Fixed: Optimistic locking does not work well with null in the databasebogdanvlviv2016-10-214-15/+69
|/
* Merge pull request #26855 from headius/explicit_order_callback_argsAaron Patterson2016-10-211-2/+2
|\ | | | | Additional fix for argument-splat ordering differences.
| * Additional fix for argument-splat ordering differences.Charles Oliver Nutter2016-10-211-2/+2
| | | | | | | | See #26854
* | Merge pull request #26854 from headius/explicit_order_callback_argsAaron Patterson2016-10-211-4/+4
|\| | | | | Explicitly unpack the expanded args to avoid execution order diff.
| * Explicitly unpack the expanded args to avoid execution order diff.Charles Oliver Nutter2016-10-211-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | In https://bugs.ruby-lang.org/issues/12860 I argue that MRI's execution order here is incorrect. The splatting of the 'c' args should happen before the shift, but it happens after. On JRuby, it behaves the way you would expect, leading to the 'c' args splat still containing the block and producing an error like "cannot convert proc to symbol" when the send attempts to coerce it. This patch makes the unpacking order explicit with a multi-assign, which behaves properly on all implementations I tested.
* | Merge pull request #26853 from zegomesjf/feature/skip_active_recordGuillermo Iguaran2016-10-212-0/+2
|\ \ | |/ |/| don't create db directory when skip active_record
| * don't create db directory when skip active_recordJosé Gomes Júnior2016-10-212-0/+2
|/
* Merge pull request #26839 from renuo/fix-missing-nsec-transferAndrew White2016-10-213-2/+10
|\ | | | | Fix copy_time_to: Copy nsec instead of usec
| * Fix copy_time_to: Copy nsec instead of usecJosua Schmid2016-10-203-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | `copy_time_to` is a helper function for date and time calculations. It's being used by `prev_week`, `next_week` and `prev_weekday` to keep the time fraction when jumping around between days. Previously the nanoseconds part was lost during the operation. This lead to problems in practice if you were using the `end_of_day` calculation. Resulting in the time fraction of `end_of_day` not being the same as next week's `end_of_day`. With this fix `copy_time_to` doesn't forget the `nsec` digits.
* | doc, hide non-public methods form the api docs. [ci skip]Yves Senn2016-10-201-2/+2
| | | | | | | | | | | | | | | | | | This is a follow up to #25681, specifically this comment: https://github.com/rails/rails/pull/25681#issuecomment-238294002 The way the thread local variable is stored is an implementation detail and subject to change. It makes no sense to only generate a reader or writer as you'd have to know where to read from or where it writes to.
* | guides, include note about modifiers when using the CLI.Yves Senn2016-10-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | [ci skip] This was pointed out on https://github.com/rails/rails/issues/15583#issuecomment-239212831 The comment was lost in the changes made by fcd0ac066e0959a9f4fa4459a27e041abe8eb52a and 3e1373a773085d5f19cb6a466ab2736cc1ca2713
* | remove trailing whitespace [ci skip]Yves Senn2016-10-201-8/+8
| |
* | Merge pull request #26846 from brunofacca/patch-1Rafael França2016-10-201-4/+4
|\ \ | | | | | | [ci skip] Fix return values of Hash Extensions examples
| * | [ci skip] Fix return values of Hash Extensions examplesBruno Facca2016-10-201-4/+4
|/ / | | | | | | | | | | | | | | The hashes returned in some examples of the following sections had items in a different order than their receivers. That may mislead readers into believing those methods will not preserve element order. Extensions to Hash/Working with Keys/transform_keys and transform_keys! Extensions to Hash/Working with Keys/stringify_keys and stringify_keys! Extensions to Hash/Working with Keys/symbolize_keys and symbolize_keys! Extensions to Hash/Slicing
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-10-202-4/+4
|\ \
| * | Corrected comments referring to documentation inIain Beeston2016-10-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | `ActiveRecord::Type::Value` This is now defined in `ActiveModel::Type::Value` (`ActiveRecord::Type::Value` still exists but it's effectively an alias)
| * | Corrected comments referring to ActiveModel::AttributesIain Beeston2016-10-031-1/+1
| | | | | | | | | | | | Should be ActiveRecord::Attributes (ActiveModel::Attributes does not exist)
* | | Use old typecasting method if no type casted binds are passed inAaron Patterson2016-10-202-2/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Query cache doesn't type cast bind parameters since it isn't actually querying the database, so it can't pass those values in. Type casting in the query cache method would cause the values to be type cast twice in the case that there is a cache miss (since the methods it calls will type cast *again*). If logging is disabled, then adding the type cast code to the query cache method will needlessly typecast the values (since the only reason those values are type cast is for display in the logs). Fixes #26828.
* | | Merge pull request #26830 from headius/mask_forking_fsevent_test_on_jrubyRafael Mendonça França2016-10-201-0/+2
| | | | | | | | | | | | Mask forking filesystem event on JRuby.
* | | render_bind should be privateAaron Patterson2016-10-191-10/+10
| | |
* | | Merge pull request #26829 from headius/wait_for_events_in_listen_testsAaron Patterson2016-10-191-0/+18
| | | | | | | | | | | | Wait for file events to propagated for slower Listen backends.
* | | Merge pull request #26825 from orhantoy/fix-doc-code-indentationJon Moss2016-10-191-4/+4
|\ \ \ | |_|/ |/| | [ci skip] Fix indentation of code examples
| * | Fix indentation of code examplesOrhan Toy2016-10-191-4/+4
|/ / | | | | | | This commit fixes the generated HTML of the two code examples.
* | Merge pull request #26821 from y-yagi/update_doc_about_change_column_defaultप्रथमेश Sonpatki2016-10-191-2/+4
|\ \ | | | | | | update doc about `change_column_default` [ci skip]
| * | update doc about `change_column_default` [ci skip]yuuji.yaginuma2016-10-191-2/+4
|/ / | | | | | | Follow up to #20018.
* | Merge pull request #26809 from alexcameron89/contributing_guide_typoJon Moss2016-10-171-1/+1
|\ \ | | | | | | [ci skip] Fix typo in Guides: Contributing
| * | [ci skip] Fix typo in Guides: ContributingAlex Kitchens2016-10-171-1/+1
|/ /
* | /s/integrations/integration [ci skip] (#26801)प्रथमेश Sonpatki2016-10-161-1/+1
| |
* | Merge pull request #26800 from prathamesh-sonpatki/bump-bundlerGuillermo Iguaran2016-10-161-0/+1
|\ \ | | | | | | Bump bundler version in the before_install hook of travis
| * | Bump bundler version in the before_install hook of travisPrathamesh Sonpatki2016-10-161-0/+1
|/ / | | | | | | | | | | | | | | - We were running into issues with old bundler versions on 4.2 builds. So we bumped the bundler version on 4-2-stable branch in https://github.com/rails/rails/pull/26592. - This commit applies same change to master as per discussion in https://github.com/rails/rails/pull/26592#issuecomment-254026755.
* | Merge pull request #26786 from codeodor/patch-1Eileen M. Uchitelle2016-10-153-1/+16
|\ \ | | | | | | Allow any key in Renderer environment hash
| * | Allow any key in Renderer environment hashSammy Larbi2016-10-153-1/+16
| | | | | | | | | | | | | | | | | | When rendering arbitrary templates, it is helpful to not overwrite `env` keys with nil if they don't match any found in the `RACK_KEY_TRANSLATION` This allows the developer to set the environment to exactly what is needed for rendering.
* | | Copy-edit the documentationRafael Mendonça França2016-10-151-4/+4
| | | | | | | | | | | | [ci skip]
* | | Merge pull request #26793 from zachaysan/masterRafael França2016-10-151-98/+100
|\ \ \ | | | | | | | | Make `process` a non-private method and update documentation.
| * | | Make `process` a non-private method and update documentation.Zach Aysan2016-10-151-98/+100
| | | |
* | | | Merge pull request #26598 from ↵Eileen M. Uchitelle2016-10-151-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | rutaka-n/raise_record_not_found_with_correct_params initialize errors with name of class and other params
| * | | | initialize errors with name of class and other paramsv.promzelev2016-09-231-2/+2
| | | | |
* | | | | Pull request for ticket 26769 (#26770)rmarone2016-10-151-1/+1
| |/ / / |/| | | | | | | | | | | | | | | | | | | * Clarify the default behavior of log_formatter Updates language to remove reference to production.rb and fix quoting
* | | | Merge pull request #26792 from rails/benchmark-templateGodfrey Chan2016-10-152-27/+67
|\ \ \ \ | | | | | | | | | | Introduce a benchmark template
| * | | | Introduce a benchmark template [ci skip]Godfrey Chan2016-10-152-27/+67
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces boilerplate in the “benchmark your code” section of the contributors’ guide with an executable template. I also amended the text to encourage best practices and codified it in the template. For now this is only good for relatively self-contained changes that can be inlined into a simple script. In the future, this can be expanded to cover how to measure the difference between two commits. The output looks like this: ``` ==================================== Empty ===================================== Warming up -------------------------------------- blank? 225.963k i/100ms fast_blank? 238.147k i/100ms Calculating ------------------------------------- blank? 8.825M (± 6.4%) i/s - 44.063M in 5.014824s fast_blank? 9.311M (± 6.3%) i/s - 46.439M in 5.009153s Comparison: fast_blank?: 9310694.8 i/s blank?: 8824801.7 i/s - same-ish: difference falls within error ================================= Single Space ================================= Warming up -------------------------------------- blank? 56.581k i/100ms fast_blank? 232.774k i/100ms Calculating ------------------------------------- blank? 813.985k (±16.7%) i/s - 4.017M in 5.076576s fast_blank? 9.547M (± 5.2%) i/s - 47.719M in 5.013204s Comparison: fast_blank?: 9547414.0 i/s blank?: 813985.0 i/s - 11.73x slower ================================== Two Spaces ================================== Warming up -------------------------------------- blank? 58.265k i/100ms fast_blank? 244.056k i/100ms Calculating ------------------------------------- blank? 823.343k (±16.2%) i/s - 4.020M in 5.014213s fast_blank? 9.484M (± 4.9%) i/s - 47.347M in 5.005339s Comparison: fast_blank?: 9484021.6 i/s blank?: 823343.1 i/s - 11.52x slower =============================== Mixed Whitspaces =============================== Warming up -------------------------------------- blank? 53.919k i/100ms fast_blank? 237.103k i/100ms Calculating ------------------------------------- blank? 763.435k (±16.8%) i/s - 3.720M in 5.018029s fast_blank? 9.672M (± 5.8%) i/s - 48.369M in 5.019356s Comparison: fast_blank?: 9672467.2 i/s blank?: 763435.4 i/s - 12.67x slower =============================== Very Long String =============================== Warming up -------------------------------------- blank? 34.037k i/100ms fast_blank? 240.366k i/100ms Calculating ------------------------------------- blank? 409.731k (± 8.9%) i/s - 2.042M in 5.028235s fast_blank? 9.794M (± 4.3%) i/s - 49.035M in 5.016328s Comparison: fast_blank?: 9794225.2 i/s blank?: 409731.4 i/s - 23.90x slower ```
* | | | Merge pull request #26784 from kamipo/quote_table_name_properlyRafael França2016-10-145-24/+35
|\ \ \ \ | | | | | | | | | | Quote table name properly
| * | | | Quote table name properlyRyuta Kamizono2016-10-145-24/+35
| | |/ / | |/| | | | | | | | | | If does not quote table name properly, invalid SQL is generated.
* | | | Add comment to remove code when we are in Ruby 2.4Rafael Mendonça França2016-10-141-0/+1
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-22 12:12:42 +0000