From 89b713ed471c6a9236f9fa819b5d9f78ebae5274 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 2 Mar 2020 15:08:24 +0000 Subject: [PATCH] Add latest changes from gitlab-org/security/gitlab@12-8-stable-ee --- .../208548-better-spec-test-for-error-tracking-web-ui.yml | 5 +++++ .../features/error_tracking_shared_context.rb | 2 +- vendor/gitignore/C++.gitignore | 0 vendor/gitignore/Java.gitignore | 0 4 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/208548-better-spec-test-for-error-tracking-web-ui.yml mode change 100755 => 100644 vendor/gitignore/C++.gitignore mode change 100755 => 100644 vendor/gitignore/Java.gitignore diff --git a/changelogs/unreleased/208548-better-spec-test-for-error-tracking-web-ui.yml b/changelogs/unreleased/208548-better-spec-test-for-error-tracking-web-ui.yml new file mode 100644 index 00000000000..6b6d479e815 --- /dev/null +++ b/changelogs/unreleased/208548-better-spec-test-for-error-tracking-web-ui.yml @@ -0,0 +1,5 @@ +--- +title: Fix fixtures for Error Tracking Web UI +merge_request: 26233 +author: Takuya Noguchi +type: other 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 48356373c26..cbd33dd109b 100644 --- a/spec/support/shared_contexts/features/error_tracking_shared_context.rb +++ b/spec/support/shared_contexts/features/error_tracking_shared_context.rb @@ -13,7 +13,7 @@ shared_context 'sentry error tracking context feature' do let(:issue_id) { issue_response['id'] } let(:issue_seen) { 1.year.ago.utc } let(:formatted_issue_seen) { issue_seen.strftime("%Y-%m-%d %-l:%M:%S%p %Z") } - let(:date_received) { 1.month.ago.utc } + let(:date_received) { 32.days.ago.utc } before do request_headers = { 'Authorization' => 'Bearer access_token_123', 'Content-Type' => 'application/json' } diff --git a/vendor/gitignore/C++.gitignore b/vendor/gitignore/C++.gitignore old mode 100755 new mode 100644 diff --git a/vendor/gitignore/Java.gitignore b/vendor/gitignore/Java.gitignore old mode 100755 new mode 100644 -- GitLab