diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-17 09:47:47 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-17 09:47:47 +0000 |
| commit | f0d2d28118354b6362988687757b63dc7be611e5 (patch) | |
| tree | c6b1abb371822ba5dd1f7fe4d92b494a30dae9bd /lib | |
| parent | 7527408ad0c72ea7b7aba5c14550c5b08b6aae60 (diff) | |
| parent | 4d82e9ed0b6ddb45663bde71412de9c840c58337 (diff) | |
| download | gitlab-ce-f0d2d28118354b6362988687757b63dc7be611e5.tar.gz | |
Merge branch 'refactoring/context_into_services' into 'master'
Refactoring context Into services
To prevent confusion where to write logic. Context or Service?
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/files.rb | 6 | ||||
| -rw-r--r-- | lib/api/projects.rb | 4 | ||||
| -rw-r--r-- | lib/tasks/gitlab/import.rake | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/api/files.rb b/lib/api/files.rb index 8e87ae52e64..213604915a6 100644 --- a/lib/api/files.rb +++ b/lib/api/files.rb @@ -21,7 +21,7 @@ module API attrs = attributes_for_keys [:file_path, :branch_name, :content, :commit_message, :encoding] branch_name = attrs.delete(:branch_name) file_path = attrs.delete(:file_path) - result = ::Files::CreateContext.new(user_project, current_user, attrs, branch_name, file_path).execute + result = ::Files::CreateService.new(user_project, current_user, attrs, branch_name, file_path).execute if result[:status] == :success status(201) @@ -51,7 +51,7 @@ module API attrs = attributes_for_keys [:file_path, :branch_name, :content, :commit_message, :encoding] branch_name = attrs.delete(:branch_name) file_path = attrs.delete(:file_path) - result = ::Files::UpdateContext.new(user_project, current_user, attrs, branch_name, file_path).execute + result = ::Files::UpdateService.new(user_project, current_user, attrs, branch_name, file_path).execute if result[:status] == :success status(200) @@ -81,7 +81,7 @@ module API attrs = attributes_for_keys [:file_path, :branch_name, :commit_message] branch_name = attrs.delete(:branch_name) file_path = attrs.delete(:file_path) - result = ::Files::DeleteContext.new(user_project, current_user, attrs, branch_name, file_path).execute + result = ::Files::DeleteService.new(user_project, current_user, attrs, branch_name, file_path).execute if result[:status] == :success status(200) diff --git a/lib/api/projects.rb b/lib/api/projects.rb index 66e0d1ba3ef..a4c8f7fc87e 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -102,7 +102,7 @@ module API :visibility_level, :import_url] attrs = map_public_to_visibility_level(attrs) - @project = ::Projects::CreateContext.new(current_user, attrs).execute + @project = ::Projects::CreateService.new(current_user, attrs).execute if @project.saved? present @project, with: Entities::Project else @@ -143,7 +143,7 @@ module API :public, :visibility_level] attrs = map_public_to_visibility_level(attrs) - @project = ::Projects::CreateContext.new(user, attrs).execute + @project = ::Projects::CreateService.new(user, attrs).execute if @project.saved? present @project, with: Entities::Project else diff --git a/lib/tasks/gitlab/import.rake b/lib/tasks/gitlab/import.rake index 8fa89270854..83e941adcb1 100644 --- a/lib/tasks/gitlab/import.rake +++ b/lib/tasks/gitlab/import.rake @@ -66,7 +66,7 @@ namespace :gitlab do project_params[:namespace_id] = group.id end - project = Projects::CreateContext.new(user, project_params).execute + project = Projects::CreateService.new(user, project_params).execute if project.valid? puts " * Created #{project.name} (#{repo_path})".green |