diff options
| author | Phil Hughes <me@iamphill.com> | 2017-08-15 08:20:35 +0000 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-08-15 10:35:36 -0500 |
| commit | 85d38bcd78bcda04fb25672d7fc484f075860a33 (patch) | |
| tree | ebffaddbebe5c49f7392c71171537d9e17586719 /app | |
| parent | dbc1f5bf66240fa568c36a5312f33db6e4c3db36 (diff) | |
| download | gitlab-ce-85d38bcd78bcda04fb25672d7fc484f075860a33.tar.gz | |
Merge branch 'winh-gpg-status-spinners' into 'master'
Display GPG status loading spinner only when Ajax request is made
Closes #35699
See merge request !13526
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/gpg_badges.js | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/commits.scss | 4 | ||||
| -rw-r--r-- | app/views/projects/commit/_ajax_signature.html.haml | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/javascripts/gpg_badges.js b/app/assets/javascripts/gpg_badges.js index 1c379e9bb67..7ac9dcd1112 100644 --- a/app/assets/javascripts/gpg_badges.js +++ b/app/assets/javascripts/gpg_badges.js @@ -1,12 +1,14 @@ export default class GpgBadges { static fetch() { + const badges = $('.js-loading-gpg-badge'); const form = $('.commits-search-form'); + badges.html('<i class="fa fa-spinner fa-spin"></i>'); + $.get({ url: form.data('signatures-path'), data: form.serialize(), }).done((response) => { - const badges = $('.js-loading-gpg-badge'); response.signatures.forEach((signature) => { badges.filter(`[data-commit-sha="${signature.commit_sha}"]`).replaceWith(signature.html); }); diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss index cd9f2d787c5..46fbfe5f91e 100644 --- a/app/assets/stylesheets/pages/commits.scss +++ b/app/assets/stylesheets/pages/commits.scss @@ -286,6 +286,10 @@ .gpg-status-box { + &:empty { + display: none; + } + &.valid { @include green-status-color; } diff --git a/app/views/projects/commit/_ajax_signature.html.haml b/app/views/projects/commit/_ajax_signature.html.haml index 22674b671c9..83821326aec 100644 --- a/app/views/projects/commit/_ajax_signature.html.haml +++ b/app/views/projects/commit/_ajax_signature.html.haml @@ -1,3 +1,2 @@ - if commit.has_signature? %button{ class: commit_signature_badge_classes('js-loading-gpg-badge'), data: { toggle: 'tooltip', placement: 'auto top', title: 'GPG signature (loading...)', 'commit-sha' => commit.sha } } - %i.fa.fa-spinner.fa-spin |