summaryrefslogtreecommitdiff
path: root/app/controllers/admin
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-20 00:09:29 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-20 00:09:29 +0000
commitb060b8b7e4e895e28226b366b92081512225cd14 (patch)
tree0364ce1045b2e0a1cc3cad7b0d487e254335b66c /app/controllers/admin
parent49a923c646a2c24b5377cfde8236c73094c60d42 (diff)
downloadgitlab-ce-b060b8b7e4e895e28226b366b92081512225cd14.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/admin')
-rw-r--r--app/controllers/admin/services_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/services_controller.rb b/app/controllers/admin/services_controller.rb
index 50b79cde5c5..2f554519632 100644
--- a/app/controllers/admin/services_controller.rb
+++ b/app/controllers/admin/services_controller.rb
@@ -41,7 +41,7 @@ class Admin::ServicesController < Admin::ApplicationController
# rubocop: disable CodeReuse/ActiveRecord
def service
- @service ||= Service.where(id: params[:id], template: true).first
+ @service ||= Service.find_by(id: params[:id], template: true)
end
# rubocop: enable CodeReuse/ActiveRecord