Replace time_ago_in_words with JS-based one
This commit is contained in:
Takuya Noguchi
parent
c5f6c811ee
commit
ebcd5711c5
|
|
@ -13,7 +13,7 @@
|
|||
.panel
|
||||
.panel-heading.alert.alert-danger
|
||||
Last repository check
|
||||
= "(#{time_ago_in_words(@project.last_repository_check_at)} ago)"
|
||||
= "(#{time_ago_with_tooltip(@project.last_repository_check_at)})"
|
||||
failed. See
|
||||
= link_to 'repocheck.log', admin_logs_path
|
||||
for error messages.
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
= tag
|
||||
%td
|
||||
- if runner.contacted_at
|
||||
#{time_ago_in_words(runner.contacted_at)} ago
|
||||
= time_ago_with_tooltip runner.contacted_at
|
||||
- else
|
||||
Never
|
||||
%td.admin-runner-btn-group-cell
|
||||
|
|
|
|||
|
|
@ -108,4 +108,4 @@
|
|||
|
||||
%td.timestamp
|
||||
- if build.finished_at
|
||||
%span #{time_ago_in_words build.finished_at} ago
|
||||
%span= time_ago_with_tooltip build.finished_at
|
||||
|
|
|
|||
|
|
@ -20,5 +20,4 @@
|
|||
%td
|
||||
= service.description
|
||||
%td.light
|
||||
= time_ago_in_words service.updated_at
|
||||
ago
|
||||
= time_ago_with_tooltip service.updated_at
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
= email_default_heading("Hello, #{@resource.name}!")
|
||||
%p
|
||||
Your GitLab account has been locked due to an excessive amount of unsuccessful
|
||||
sign in attempts. Your account will automatically unlock in #{time_ago_in_words(Devise.unlock_in.from_now)}
|
||||
sign in attempts. Your account will automatically unlock in #{distance_of_time_in_words(Devise.unlock_in)}
|
||||
or you may click the link below to unlock now.
|
||||
#cta
|
||||
= link_to('Unlock account', unlock_url(@resource, unlock_token: @token))
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
Hello, <%= @resource.name %>!
|
||||
|
||||
Your GitLab account has been locked due to an excessive amount of unsuccessful
|
||||
sign in attempts. Your account will automatically unlock in <%= time_ago_in_words(Devise.unlock_in.from_now) %>
|
||||
sign in attempts. Your account will automatically unlock in <%= distance_of_time_in_words(Devise.unlock_in) %>
|
||||
or you may click the link below to unlock now.
|
||||
|
||||
<%= unlock_url(@resource, unlock_token: @token) %>
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
- elsif @build.has_expiring_artifacts?
|
||||
%p.build-detail-row
|
||||
The artifacts will be removed in
|
||||
%span= time_ago_in_words @build.artifacts_expire_at
|
||||
%span= time_ago_with_tooltip @build.artifacts_expire_at
|
||||
|
||||
- if @build.artifacts?
|
||||
.btn-group.btn-group-justified{ role: :group }
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
\-
|
||||
%td
|
||||
- if tag.created_at
|
||||
= time_ago_in_words(tag.created_at)
|
||||
= time_ago_with_tooltip tag.created_at
|
||||
- else
|
||||
.light
|
||||
\-
|
||||
|
|
|
|||
|
|
@ -62,6 +62,6 @@
|
|||
%td Last contact
|
||||
%td
|
||||
- if @runner.contacted_at
|
||||
#{time_ago_in_words(@runner.contacted_at)} ago
|
||||
= time_ago_with_tooltip @runner.contacted_at
|
||||
- else
|
||||
Never
|
||||
|
|
|
|||
|
|
@ -27,5 +27,4 @@
|
|||
= service.description
|
||||
%td.light
|
||||
- if service.updated_at.present?
|
||||
= time_ago_in_words service.updated_at
|
||||
ago
|
||||
= time_ago_with_tooltip service.updated_at
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
|
||||
%td
|
||||
- if trigger.last_used
|
||||
#{time_ago_in_words(trigger.last_used)} ago
|
||||
= time_ago_with_tooltip trigger.last_used
|
||||
- else
|
||||
Never
|
||||
|
||||
|
|
|
|||
|
|
@ -35,5 +35,4 @@
|
|||
%span.light
|
||||
#{t('sherlock.finished_at')}:
|
||||
%strong
|
||||
= time_ago_in_words(@transaction.finished_at)
|
||||
= t('sherlock.ago')
|
||||
= time_ago_with_tooltip @transaction.finished_at
|
||||
|
|
|
|||
|
|
@ -35,8 +35,7 @@
|
|||
= t('sherlock.seconds')
|
||||
%td= trans.queries.length
|
||||
%td
|
||||
= time_ago_in_words(trans.finished_at)
|
||||
= t('sherlock.ago')
|
||||
= time_ago_with_tooltip trans.finished_at
|
||||
%td
|
||||
= link_to(sherlock_transaction_path(trans), class: 'btn btn-xs') do
|
||||
= t('sherlock.view')
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Replace time_ago_in_words with JS-based one
|
||||
merge_request: 18607
|
||||
author: Takuya Noguchi
|
||||
type: performance
|
||||
|
|
@ -19,7 +19,7 @@ feature 'Admin uses repository checks' do
|
|||
expect(page).to have_content('Repository check was triggered')
|
||||
end
|
||||
|
||||
scenario 'to see a single failed repository check' do
|
||||
scenario 'to see a single failed repository check', :js do
|
||||
project = create(:project)
|
||||
project.update_columns(
|
||||
last_repository_check_failed: true,
|
||||
|
|
|
|||
Loading…
Reference in New Issue