summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYatish Mehta <yatish.mehta@coupa.com>2016-03-04 14:34:32 -0800
committerRémy Coutable <remy@rymai.me>2016-03-08 16:48:00 +0100
commit6ac68d8cb0477367fbf9642526c459b87b116d40 (patch)
tree182d64e60a9eb10ca1097f55ca93cc5ccc7cf326
parent36730e8e63c0ebe16785f33cb2b740f8d67b2b25 (diff)
downloadgitlab-ce-6ac68d8cb0477367fbf9642526c459b87b116d40.tar.gz
Remove instance variable @group multiple assignment
-rw-r--r--CHANGELOG1
-rw-r--r--app/controllers/admin/groups_controller.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index a98bdd26f74..1c09111443a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,7 @@ v 8.6.0 (unreleased)
- Fix issue when pushing to projects ending in .wiki
- Fix avatar stretching by providing a cropping feature (Johann Pardanaud)
- Don't load all of GitLab in mail_room
+ - Memoize @group in Admin::GroupsController (Yatish Mehta)
- Indicate how much an MR diverged from the target branch (Pierre de La Morinerie)
- Strip leading and trailing spaces in URL validator (evuez)
- Return empty array instead of 404 when commit has no statuses in commit status API
diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index 4d3e48f7f81..668396a0f20 100644
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -55,7 +55,7 @@ class Admin::GroupsController < Admin::ApplicationController
private
def group
- @group = Group.find_by(path: params[:id])
+ @group ||= Group.find_by(path: params[:id])
end
def group_params