diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-06-07 23:38:28 +0300 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-06-07 23:38:28 +0300 |
| commit | 85b6b56a73c15eff10119de5ced2d36ad9125e86 (patch) | |
| tree | 6d8ae2ac5c69b569e1b1e705ab337a8cf42bf627 /spec/features/merge_request | |
| parent | 735bfe053bc28c0d65b881e5c69e3b947c540870 (diff) | |
| parent | 3f55e0b29fe39c5fd31c703911c96808bd17335d (diff) | |
Merge branch '47182-use-the-default-strings-of-timeago-js' into 'master'
Use the default strings of timeago.js for timeago
Closes #47182
See merge request gitlab-org/gitlab-ce!19350
Diffstat (limited to 'spec/features/merge_request')
| -rw-r--r-- | spec/features/merge_request/user_posts_notes_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/merge_request/user_posts_notes_spec.rb b/spec/features/merge_request/user_posts_notes_spec.rb index b54addce993..3bd9f5e2298 100644 --- a/spec/features/merge_request/user_posts_notes_spec.rb +++ b/spec/features/merge_request/user_posts_notes_spec.rb @@ -139,7 +139,7 @@ describe 'Merge request > User posts notes', :js do page.within("#note_#{note.id}") do is_expected.to have_css('.note_edited_ago') expect(find('.note_edited_ago').text) - .to match(/less than a minute ago/) + .to match(/just now/) end end end |