summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-15 14:57:55 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-15 14:57:55 -0800
commite683d054533f4faf9c1c778c8be729d76e435708 (patch)
treeefc31315ed066b7ce9d2d45dd7733f7ac28f1501 /lib/api
parent3d3c7efa3e03c34dd48fa7ca959f11af204ffe75 (diff)
parent500dab098b0b2f2c3f7444576d38fe239b4ed2ed (diff)
downloadgitlab-ce-e683d054533f4faf9c1c778c8be729d76e435708.tar.gz
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Diffstat (limited to 'lib/api')
-rw-r--r--lib/api/internal.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/internal.rb b/lib/api/internal.rb
index 180e50611cf..a999cff09c0 100644
--- a/lib/api/internal.rb
+++ b/lib/api/internal.rb
@@ -25,8 +25,8 @@ module API
# project. This applies the correct project permissions to
# the wiki repository as well.
access =
- if project_path =~ /\.wiki\Z/
- project_path.sub!(/\.wiki\Z/, '')
+ if project_path.end_with?('.wiki')
+ project_path.chomp!('.wiki')
Gitlab::GitAccessWiki.new
else
Gitlab::GitAccess.new