Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-08 15:09:00 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-08 15:09:00 +0300
commit204311cdb5049d193070ce04bcc0d4f8bcc0b6f8 (patch)
treef9d568bd6ace166c7a222be30a3ffd4512eed3e7
parentdc560bd238764df34382017e23f2667ade0c7a2d (diff)
Add latest changes from gitlab-org/gitlab@master
-rw-r--r--spec/support/shared_contexts/features/error_tracking_shared_context.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/support/shared_contexts/features/error_tracking_shared_context.rb b/spec/support/shared_contexts/features/error_tracking_shared_context.rb
index 47d131b1778..48356373c26 100644
--- a/spec/support/shared_contexts/features/error_tracking_shared_context.rb
+++ b/spec/support/shared_contexts/features/error_tracking_shared_context.rb
@@ -12,7 +12,7 @@ shared_context 'sentry error tracking context feature' do
let(:sentry_api_urls) { Sentry::ApiUrls.new(project_error_tracking_settings.api_url) }
let(:issue_id) { issue_response['id'] }
let(:issue_seen) { 1.year.ago.utc }
- let(:formatted_issue_seen) { issue_seen.strftime("%Y-%m-%d %I:%M:%S%p %Z") }
+ let(:formatted_issue_seen) { issue_seen.strftime("%Y-%m-%d %-l:%M:%S%p %Z") }
let(:date_received) { 1.month.ago.utc }
before do