Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: lodash/lodash
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4.17.10
Choose a base ref
...
head repository: lodash/lodash
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4.17.11
Choose a head ref
  • 12 commits
  • 16 files changed
  • 3 contributors

Commits on Aug 31, 2018

  1. Ensure Object.prototype is not augmented by _.merge.

    @jdalton
    jdalton committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    90e6199 View commit details
    Browse the repository at this point in the history

  2. Prevent ReDoS 

    To fix https://github.com/lodash/lodash/issues/3359, modified reHasUnicodeWord to remove an unnecessary comma which made the regex greedy, this is only a test regex and not a matching regex. Added unit tests, this now should run under 5 ms instead of over 1000 ms for huge 50k+ char words.
    @manuel-jasso @jdalton
    manuel-jasso authored and jdalton committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    5c08f18 View commit details
    Browse the repository at this point in the history

  3. Cleanup ReDoS test.

    @jdalton
    jdalton committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    6e62e1e View commit details
    Browse the repository at this point in the history

  4. Fix inconsistent merging of multiple sources to function property

    @sinaabadi @jdalton
    sinaabadi authored and jdalton committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    79b9d20 View commit details
    Browse the repository at this point in the history

  5. Cleanup _.merge tests for function properties.

    @jdalton
    jdalton committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    278c6dd View commit details
    Browse the repository at this point in the history

  6. Ensure placeholder properties are set for fp.convert() results. [closes 

    #3440]
    @jdalton
    jdalton committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    2de676f View commit details
    Browse the repository at this point in the history

  7. Remove prototype property check in safeGet().

    @jdalton
    jdalton committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    e5f9af5 View commit details
    Browse the repository at this point in the history

  8. Add test for indirectly merging Object properties.

    @jdalton
    jdalton committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    d8ddc1a View commit details
    Browse the repository at this point in the history

  9. Lint nits.

    @jdalton
    jdalton committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    552f94a View commit details
    Browse the repository at this point in the history

  10. Commit package-lock.json.

    @jdalton
    jdalton committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    eaa9f36 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2018

  1. Rebuild lodash and docs.

    @jdalton
    jdalton committed Sep 12, 2018
    Configuration menu
    Copy the full SHA
    3ac4b26 View commit details
    Browse the repository at this point in the history

  2. Bump to v4.17.11.

    @jdalton
    jdalton committed Sep 12, 2018
    Configuration menu
    Copy the full SHA
    0843bd4 View commit details
    Browse the repository at this point in the history
Loading