romkagolovadvayha/romkagolovadvayha.github.io

Ответвление 0

Bump diff from 1.4.0 to 4.0.2 in /kursach/library/ngToast-master #3

Открыто

dependabot[bot] хочет влить 1 коммит из dependabot/npm_and_yarn/kursach/library/ngToast-master/diff-4.0.2 в master

dependabot[bot] оставлен комментарий

2020-03-04 09:53:01 +00:00

(Перенесено из github.com)

Bumps diff from 1.4.0 to 4.0.2.

Changelog

Sourced from diff's changelog.

Release Notes

Development

Commits

v4.0.1 - January 6th, 2019

Fix main reference path - b826104

Commits

v4.0.0 - January 5th, 2019

#94 - Missing "No newline at end of file" when comparing two texts that do not end in newlines (@federicotdn)

#227 - Licence

#199 - Import statement for jsdiff

#159 - applyPatch affecting wrong line number with with new lines

#8 - A new state "replace"

Drop ie9 from karma targets - 79c31bd

Upgrade deps. Convert from webpack to rollup - 2c1a29c

Make ()[]"' as word boundaries between each other - f27b899

jsdiff: Replaced phantomJS by chrome - ec3114e

Add yarn.lock to .npmignore - 29466d8

Compatibility notes:

Bower and Component packages no longer supported

Commits

v3.5.0 - March 4th, 2018

Omit redundant slice in join method of diffArrays - 1023590

Support patches with empty lines - fb0f208

Accept a custom JSON replacer function for JSON diffing - 69c7f0a

Optimize parch header parser - 2aec429

Fix typos - e89c832

Commits

v3.4.0 - October 7th, 2017

#183 - Feature request: ability to specify a custom equality checker for diffArrays

#173 - Bug: diffArrays gives wrong result on array of booleans

#158 - diffArrays will not compare the empty string in array?

comparator for custom equality checks - 30e141e

count oldLines and newLines when there are conflicts - 53bf384

Fix: diffArrays can compare falsey items - 9e24284

Docs: Replace grunt with npm test - 00e2f94

Commits

v3.3.1 - September 3rd, 2017
... (truncated)

Commits

See full diff in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

@dependabot rebase will rebase this PR
@dependabot recreate will recreate this PR, overwriting any edits that have been made to it
@dependabot merge will merge this PR after your CI passes on it
@dependabot squash and merge will squash and merge this PR after your CI passes on it
@dependabot cancel merge will cancel a previously requested merge and block automerging
@dependabot reopen will reopen this PR if it is closed
@dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
@dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
@dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
@dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
@dependabot use these labels will set the current labels as the default for future PRs for this repo and language
@dependabot use these reviewers will set the current reviewers as the default for future PRs for this repo and language
@dependabot use these assignees will set the current assignees as the default for future PRs for this repo and language
@dependabot use this milestone will set the current milestone as the default for future PRs for this repo and language

You can disable automated security fix PRs for this repo from the Security Alerts page.

Bumps [diff](https://github.com/kpdecker/jsdiff) from 1.4.0 to 4.0.2. <details> <summary>Changelog</summary> *Sourced from [diff's changelog](https://github.com/kpdecker/jsdiff/blob/master/release-notes.md).* > # Release Notes > > ## Development > > [Commits](https://github.com/kpdecker/jsdiff/compare/v4.0.1...master) > > ## v4.0.1 - January 6th, 2019 > - Fix main reference path - b826104 > > [Commits](https://github.com/kpdecker/jsdiff/compare/v4.0.0...v4.0.1) > > ## v4.0.0 - January 5th, 2019 > - [#94](https://github-redirect.dependabot.com/kpdecker/jsdiff/issues/94) - Missing "No newline at end of file" when comparing two texts that do not end in newlines ([@federicotdn](https://api.github.com/users/federicotdn)) > - [#227](https://github-redirect.dependabot.com/kpdecker/jsdiff/issues/227) - Licence > - [#199](https://github-redirect.dependabot.com/kpdecker/jsdiff/issues/199) - Import statement for jsdiff > - [#159](https://github-redirect.dependabot.com/kpdecker/jsdiff/issues/159) - applyPatch affecting wrong line number with with new lines > - [#8](https://github-redirect.dependabot.com/kpdecker/jsdiff/issues/8) - A new state "replace" > - Drop ie9 from karma targets - 79c31bd > - Upgrade deps. Convert from webpack to rollup - 2c1a29c > - Make ()[]"' as word boundaries between each other - f27b899 > - jsdiff: Replaced phantomJS by chrome - ec3114e > - Add yarn.lock to .npmignore - 29466d8 > > Compatibility notes: > - Bower and Component packages no longer supported > > > [Commits](https://github.com/kpdecker/jsdiff/compare/v3.5.0...v4.0.0) > > ## v3.5.0 - March 4th, 2018 > - Omit redundant slice in join method of diffArrays - 1023590 > - Support patches with empty lines - fb0f208 > - Accept a custom JSON replacer function for JSON diffing - 69c7f0a > - Optimize parch header parser - 2aec429 > - Fix typos - e89c832 > > [Commits](https://github.com/kpdecker/jsdiff/compare/v3.4.0...v3.5.0) > > ## v3.4.0 - October 7th, 2017 > - [#183](https://github-redirect.dependabot.com/kpdecker/jsdiff/issues/183) - Feature request: ability to specify a custom equality checker for `diffArrays` > - [#173](https://github-redirect.dependabot.com/kpdecker/jsdiff/issues/173) - Bug: diffArrays gives wrong result on array of booleans > - [#158](https://github-redirect.dependabot.com/kpdecker/jsdiff/issues/158) - diffArrays will not compare the empty string in array? > - comparator for custom equality checks - 30e141e > - count oldLines and newLines when there are conflicts - 53bf384 > - Fix: diffArrays can compare falsey items - 9e24284 > - Docs: Replace grunt with npm test - 00e2f94 > > [Commits](https://github.com/kpdecker/jsdiff/compare/v3.3.1...v3.4.0) > > ## v3.3.1 - September 3rd, 2017 ></tr></table> ... (truncated) </details> <details> <summary>Commits</summary> - See full diff in [compare view](https://github.com/kpdecker/jsdiff/commits) </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=diff&package-manager=npm_and_yarn&previous-version=1.4.0&new-version=4.0.2)](https://help.github.com/articles/configuring-automated-security-fixes) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) - `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language - `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language - `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language - `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/romkagolovadvayha/romkagolovadvayha.github.io/network/alerts). </details>

Этот запрос на слияние может быть объединён автоматически.

У вас нет права для слияния данного запроса.

Показать инструкции для командной строки

Перейдите к ветви

В репозитории вашего проекта перейдите на эту ветвь и протестируйте изменения.

git fetch -u origin dependabot/npm_and_yarn/kursach/library/ngToast-master/diff-4.0.2:dependabot/npm_and_yarn/kursach/library/ngToast-master/diff-4.0.2

git switch dependabot/npm_and_yarn/kursach/library/ngToast-master/diff-4.0.2

Слейте изменения

Слейте изменения и отправьте их обратно.

Обратите внимание: «Автоопределение ручного слияния» не включено в этом репозитории. После выполнения слияния вам потребуется пометить этот запрос как принятый вручную.

git switch master

git merge --no-ff dependabot/npm_and_yarn/kursach/library/ngToast-master/diff-4.0.2

git switch dependabot/npm_and_yarn/kursach/library/ngToast-master/diff-4.0.2

git rebase master

git switch master

git merge --ff-only dependabot/npm_and_yarn/kursach/library/ngToast-master/diff-4.0.2

git switch dependabot/npm_and_yarn/kursach/library/ngToast-master/diff-4.0.2

git rebase master

git switch master

git merge --no-ff dependabot/npm_and_yarn/kursach/library/ngToast-master/diff-4.0.2

git switch master

git merge --squash dependabot/npm_and_yarn/kursach/library/ngToast-master/diff-4.0.2

git switch master

git merge --ff-only dependabot/npm_and_yarn/kursach/library/ngToast-master/diff-4.0.2

git switch master

git merge dependabot/npm_and_yarn/kursach/library/ngToast-master/diff-4.0.2

git push origin master

Войдите, чтобы присоединиться к обсуждению.

Нет рецензентов

Нет меток

Нет этапа

Нет проекта

Нет назначенных

1 участник

Уведомления

Срок выполнения

Срок выполнения недействителен или находится за пределами допустимого диапазона. Пожалуйста, используйте формат «гггг-мм-дд».

Срок выполнения не установлен.

Зависимости

Зависимостей нет.

Ссылка

romkagolovadvayha/romkagolovadvayha.github.io!3

Описание отсутствует.

Кол-во строк
Кол-во столбцов