diff options
author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-10-19 11:53:31 -0200 |
---|---|---|
committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-10-19 14:58:28 -0200 |
commit | 4f6d1c1d70d744ff599ae9c51e1cbc3a3c23e13e (patch) | |
tree | 0730947487efa9efd134a5263b209a642ccadbe8 /app | |
parent | fc2c64fcdf913a37f987ab5e5626ef9bb9e8b854 (diff) | |
download | gitlab-ce-4f6d1c1d70d744ff599ae9c51e1cbc3a3c23e13e.tar.gz |
Rename Labels::CreateService to Labels::FindOrCreateService
Diffstat (limited to 'app')
-rw-r--r-- | app/models/project.rb | 2 | ||||
-rw-r--r-- | app/services/boards/lists/generate_service.rb | 2 | ||||
-rw-r--r-- | app/services/issuable_base_service.rb | 2 | ||||
-rw-r--r-- | app/services/labels/find_or_create_service.rb (renamed from app/services/labels/create_service.rb) | 2 | ||||
-rw-r--r-- | app/services/labels/transfer_service.rb | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index bc15ca3fc2e..a6039bb8cc4 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -734,7 +734,7 @@ class Project < ActiveRecord::Base def create_labels Label.templates.each do |label| params = label.attributes.except('id', 'template', 'created_at', 'updated_at') - Labels::CreateService.new(owner, self, params).execute + Labels::FindOrCreateService.new(owner, self, params).execute end end diff --git a/app/services/boards/lists/generate_service.rb b/app/services/boards/lists/generate_service.rb index 1d3c7f2071b..939f9bfd068 100644 --- a/app/services/boards/lists/generate_service.rb +++ b/app/services/boards/lists/generate_service.rb @@ -19,7 +19,7 @@ module Boards end def find_or_create_label(params) - ::Labels::CreateService.new(current_user, project, params).execute + ::Labels::FindOrCreateService.new(current_user, project, params).execute end def label_params diff --git a/app/services/issuable_base_service.rb b/app/services/issuable_base_service.rb index 4554963370f..bb92cd80cc9 100644 --- a/app/services/issuable_base_service.rb +++ b/app/services/issuable_base_service.rb @@ -88,7 +88,7 @@ class IssuableBaseService < BaseService return unless labels params[:label_ids] = labels.split(',').map do |label_name| - service = Labels::CreateService.new(current_user, project, title: label_name.strip) + service = Labels::FindOrCreateService.new(current_user, project, title: label_name.strip) label = service.execute label.id diff --git a/app/services/labels/create_service.rb b/app/services/labels/find_or_create_service.rb index bb475ce741d..74291312c4e 100644 --- a/app/services/labels/create_service.rb +++ b/app/services/labels/find_or_create_service.rb @@ -1,5 +1,5 @@ module Labels - class CreateService + class FindOrCreateService def initialize(current_user, project, params = {}) @current_user = current_user @group = project.group diff --git a/app/services/labels/transfer_service.rb b/app/services/labels/transfer_service.rb index 65b4bdbaff9..f91b3724aef 100644 --- a/app/services/labels/transfer_service.rb +++ b/app/services/labels/transfer_service.rb @@ -43,7 +43,7 @@ module Labels def find_or_create_label!(label) params = label.attributes.slice('title', 'description', 'color') - new_label = CreateService.new(current_user, project, params).execute + new_label = FindOrCreateService.new(current_user, project, params).execute new_label.id end |