summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-02 06:08:01 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-02 06:08:01 +0000
commit8fb943c7df5f2b399caaeaebd6c00d0630bc763c (patch)
tree8d35d09078b03ff3db3a860babe8e6918eab8671
parent47946d47f3d8906b622cb27605195ea0ffcb095c (diff)
downloadgitlab-ce-8fb943c7df5f2b399caaeaebd6c00d0630bc763c.tar.gz
Add latest changes from gitlab-org/gitlab@master
-rw-r--r--app/assets/javascripts/notes/stores/getters.js2
-rw-r--r--app/assets/javascripts/vue_shared/components/notes/system_note.vue4
-rw-r--r--doc/ci/caching/index.md13
-rw-r--r--doc/integration/saml.md6
-rw-r--r--spec/frontend/notes/stores/getters_spec.js7
5 files changed, 21 insertions, 11 deletions
diff --git a/app/assets/javascripts/notes/stores/getters.js b/app/assets/javascripts/notes/stores/getters.js
index 4f8ff8240b2..3a1e795cff4 100644
--- a/app/assets/javascripts/notes/stores/getters.js
+++ b/app/assets/javascripts/notes/stores/getters.js
@@ -28,6 +28,8 @@ export const getUserData = state => state.userData || {};
export const getUserDataByProp = state => prop => state.userData && state.userData[prop];
+export const descriptionVersion = state => state.descriptionVersion;
+
export const notesById = state =>
state.discussions.reduce((acc, note) => {
note.notes.every(n => Object.assign(acc, { [n.id]: n }));
diff --git a/app/assets/javascripts/vue_shared/components/notes/system_note.vue b/app/assets/javascripts/vue_shared/components/notes/system_note.vue
index 0c4d75fb0ad..908f7196abf 100644
--- a/app/assets/javascripts/vue_shared/components/notes/system_note.vue
+++ b/app/assets/javascripts/vue_shared/components/notes/system_note.vue
@@ -54,8 +54,8 @@ export default {
};
},
computed: {
- ...mapGetters(['targetNoteHash']),
- ...mapState(['descriptionVersion', 'isLoadingDescriptionVersion']),
+ ...mapGetters(['targetNoteHash', 'descriptionVersion']),
+ ...mapState(['isLoadingDescriptionVersion']),
noteAnchorId() {
return `note_${this.note.id}`;
},
diff --git a/doc/ci/caching/index.md b/doc/ci/caching/index.md
index 0109d87921b..a60310076a8 100644
--- a/doc/ci/caching/index.md
+++ b/doc/ci/caching/index.md
@@ -206,10 +206,11 @@ templates](https://gitlab.com/gitlab-org/gitlab-foss/tree/master/lib/gitlab/ci/t
### Caching Node.js dependencies
-Assuming your project is using [npm](https://www.npmjs.com/) or
-[Yarn](https://classic.yarnpkg.com/en/) to install the Node.js dependencies, the
-following example defines `cache` globally so that all jobs inherit it.
-Node.js modules are installed in `node_modules/` and are cached per-branch:
+Assuming your project is using [npm](https://www.npmjs.com/) to install the Node.js
+dependencies, the following example defines `cache` globally so that all jobs inherit it.
+By default, npm stores cache data in the home folder `~/.npm` but since
+[you can't cache things outside of the project directory](../yaml/README.md#cachepaths),
+we tell npm to use `./.npm` instead, and it is cached per-branch:
```yaml
#
@@ -221,10 +222,10 @@ image: node:latest
cache:
key: ${CI_COMMIT_REF_SLUG}
paths:
- - node_modules/
+ - .npm/
before_script:
- - npm install
+ - npm ci --cache .npm --prefer-offline
test_async:
script:
diff --git a/doc/integration/saml.md b/doc/integration/saml.md
index 31d41433e6b..001e2883de0 100644
--- a/doc/integration/saml.md
+++ b/doc/integration/saml.md
@@ -188,7 +188,7 @@ tell GitLab which groups are external via the `external_groups:` element:
} }
```
-## Required groups
+## Required groups **(STARTER ONLY)**
>**Note:**
This setting is only available on GitLab 10.2 EE and above.
@@ -215,7 +215,7 @@ Example:
} }
```
-## Admin Groups
+## Admin Groups **(STARTER ONLY)**
>**Note:**
This setting is only available on GitLab 8.8 EE and above.
@@ -239,7 +239,7 @@ considered `admin groups`.
} }
```
-## Auditor Groups
+## Auditor Groups **(STARTER ONLY)**
>**Note:**
This setting is only available on GitLab 11.4 EE and above.
diff --git a/spec/frontend/notes/stores/getters_spec.js b/spec/frontend/notes/stores/getters_spec.js
index 83417bd70ef..1ade9464128 100644
--- a/spec/frontend/notes/stores/getters_spec.js
+++ b/spec/frontend/notes/stores/getters_spec.js
@@ -35,6 +35,7 @@ describe('Getters Notes Store', () => {
notesData: notesDataMock,
userData: userDataMock,
noteableData: noteableDataMock,
+ descriptionVersion: 'descriptionVersion',
};
});
@@ -385,4 +386,10 @@ describe('Getters Notes Store', () => {
expect(getters.getDiscussion(state)('1')).toEqual({ id: '1' });
});
});
+
+ describe('descriptionVersion', () => {
+ it('should return `descriptionVersion`', () => {
+ expect(getters.descriptionVersion(state)).toEqual('descriptionVersion');
+ });
+ });
});