22 files changed, 27 insertions, 27 deletions

diff --git a/app/controllers/admin/projects_controller.rb b/app/controllers/admin/projects_controller.rb
index 7e3e29f59fb..ea20595047c 100644
--- a/app/controllers/admin/projects_controller.rb
+++ b/app/controllers/admin/projects_controller.rb
@@ -19,7 +19,7 @@ class Admin::ProjectsController < Admin::ApplicationController
   end
 
   def transfer
-    result = ::Projects::TransferContext.new(@project, current_user, project: params).execute(:admin)
+    result = ::Projects::TransferService.new(@project, current_user, project: params).execute(:admin)
 
     if result
       redirect_to [:admin, @project]
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb
index fc9807e3c47..2aa73471e2b 100644
--- a/app/controllers/projects/blob_controller.rb
+++ b/app/controllers/projects/blob_controller.rb
@@ -13,7 +13,7 @@ class Projects::BlobController < Projects::ApplicationController
   end
 
   def destroy
-    result = Files::DeleteContext.new(@project, current_user, params, @ref, @path).execute
+    result = Files::DeleteService.new(@project, current_user, params, @ref, @path).execute
 
     if result[:status] == :success
       flash[:notice] = "Your changes have been successfully committed"
diff --git a/app/controllers/projects/edit_tree_controller.rb b/app/controllers/projects/edit_tree_controller.rb
index 3921273620c..aa4631300e0 100644
--- a/app/controllers/projects/edit_tree_controller.rb
+++ b/app/controllers/projects/edit_tree_controller.rb
@@ -7,7 +7,7 @@ class Projects::EditTreeController < Projects::BaseTreeController
   end
 
   def update
-    result = Files::UpdateContext.new(@project, current_user, params, @ref, @path).execute
+    result = Files::UpdateService.new(@project, current_user, params, @ref, @path).execute
 
     if result[:status] == :success
       flash[:notice] = "Your changes have been successfully committed"
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 83ff968c70f..770fccaa11b 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -89,7 +89,7 @@ class Projects::IssuesController < Projects::ApplicationController
   end
 
   def bulk_update
-    result = Issues::BulkUpdateContext.new(project, current_user, params).execute
+    result = Issues::BulkUpdateService.new(project, current_user, params).execute
     redirect_to :back, notice: "#{result[:count]} issues updated"
   end
 
diff --git a/app/controllers/projects/new_tree_controller.rb b/app/controllers/projects/new_tree_controller.rb
index 933a0cb876e..2f3647ab071 100644
--- a/app/controllers/projects/new_tree_controller.rb
+++ b/app/controllers/projects/new_tree_controller.rb
@@ -6,7 +6,7 @@ class Projects::NewTreeController < Projects::BaseTreeController
 
   def update
     file_path = File.join(@path, File.basename(params[:file_name]))
-    result = Files::CreateContext.new(@project, current_user, params, @ref, file_path).execute
+    result = Files::CreateService.new(@project, current_user, params, @ref, file_path).execute
 
     if result[:status] == :success
       flash[:notice] = "Your changes have been successfully committed"
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb
index 261841f1ea2..9c9c2decc78 100644
--- a/app/controllers/projects/notes_controller.rb
+++ b/app/controllers/projects/notes_controller.rb
@@ -5,7 +5,7 @@ class Projects::NotesController < Projects::ApplicationController
   before_filter :authorize_admin_note!, only: [:update, :destroy]
 
   def index
-    @notes = Notes::LoadContext.new(project, current_user, params).execute
+    @notes = Notes::LoadService.new(project, current_user, params).execute
 
     notes_json = { notes: [] }
 
@@ -20,7 +20,7 @@ class Projects::NotesController < Projects::ApplicationController
   end
 
   def create
-    @note = Notes::CreateContext.new(project, current_user, params).execute
+    @note = Notes::CreateService.new(project, current_user, params).execute
 
     respond_to do |format|
       format.json { render_note_json(@note) }
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index e1c55e7d913..6ec109b9145 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -20,7 +20,7 @@ class ProjectsController < ApplicationController
   end
 
   def create
-    @project = ::Projects::CreateContext.new(current_user, params[:project]).execute
+    @project = ::Projects::CreateService.new(current_user, params[:project]).execute
 
     respond_to do |format|
       flash[:notice] = 'Project was successfully created.' if @project.saved?
@@ -36,7 +36,7 @@ class ProjectsController < ApplicationController
   end
 
   def update
-    status = ::Projects::UpdateContext.new(@project, current_user, params).execute
+    status = ::Projects::UpdateService.new(@project, current_user, params).execute
 
     respond_to do |format|
       if status
@@ -51,7 +51,7 @@ class ProjectsController < ApplicationController
   end
 
   def transfer
-    ::Projects::TransferContext.new(project, current_user, params).execute
+    ::Projects::TransferService.new(project, current_user, params).execute
   end
 
   def show
@@ -89,7 +89,7 @@ class ProjectsController < ApplicationController
   end
 
   def fork
-    @forked_project = ::Projects::ForkContext.new(project, current_user).execute
+    @forked_project = ::Projects::ForkService.new(project, current_user).execute
 
     respond_to do |format|
       format.html do
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index ba8f08c5b82..e853c22800a 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -5,9 +5,9 @@ class SearchController < ApplicationController
 
     if @project
       return access_denied! unless can?(current_user, :download_code, @project)
-      @search_results = Search::ProjectContext.new(@project, current_user, params).execute
+      @search_results = Search::ProjectService.new(@project, current_user, params).execute
     else
-      @search_results = Search::GlobalContext.new(current_user, params).execute
+      @search_results = Search::GlobalService.new(current_user, params).execute
     end
   end
 end
diff --git a/app/contexts/base_context.rb b/app/services/base_service.rb
index 6accd9b2457..610f0474872 100644
--- a/app/contexts/base_context.rb
+++ b/app/services/base_service.rb
@@ -1,4 +1,4 @@
-class BaseContext
+class BaseService
   attr_accessor :project, :current_user, :params
 
   def initialize(project, user, params)
diff --git a/app/contexts/files/base_context.rb b/app/services/files/base_service.rb
index 44f9826652c..f1765d38976 100644
--- a/app/contexts/files/base_context.rb
+++ b/app/services/files/base_service.rb
@@ -1,5 +1,5 @@
 module Files
-  class BaseContext < ::BaseContext
+  class BaseService < ::BaseService
     attr_reader :ref, :path
 
     def initialize(project, user, params, ref, path = nil)
diff --git a/app/contexts/files/create_context.rb b/app/services/files/create_service.rb
index b3d62a028c7..361bb458889 100644
--- a/app/contexts/files/create_context.rb
+++ b/app/services/files/create_service.rb
@@ -1,7 +1,7 @@
 require_relative "base_context"
 
 module Files
-  class CreateContext < BaseContext
+  class CreateService < BaseService
     def execute
       allowed = if project.protected_branch?(ref)
                   can?(current_user, :push_code_to_protected_branches, project)
diff --git a/app/contexts/files/delete_context.rb b/app/services/files/delete_service.rb
index 39ff7c2a4b1..30f1f2512cb 100644
--- a/app/contexts/files/delete_context.rb
+++ b/app/services/files/delete_service.rb
@@ -1,7 +1,7 @@
 require_relative "base_context"
 
 module Files
-  class DeleteContext < BaseContext
+  class DeleteService < BaseService
     def execute
       allowed = if project.protected_branch?(ref)
                   can?(current_user, :push_code_to_protected_branches, project)
diff --git a/app/contexts/files/update_context.rb b/app/services/files/update_service.rb
index 556027a3256..20ca1ff37d5 100644
--- a/app/contexts/files/update_context.rb
+++ b/app/services/files/update_service.rb
@@ -1,7 +1,7 @@
 require_relative "base_context"
 
 module Files
-  class UpdateContext < BaseContext
+  class UpdateService < BaseService
     def execute
       allowed = if project.protected_branch?(ref)
                   can?(current_user, :push_code_to_protected_branches, project)
diff --git a/app/contexts/issues/bulk_update_context.rb b/app/services/issues/bulk_update_service.rb
index ab38a4f8ab5..f72a346af6f 100644
--- a/app/contexts/issues/bulk_update_context.rb
+++ b/app/services/issues/bulk_update_service.rb
@@ -1,5 +1,5 @@
 module Issues
-  class BulkUpdateContext < BaseContext
+  class BulkUpdateService < BaseService
     def execute
       update_data = params[:update]
 
diff --git a/app/contexts/notes/create_context.rb b/app/services/notes/create_service.rb
index 36ea76ff949..fb87e175933 100644
--- a/app/contexts/notes/create_context.rb
+++ b/app/services/notes/create_service.rb
@@ -1,5 +1,5 @@
 module Notes
-  class CreateContext < BaseContext
+  class CreateService < BaseService
     def execute
       note = project.notes.new(params[:note])
       note.author = current_user
diff --git a/app/contexts/notes/load_context.rb b/app/services/notes/load_service.rb
index 234e9ac3cdd..f7ad7d60a3a 100644
--- a/app/contexts/notes/load_context.rb
+++ b/app/services/notes/load_service.rb
@@ -1,5 +1,5 @@
 module Notes
-  class LoadContext < BaseContext
+  class LoadService < BaseService
     def execute
       target_type = params[:target_type]
       target_id   = params[:target_id]
diff --git a/app/contexts/projects/create_context.rb b/app/services/projects/create_service.rb
index 2acb9fbfe14..033be8f9ed6 100644
--- a/app/contexts/projects/create_context.rb
+++ b/app/services/projects/create_service.rb
@@ -1,5 +1,5 @@
 module Projects
-  class CreateContext < BaseContext
+  class CreateService < BaseService
     def initialize(user, params)
       @current_user, @params = user, params.dup
     end
diff --git a/app/contexts/projects/fork_context.rb b/app/services/projects/fork_service.rb
index fbc67220d5d..2f1c7b18aa0 100644
--- a/app/contexts/projects/fork_context.rb
+++ b/app/services/projects/fork_service.rb
@@ -1,5 +1,5 @@
 module Projects
-  class ForkContext < BaseContext
+  class ForkService < BaseService
     include Gitlab::ShellAdapter
 
     def initialize(project, user)
diff --git a/app/contexts/projects/transfer_context.rb b/app/services/projects/transfer_service.rb
index 3011984e3f8..f8e27f6f1c6 100644
--- a/app/contexts/projects/transfer_context.rb
+++ b/app/services/projects/transfer_service.rb
@@ -1,5 +1,5 @@
 module Projects
-  class TransferContext < BaseContext
+  class TransferService < BaseService
     def execute(role = :default)
       namespace_id = params[:project].delete(:namespace_id)
       allowed_transfer = can?(current_user, :change_namespace, project) || role == :admin
diff --git a/app/contexts/projects/update_context.rb b/app/services/projects/update_service.rb
index 94de10de0f6..d9d371da5c4 100644
--- a/app/contexts/projects/update_context.rb
+++ b/app/services/projects/update_service.rb
@@ -1,5 +1,5 @@
 module Projects
-  class UpdateContext < BaseContext
+  class UpdateService < BaseService
     def execute(role = :default)
       params[:project].delete(:namespace_id)
       # check that user is allowed to set specified visibility_level
diff --git a/app/contexts/search/global_context.rb b/app/services/search/global_service.rb
index 74e746018e6..c5ca3322362 100644
--- a/app/contexts/search/global_context.rb
+++ b/app/services/search/global_service.rb
@@ -1,5 +1,5 @@
 module Search
-  class GlobalContext
+  class GlobalService
     attr_accessor :current_user, :params
 
     def initialize(user, params)
diff --git a/app/contexts/search/project_context.rb b/app/services/search/project_service.rb
index 690652b2cdb..3ebaafc752c 100644
--- a/app/contexts/search/project_context.rb
+++ b/app/services/search/project_service.rb
@@ -1,5 +1,5 @@
 module Search
-  class ProjectContext
+  class ProjectService
     attr_accessor :project, :current_user, :params
 
     def initialize(project, user, params)