Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into mia_backort[ci skip]

3 files changed, 5 insertions, 2 deletions

diff --git a/lib/api/api.rb b/lib/api/api.rb
index 842c7301a66..52cd7cbe3db 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -45,6 +45,9 @@ module API
     end
 
     before { allow_access_with_scope :api }
+    before { Gitlab::I18n.set_locale(current_user) }
+
+    after { Gitlab::I18n.reset_locale }
 
     rescue_from Gitlab::Access::AccessDeniedError do
       rack_response({ 'message' => '403 Forbidden' }.to_json, 403)
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 1ba691cbea1..9a6cb43abf7 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -385,7 +385,7 @@ module API
         requires :file, type: File, desc: 'The file to be uploaded'
       end
       post ":id/uploads" do
-        ::Projects::UploadService.new(user_project, params[:file]).execute
+        UploadService.new(user_project, params[:file]).execute
       end
 
       desc 'Get the users list of a project' do
diff --git a/lib/api/v3/projects.rb b/lib/api/v3/projects.rb
index ba9748ada59..06cc704afc6 100644
--- a/lib/api/v3/projects.rb
+++ b/lib/api/v3/projects.rb
@@ -452,7 +452,7 @@ module API
           requires :file, type: File, desc: 'The file to be uploaded'
         end
         post ":id/uploads" do
-          ::Projects::UploadService.new(user_project, params[:file]).execute
+          UploadService.new(user_project, params[:file]).execute
         end
 
         desc 'Get the users list of a project' do