Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

A

admin-fe
- Activity
- Members
- Labels
- Environments
- Incidents

Snippets Groups Projects

2a0aced6

Commit 2a0aced6 authored 4 years ago by feld

Downloads
- Plain Diff

Merge branch 'cherry-pick-ce3d3387' into 'release/2.0.2'

Merge branch 'feature/display-status-counts-by-scope' into 'master'

See merge request !115

parents ea79c92e e34b173b

No related branches found

No related tags found

Loading

Pipeline #24079 passed 4 years ago

Stage: build

Stage: test

Changes 10
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

src/api/status.js 9 additions, 0 deletions

src/api/status.js
src/lang/en.js 6 additions, 2 deletions

src/lang/en.js
src/store/modules/status.js 12 additions, 2 deletions

src/store/modules/status.js
src/views/emojiPacks/index.vue 1 addition, 1 deletion

src/views/emojiPacks/index.vue
src/views/invites/index.vue 1 addition, 1 deletion

src/views/invites/index.vue
src/views/moderation_log/index.vue 1 addition, 1 deletion

src/views/moderation_log/index.vue
src/views/reports/index.vue 1 addition, 1 deletion

src/views/reports/index.vue
src/views/settings/styles/main.scss 1 addition, 1 deletion

src/views/settings/styles/main.scss
src/views/statuses/index.vue 13 additions, 3 deletions

src/views/statuses/index.vue
src/views/users/index.vue 1 addition, 1 deletion

src/views/users/index.vue

with 46 additions and 13 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment