summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2019-06-28 12:19:39 +0100
committerJason Goodman <jgoodman@gitlab.com>2019-07-02 13:46:28 -0400
commitb968cd9f328479b842284536f70cd08348cd55b1 (patch)
treee90d126c88bf77d4431fdeaa4a696d19d5b7716d
parent7cee43043e564b4f3bc027721db82b67dbff5819 (diff)
downloadgitlab-ce-b968cd9f328479b842284536f70cd08348cd55b1.tar.gz
Use released_at key instead of created_at
-rw-r--r--app/assets/javascripts/releases/components/release_block.vue6
-rw-r--r--spec/javascripts/releases/components/release_block_spec.js4
2 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/releases/components/release_block.vue b/app/assets/javascripts/releases/components/release_block.vue
index 3d77f21fe94..6c9c87b53d4 100644
--- a/app/assets/javascripts/releases/components/release_block.vue
+++ b/app/assets/javascripts/releases/components/release_block.vue
@@ -27,8 +27,8 @@ export default {
},
computed: {
releasedTimeAgo() {
- return sprintf(__('released %{time}'), {
- time: this.timeFormated(this.release.created_at),
+ return sprintf('released %{time}', {
+ time: this.timeFormated(this.release.released_at),
});
},
userImageAltDescription() {
@@ -74,7 +74,7 @@ export default {
<div class="append-right-4">
&bull;
- <span v-gl-tooltip.bottom :title="tooltipTitle(release.created_at)">
+ <span v-gl-tooltip.bottom :title="tooltipTitle(release.released_at)">
{{ releasedTimeAgo }}
</span>
</div>
diff --git a/spec/javascripts/releases/components/release_block_spec.js b/spec/javascripts/releases/components/release_block_spec.js
index da1ad1d50b7..f761a18e326 100644
--- a/spec/javascripts/releases/components/release_block_spec.js
+++ b/spec/javascripts/releases/components/release_block_spec.js
@@ -14,7 +14,7 @@ describe('Release block', () => {
description_html: '<div><h2>changelog</h2><ul><li>line1</li<li>line 2</li></ul></div>',
author_name: 'Release bot',
author_email: 'release-bot@example.com',
- created_at: '2012-05-28T05:00:00-07:00',
+ released_at: '2012-05-28T05:00:00-07:00',
author: {
avatar_url: 'uploads/-/system/user/avatar/johndoe/avatar.png',
id: 482476,
@@ -101,7 +101,7 @@ describe('Release block', () => {
});
it('renders release date', () => {
- expect(vm.$el.textContent).toContain(timeagoMixin.methods.timeFormated(release.created_at));
+ expect(vm.$el.textContent).toContain(timeagoMixin.methods.timeFormated(release.released_at));
});
it('renders number of assets provided', () => {