if issue is not valid we revert back to the old labels when updating

2 files changed, 2 insertions, 17 deletions

diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index dbad86d8926..da4b1bf9902 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -102,14 +102,6 @@ module API
       label || not_found!('Label')
     end
 
-    def get_label_ids(labels)
-      labels.split(",").map do |label_name|
-        user_project.labels.create_with(color: Label::DEFAULT_COLOR)
-                           .find_or_create_by(title: label_name.strip)
-                           .id
-      end
-    end
-
     def find_project_issue(id)
       issue = user_project.issues.find(id)
       not_found! unless can?(current_user, :read_issue, issue)
diff --git a/lib/api/issues.rb b/lib/api/issues.rb
index 39a46f69f16..d0bc7243e54 100644
--- a/lib/api/issues.rb
+++ b/lib/api/issues.rb
@@ -154,9 +154,7 @@ module API
           render_api_error!({ labels: errors }, 400)
         end
 
-        # Find or create labels to attach to the issue. Labels are vaild
-        # because we already checked its name, so there can't be an error here
-        attrs[:label_ids] = get_label_ids(params[:labels]) if params[:labels].present?
+        attrs[:labels] = params[:labels] if params[:labels]
 
         issue = ::Issues::CreateService.new(user_project, current_user, attrs.merge(request: request, api: true)).execute
 
@@ -198,12 +196,7 @@ module API
           render_api_error!({ labels: errors }, 400)
         end
 
-        # Find or create labels and attach to issue. Labels are valid because
-        # we already checked its name, so there can't be an error here
-        if params[:labels] && can?(current_user, :admin_issue, user_project)
-          issue.remove_labels
-          attrs[:label_ids] = get_label_ids(params[:labels])
-        end
+        attrs[:labels] = params[:labels] if params[:labels]
 
         issue = ::Issues::UpdateService.new(user_project, current_user, attrs).execute(issue)