diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-21 00:08:46 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-21 00:08:46 +0000 |
commit | 6755df108b123ecc8ae330d7c7bf2f04fbf36a81 (patch) | |
tree | 7609bd6c0a9ac607d8f57737a2c27a460b7fcfdd /spec/requests/user_activity_spec.rb | |
parent | ee7fba4b844935437233f6c5b74545a28bac4298 (diff) | |
download | gitlab-ce-6755df108b123ecc8ae330d7c7bf2f04fbf36a81.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/requests/user_activity_spec.rb')
-rw-r--r-- | spec/requests/user_activity_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/requests/user_activity_spec.rb b/spec/requests/user_activity_spec.rb index 15666e00b9f..3cd4911098a 100644 --- a/spec/requests/user_activity_spec.rb +++ b/spec/requests/user_activity_spec.rb @@ -26,8 +26,8 @@ describe 'Update of user activity' do '/dashboard/todos', '/group/project/issues', '/group/project/issues/10', - '/group/project/merge_requests', - '/group/project/merge_requests/15' + '/group/project/-/merge_requests', + '/group/project/-/merge_requests/15' ] context 'without an authenticated user' do |