Merge branch 'get-rid-of-user-namespace-method' into 'master'

Get rid of the user_namespace API helper method

See merge request gitlab-org/gitlab-ce!27636

3 files changed, 2 insertions, 16 deletions

diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 8a21d44b4bf..7e4539d0419 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -67,10 +67,6 @@ module API
       initial_current_user != current_user
     end
 
-    def user_namespace
-      @user_namespace ||= find_namespace!(params[:id])
-    end
-
     def user_group
       @group ||= find_group!(params[:id])
     end
diff --git a/lib/api/namespaces.rb b/lib/api/namespaces.rb
index 3cc09f6ac3f..77ecb3e7cde 100644
--- a/lib/api/namespaces.rb
+++ b/lib/api/namespaces.rb
@@ -44,6 +44,8 @@ module API
         requires :id, type: String, desc: "Namespace's ID or path"
       end
       get ':id', requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS do
+        user_namespace = find_namespace!(params[:id])
+
         present user_namespace, with: Entities::Namespace, current_user: current_user
       end
     end
diff --git a/spec/lib/api/helpers_spec.rb b/spec/lib/api/helpers_spec.rb
index 08165f147bb..00916f80784 100644
--- a/spec/lib/api/helpers_spec.rb
+++ b/spec/lib/api/helpers_spec.rb
@@ -137,18 +137,6 @@ describe API::Helpers do
     it_behaves_like 'user namespace finder'
   end
 
-  describe '#user_namespace' do
-    let(:namespace_finder) do
-      subject.user_namespace
-    end
-
-    before do
-      allow(subject).to receive(:params).and_return({ id: namespace.id })
-    end
-
-    it_behaves_like 'user namespace finder'
-  end
-
   describe '#send_git_blob' do
     let(:repository) { double }
     let(:blob) { double(name: 'foobar') }