diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-31 03:08:50 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-31 03:08:50 +0300 |
| commit | c49e17ea3715f780cdbbef84f52a8808f98a301e (patch) | |
| tree | feba78b9669e5909ba2e2b7f8e2a7b0dc28e6b9c | |
| parent | c75a89181492dc8bc7cee96d3f6c3b9d1a65fb5b (diff) | |
Add latest changes from gitlab-org/gitlab@master
| -rw-r--r-- | doc/user/project/merge_requests/getting_started.md | 2 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | yarn.lock | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/doc/user/project/merge_requests/getting_started.md b/doc/user/project/merge_requests/getting_started.md index 8992ea300dc..94a5884a94a 100644 --- a/doc/user/project/merge_requests/getting_started.md +++ b/doc/user/project/merge_requests/getting_started.md @@ -17,7 +17,7 @@ branches, also called _feature branches_, to propose changes to the codebase without introducing them directly into the major version of the codebase. -Branching is specially important when collaborating with others, +Branching is especially important when collaborating with others, avoiding changes to be pushed directly to the default branch without prior reviews, tests, and approvals. diff --git a/package.json b/package.json index 55c11aca9b0..e1e0b38c270 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "@gitlab/ui": "8.8.0", "@gitlab/visual-review-tools": "1.5.1", "@sentry/browser": "^5.10.2", - "@sourcegraph/code-host-integration": "^0.0.14", + "@sourcegraph/code-host-integration": "^0.0.16", "apollo-cache-inmemory": "^1.6.3", "apollo-client": "^2.6.4", "apollo-link": "^1.2.11", diff --git a/yarn.lock b/yarn.lock index 580c971f7b5..df482045e9d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -985,10 +985,10 @@ "@sentry/types" "5.10.0" tslib "^1.9.3" -"@sourcegraph/code-host-integration@^0.0.14": - version "0.0.14" - resolved "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.14.tgz#e12b08371dc37bf4a468450b008c6e167705e1a8" - integrity sha512-S4+K+3RKFd49Btl1D9LOdWXROgXevUwOBwp+vDUuGgzT2d6Y+qjalUJ0t8CjbYzdBdJun+2/Zi1+SXfm+S+xVg== +"@sourcegraph/code-host-integration@^0.0.16": + version "0.0.16" + resolved "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.16.tgz#5a4b7c965298b5bae87a5bc4b013ba588db304ec" + integrity sha512-2ZMKr0BpkmCUkTuXXlqhZ6jtVcqz4N/Kz6B1fghi10XpiRZlDbVCYdpmeKb0ZyR+pHmuxNOmfJu9HbHc/7bPWA== "@types/anymatch@*": version "1.3.0" |