diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-05-25 19:26:55 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-05-25 19:26:55 +0300 |
commit | 10a914fbf31b465ac2190730b826f7752ece7da4 (patch) | |
tree | 1c02aa995de8ed24bce41d6fcd461c7f92a8f83c /lib/constraints/project_url_constrainer.rb | |
parent | 5d5b97cdd692802fc38a12d958a67d73686b97ab (diff) | |
parent | d70f7f5d25aa8753ee3fa26a7564b7d379e72c2d (diff) | |
download | gitlab-ce-dz-codeclimate-compare.tar.gz |
Merge remote-tracking branch 'origin/master' into dz-codeclimate-comparedz-codeclimate-compare
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'lib/constraints/project_url_constrainer.rb')
-rw-r--r-- | lib/constraints/project_url_constrainer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/constraints/project_url_constrainer.rb b/lib/constraints/project_url_constrainer.rb index 4444a1abee3..4c0aee6c48f 100644 --- a/lib/constraints/project_url_constrainer.rb +++ b/lib/constraints/project_url_constrainer.rb @@ -2,7 +2,7 @@ class ProjectUrlConstrainer def matches?(request) namespace_path = request.params[:namespace_id] project_path = request.params[:project_id] || request.params[:id] - full_path = namespace_path + '/' + project_path + full_path = [namespace_path, project_path].join('/') return false unless DynamicPathValidator.valid_project_path?(full_path) |