Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
47946d47f3
commit
8fb943c7df
|
@ -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 }));
|
||||
|
|
|
@ -54,8 +54,8 @@ export default {
|
|||
};
|
||||
},
|
||||
computed: {
|
||||
...mapGetters(['targetNoteHash']),
|
||||
...mapState(['descriptionVersion', 'isLoadingDescriptionVersion']),
|
||||
...mapGetters(['targetNoteHash', 'descriptionVersion']),
|
||||
...mapState(['isLoadingDescriptionVersion']),
|
||||
noteAnchorId() {
|
||||
return `note_${this.note.id}`;
|
||||
},
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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');
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue