Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-19 00:07:37 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-19 00:07:37 +0300
commit7f8330873c1a5860b8a9a52d111083a65d210249 (patch)
treee6c7019f2942b8d2fff313545b7cb4bb996b6870 /spec/requests/projects
parentbbe243060399191abcba33c7ebd611f6ec34c6cd (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/requests/projects')
-rw-r--r--spec/requests/projects/merge_requests_discussions_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/requests/projects/merge_requests_discussions_spec.rb b/spec/requests/projects/merge_requests_discussions_spec.rb
index ffc98d09e5c..5945561aa7b 100644
--- a/spec/requests/projects/merge_requests_discussions_spec.rb
+++ b/spec/requests/projects/merge_requests_discussions_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
describe 'merge requests discussions' do
# Further tests can be found at merge_requests_controller_spec.rb
- describe 'GET /:namespace/:project/-/merge_requests/:iid/discussions' do
+ describe 'GET /:namespace/:project/merge_requests/:iid/discussions' do
let(:project) { create(:project, :repository) }
let(:user) { project.owner }
let(:merge_request) { create(:merge_request_with_diffs, target_project: project, source_project: project) }