Automatic merge of gitlab-org/gitlab-ce master

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

lib/api/namespaces.rb

@@ -46,6 +46,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

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') }

spec/lib/gitlab/git/blob_spec.rb

@@ -341,7 +341,7 @@ describe Gitlab::Git::Blob, :seed_helper do
       it { expect(blob.mode).to eq("100755") }
     end
 
-    context 'file with Chinese text' do
+    context 'file with Japanese text' do
       let(:blob) { Gitlab::Git::Blob.find(repository, SeedRepo::Commit::ID, "encoding/テスト.txt") }
 
       it { expect(blob.name).to eq("テスト.txt") }