Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Branch: master
Commits on Oct 9, 2015
  1. @jeremy

    Merge pull request #21631 from RobinClowers/fix-cache-instrumentation

    jeremy authored
    Fix cache fetch instrumentation
  2. @rafaelfranca

    Merge pull request #21927 from ronakjangir47/remove_is_a_spec

    rafaelfranca authored
    used predicate methods to avoid is_a? checks
  3. @rafaelfranca

    Merge pull request #21928 from Gaurav2728/update_ruby_oracle_gem

    rafaelfranca authored
    update to ruby-oci8 - 2.2.0
  4. @Gaurav2728

    update to ruby-oci8 - 2.2.0

    Gaurav2728 authored
    It stopped `ruby 1.8` support, we already switched to `ruby >= 2.2.2`
  5. @ronakjangir47
  6. @matthewd

    Merge pull request #21878 from Gaurav2728/require_monitor

    matthewd authored
    monitor is require for SneakersAdapter
  7. @sgrif

    Merge pull request #21912 from y-yagi/move_prepare_destination_to_public

    sgrif authored
    change `prepare_destination` to public API [ci skip]
Commits on Oct 8, 2015
  1. @matthewd

    Avoid leaking the first relation we call #first on

    matthewd authored
    With the previous implementation, the block passed to
    define_singleton_method, which will live forever as the method body,
    captures the parameters (args and block) in its enclosure.
    For the current_scope registry, that can include an AR::Relation.
  2. @rafaelfranca

    Merge pull request #21911 from tommyblue/master

    rafaelfranca authored
    Modify the scope method documentation
  3. @rafaelfranca

    Merge pull request #21894 from abhishekjain16/refactor_with_dry

    rafaelfranca authored
    Follow DRY principle and remove duplication
  4. @abhishekjain16
  5. @arthurnn

    Merge pull request #21919 from akihiro17/remove-require

    arthurnn authored
    Remove unused require
  6. @akihiro17

    Remove unused require

    akihiro17 authored
    `require 'active_support/core_ext/string/filters'` was added in b3bfa36. However, it is no longer needed from 3ae9818.
  7. @claudiob

    Merge pull request #21906 from scottgonzalez/form-helpers

    claudiob authored
    Minor cleanup for form helpers guide
  8. @spastorino

    Merge pull request #21917 from y-yagi/remove_unused_require

    spastorino authored
    remove unused require
  9. @sgrif

    Merge pull request #21913 from kamipo/fix_subsecond_precision_support…

    sgrif authored
    Fix subsecond precision supported version
  10. @sgrif

    Merge pull request #21891 from AndyLampert/small-csrf-section-readabi…

    sgrif authored
    Improve readability in CSRF section of guide [ci skip]
  11. @scottgonzalez
  12. @y-yagi

    remove unused require

    y-yagi authored
    `shellwords` is no longer needed from #20605.
  13. @pixeltrix

    Merge pull request #21686 from kamipo/remove_pk_and_sequence_for

    pixeltrix authored
    Remove unused `pk_and_sequence_for` in AbstractMysqlAdapter
  14. @kamipo

    Fix subsecond precision supported version

    kamipo authored
    Fractional Seconds supported version is 5.6.4 or higher.
  15. @y-yagi

    change `prepare_destination` to public API [ci skip]

    y-yagi authored
    `prepare_destination` has been used in the template file for the generator,
    I think it should be a public API
  16. @tommyblue

    Modify the scope method documentation

    tommyblue authored
    Adds a paragraph to the documentation of the `ActiveRecord::Scoping::Named.scope` method,
    explaining that the method is intended to return an ActiveRecord::Relation object to be
    composable with other scopes.
    In the case that in the case that `nil` or `false` are returned, the method returns
    an `all` relation instead.
    This unexpected behaviour is mentioned in #19249 #14256 #21465 and #21882 and wasn't
    documented at all. This commit adds this documentation.
  17. @AndyLampert
Commits on Oct 7, 2015
  1. @fxn

    code gardening in transliterate.rb

    fxn authored
    Saw this while doing a review of a patch:
    * Normalize case and punctuation across comments.
    * ascii -> ASCII
    * Since I was on it, some blank lines that visually
      add some clarity IMO.
  2. @pixeltrix

    Merge pull request #21804 from merhard/mounted_engine_route_fix

    pixeltrix authored
    Mounted engine route fix
  3. @kaspth

    Output inline is set to true in the plugin.

    kaspth authored
    Change the reporter to just read the option.
    Pass output_inline where needed in tests.
  4. @kaspth

    Refactor create_test_file to take a pass option.

    kaspth authored
    Lets us cut the verbose and straight up duplicated setup in 3 tests down to one line.
  5. @kaspth

    Hide Minitest's aggregated results if outputting inline.

    kaspth authored
    We'd see the failures and errors reported after the run, which is needless, when we've already
    reported them.
    This failed
    bin/rails test test/models/bunny_test.rb:14
    Finished in 0.100886s, 1020.9583 runs/s, 1001.1338 assertions/s.
      2) Failure:
    BunnyTest#test_something_failing [/Users/kasperhansen/Documents/code/collection_caching_test/test/models/bunny_test.rb:15]:
    This failed
    103 runs, 101 assertions, 1 failures, 0 errors, 1 skips
    You have skipped tests. Run with --verbose for details.
    This failed
    bin/rails test test/models/bunny_test.rb:14
    Finished in 0.069910s, 1473.3225 runs/s, 1444.7143 assertions/s.
    103 runs, 101 assertions, 1 failures, 0 errors, 1 skips
  6. @schneems

    Merge pull request #21904 from morgoth/missing-test-for-not-modifing-…

    schneems authored
    Added missing specs for not modifying queues when using AJ test helpers
  7. @rafaelfranca

    Revert "Update"

    rafaelfranca authored
    This reverts commit afe6721.
    Reason: This change was done by mistake. This option is at the `config`
    object not in the `config.assets`.
  8. @kamipo

    Remove unused `pk_and_sequence_for` in AbstractMysqlAdapter

    kamipo authored
    `pk_and_sequence_for` is implemented for PG and MySQL adapters (not
    implemented for Sqlite3 adapter). But MySQL adapters are not using
    `pk_and_sequence_for` already.
  9. @morgoth
  10. @merhard

    Fix mounted engine named routes regression

    merhard authored
    When generating the url for a mounted engine through its proxy, the path should be the sum of three parts:
    1. Any `SCRIPT_NAME` request header or the value of `ActionDispatch::Routing::RouteSet#relative_url_root`.
    2. A prefix (the engine's mounted path).
    3. The path of the named route inside the engine.
    Since commit 44ff031, this has been broken. Step 2 has been changed to:
    2. A prefix (the value of `ActionDispatch::Routing::RouteSet#relative_url_root` + the engine's mounted path).
    The value of `ActionDispatch::Routing::RouteSet#relative_url_root` is taken into account in step 1 of the route generation and should be ignored when generating the mounted engine's prefix in step 2.
    This commit fixes the regression by having `ActionDispatch::Routing::RouteSet#url_for` check `options[:relative_url_root]` before falling back to `ActionDispatch::Routing::RouteSet#relative_url_root`. The prefix generating code then sets `options[:relative_url_root]` to an empty string. This empty string is used instead of `ActionDispatch::Routing::RouteSet#relative_url_root` and avoids the duplicate `relative_url_root` value in the final result.
    This resolves #20920 and resolves #21459
  11. @rafaelfranca

    Merge pull request #21902 from mparramont/patch-1

    rafaelfranca authored
    Fix "Esperanto" name
Something went wrong with that request. Please try again.