diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-22 18:17:57 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-22 18:17:57 +0000 |
| commit | bad127a0f623e9f1277c955c6a95b5add1842425 (patch) | |
| tree | 7d8d31cd23ef703e921a868856fae236266541ab /spec/features/projects/blobs/edit_spec.rb | |
| parent | 95b9a603c32ce361d1746d4a00c58cd180218d41 (diff) | |
| download | gitlab-ce-bad127a0f623e9f1277c955c6a95b5add1842425.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/projects/blobs/edit_spec.rb')
| -rw-r--r-- | spec/features/projects/blobs/edit_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/projects/blobs/edit_spec.rb b/spec/features/projects/blobs/edit_spec.rb index 3f1c10b3688..54176378de8 100644 --- a/spec/features/projects/blobs/edit_spec.rb +++ b/spec/features/projects/blobs/edit_spec.rb @@ -183,7 +183,7 @@ RSpec.describe 'Editing file blob', :js do freeze_time do visit project_edit_blob_path(project, tree_join(protected_branch, file_path)) - epoch = Time.now.strftime('%s%L').last(5) + epoch = Time.zone.now.strftime('%s%L').last(5) expect(find('.js-branch-name').value).to eq "#{user.username}-protected-branch-patch-#{epoch}" end |