summaryrefslogtreecommitdiff
path: root/lib/api/helpers
diff options
context:
space:
mode:
authorJames Edwards-Jones <jedwardsjones@gitlab.com>2017-02-03 17:25:26 +0000
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2017-02-03 17:25:26 +0000
commit1af3f3b673be8f85b37d455b101954e62c2a3add (patch)
tree56f09bef2ca41964fae3efaf4f15be7fe1640ba4 /lib/api/helpers
parent67c8526033241f6bd190fa16622970b3919e6dbd (diff)
parentbd8f2b15b3d5267075a626ce86f3a06cc650fcbf (diff)
downloadgitlab-ce-1af3f3b673be8f85b37d455b101954e62c2a3add.tar.gz
Merge branch 'master' into jej-pages-picked-from-ee
Diffstat (limited to 'lib/api/helpers')
-rw-r--r--lib/api/helpers/internal_helpers.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/helpers/internal_helpers.rb b/lib/api/helpers/internal_helpers.rb
index e8975eb57e0..080a6274957 100644
--- a/lib/api/helpers/internal_helpers.rb
+++ b/lib/api/helpers/internal_helpers.rb
@@ -30,7 +30,7 @@ module API
def wiki?
@wiki ||= project_path.end_with?('.wiki') &&
- !Project.find_with_namespace(project_path)
+ !Project.find_by_full_path(project_path)
end
def project
@@ -41,7 +41,7 @@ module API
# the wiki repository as well.
project_path.chomp!('.wiki') if wiki?
- Project.find_with_namespace(project_path)
+ Project.find_by_full_path(project_path)
end
end