diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 15:08:24 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 15:08:24 +0000 |
| commit | 89b713ed471c6a9236f9fa819b5d9f78ebae5274 (patch) | |
| tree | f12f6dd022a63e25e85c47e78ddf71a286750d51 | |
| parent | a5b13534299fceea9642de04bb1e6a34d9369507 (diff) | |
| download | gitlab-ce-89b713ed471c6a9236f9fa819b5d9f78ebae5274.tar.gz | |
Add latest changes from gitlab-org/security/gitlab@12-8-stable-ee
| -rw-r--r-- | changelogs/unreleased/208548-better-spec-test-for-error-tracking-web-ui.yml | 5 | ||||
| -rw-r--r-- | spec/support/shared_contexts/features/error_tracking_shared_context.rb | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | vendor/gitignore/C++.gitignore | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | vendor/gitignore/Java.gitignore | 0 |
4 files changed, 6 insertions, 1 deletions
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 index 259148fa18f..259148fa18f 100755..100644 --- a/vendor/gitignore/C++.gitignore +++ b/vendor/gitignore/C++.gitignore diff --git a/vendor/gitignore/Java.gitignore b/vendor/gitignore/Java.gitignore index a1c2a238a96..a1c2a238a96 100755..100644 --- a/vendor/gitignore/Java.gitignore +++ b/vendor/gitignore/Java.gitignore |