summaryrefslogtreecommitdiff
path: root/spec/requests/user_activity_spec.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-18 21:07:37 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-18 21:07:37 +0000
commit7f8330873c1a5860b8a9a52d111083a65d210249 (patch)
treee6c7019f2942b8d2fff313545b7cb4bb996b6870 /spec/requests/user_activity_spec.rb
parentbbe243060399191abcba33c7ebd611f6ec34c6cd (diff)
downloadgitlab-ce-7f8330873c1a5860b8a9a52d111083a65d210249.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.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/requests/user_activity_spec.rb b/spec/requests/user_activity_spec.rb
index 3cd4911098a..15666e00b9f 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