diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2017-04-27 23:05:22 -0400 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2017-04-27 23:05:22 -0400 |
| commit | b5b33200ccef223e089edf6ad8cdd0ecc3e737da (patch) | |
| tree | 5a55e6c04292ba1b5d7e727fd813234f6e063296 | |
| parent | a922d90414fea5b05152717a72f169c0d9ef7d09 (diff) | |
| download | gitlab-ce-b5b33200ccef223e089edf6ad8cdd0ecc3e737da.tar.gz | |
Add timeago
| -rw-r--r-- | app/assets/javascripts/settings/settings_repository.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/javascripts/settings/settings_repository.js b/app/assets/javascripts/settings/settings_repository.js index 4c6f769f533..9d6a60baa3a 100644 --- a/app/assets/javascripts/settings/settings_repository.js +++ b/app/assets/javascripts/settings/settings_repository.js @@ -28,12 +28,12 @@ export default class SettingsDeployKeys { </div> <div class="deploy-key-content"> <span class="key-created-at"> - created {{deployKey.created_at}} + created {{timeagoDate}} </span> <div class="visible-xs-block visible-sm-block"></div> <a v-if="!enabled" class="btn btn-sm prepend-left-10" rel="nofollow" data-method="put" href="enableURL">Enable </a> - <a v-else-if="deployKey.destroyed_when_orphaned && deployKey.almost_orphaned" class="btn btn-warning btn-sm prepend-left-10" rel="nofollow" data-method="put" :href="removeURL">Remove</a> + <a v-else-if="deployKey.destroyed_when_orphaned && deployKey.almost_orphaned" class="btn btn-warning btn-sm prepend-left-10" rel="nofollow" data-method="put" :href="disableURL">Remove</a> <a v-else class="btn btn-warning btn-sm prepend-left-10" rel="nofollow" data-method="put" :href="disableURL">Disable</a> </div> </li>` @@ -48,6 +48,10 @@ export default class SettingsDeployKeys { }, computed: { + timeagoDate() { + return gl.utils.getTimeago().format(this.deployKey.createdAt, 'gl_en'); + }, + disableURL() { return self.disableEndpoint.replace(':id', this.deployKey.id); }, |