diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-16 18:08:22 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-16 18:08:22 +0000 |
commit | 123c68a7cf788ace140e57e478a12c5b7ac893ae (patch) | |
tree | b36e565ecd895ee46c1713f3734308cfce0e6ba9 /spec/requests/user_activity_spec.rb | |
parent | 862d225ca0d8eb452e56b8fe5a0109aac796e872 (diff) | |
download | gitlab-ce-123c68a7cf788ace140e57e478a12c5b7ac893ae.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 |