summaryrefslogtreecommitdiff
path: root/app/controllers/projects
diff options
context:
space:
mode:
Diffstat (limited to 'app/controllers/projects')
-rw-r--r--app/controllers/projects/issues_controller.rb2
-rw-r--r--app/controllers/projects/merge_requests_controller.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 8ce6772c400..89e43164926 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -41,7 +41,7 @@ class Projects::IssuesController < Projects::ApplicationController
format.json do
render json: {
html: view_to_html_string("projects/issues/_issues"),
- labels: @labels
+ labels: @labels.as_json(methods: :text_color)
}
end
end
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index e33fb4ddf13..1388ea9d66c 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -45,7 +45,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
format.json do
render json: {
html: view_to_html_string("projects/merge_requests/_merge_requests"),
- labels: @labels
+ labels: @labels.as_json(methods: :text_color)
}
end
end