summaryrefslogtreecommitdiff
path: root/app/controllers/groups
diff options
context:
space:
mode:
authorMichael Kozono <mkozono@gmail.com>2017-05-04 17:06:01 -0700
committerMichael Kozono <mkozono@gmail.com>2017-05-05 12:12:50 -0700
commitf05469f99b8c52c4dab7ac9160b47676c87124f9 (patch)
tree89d39b3c7672d89fd05346c2ea930ae039a95c4a /app/controllers/groups
parent9e48f02ea802814e4df1f1de5ed509942dca7581 (diff)
downloadgitlab-ce-f05469f99b8c52c4dab7ac9160b47676c87124f9.tar.gz
Resolve discussions
Diffstat (limited to 'app/controllers/groups')
-rw-r--r--app/controllers/groups/application_controller.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/app/controllers/groups/application_controller.rb b/app/controllers/groups/application_controller.rb
index 2157a56dea2..afffb813b44 100644
--- a/app/controllers/groups/application_controller.rb
+++ b/app/controllers/groups/application_controller.rb
@@ -9,11 +9,7 @@ class Groups::ApplicationController < ApplicationController
private
def group
- @group ||= find_routable!(Group, requested_full_path)
- end
-
- def requested_full_path
- params[:group_id] || params[:id]
+ @group ||= find_routable!(Group, params[:group_id] || params[:id])
end
def group_projects