diff options
| author | Douwe Maan <douwe@gitlab.com> | 2019-03-18 09:58:29 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2019-03-18 09:58:29 +0000 |
| commit | f696bacba2e09f4f4ea24b6f63fae0913f24d38a (patch) | |
| tree | f2a595bad820d40a2ed81dc37eeb79eba098b9fa | |
| parent | 0be9362393d60b19b6cea2c173ea247346001cd3 (diff) | |
| parent | d8d5c3af5d83069742c46200de8d130b831068cd (diff) | |
| download | gitlab-ce-f696bacba2e09f4f4ea24b6f63fae0913f24d38a.tar.gz | |
Merge branch '43297-authorized-application-count' into 'master'
Fix authorized applications count
Closes #43297
See merge request gitlab-org/gitlab-ce!25715
| -rw-r--r-- | app/views/doorkeeper/applications/index.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/43297-authorized-application-count.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/doorkeeper/applications/index.html.haml b/app/views/doorkeeper/applications/index.html.haml index 1f5c70a6c6e..5d85d9e431f 100644 --- a/app/views/doorkeeper/applications/index.html.haml +++ b/app/views/doorkeeper/applications/index.html.haml @@ -52,7 +52,7 @@ .oauth-authorized-applications.prepend-top-20.append-bottom-default - if user_oauth_applications? %h5 - = _("Authorized applications (%{size})") % { size: @authorized_tokens.size } + = _("Authorized applications (%{size})") % { size: @authorized_apps.size + @authorized_anonymous_tokens.size } - if @authorized_tokens.any? .table-responsive diff --git a/changelogs/unreleased/43297-authorized-application-count.yml b/changelogs/unreleased/43297-authorized-application-count.yml new file mode 100644 index 00000000000..d22e155fb14 --- /dev/null +++ b/changelogs/unreleased/43297-authorized-application-count.yml @@ -0,0 +1,5 @@ +--- +title: Fix authorized application count +merge_request: 25715 +author: moyuru +type: fixed |