diff options
| author | Simon Knox <psimyn@gmail.com> | 2018-02-28 09:10:03 +1100 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2018-02-28 09:10:03 +1100 |
| commit | 7917f301b3d954adbe5bd594ec9a8620207311a4 (patch) | |
| tree | bdeb4bb7e765c0ac8605abf85823188335e4dc48 /app/controllers/groups_controller.rb | |
| parent | 8d33065349ef5e3fa0f22fad6b2164b2fbf978bc (diff) | |
| parent | 074d3595f30644af031e10d60c4fdbd7c67bcd2b (diff) | |
| download | gitlab-ce-acet-mr-notes-index.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into acet-mr-notes-indexacet-mr-notes-index
Diffstat (limited to 'app/controllers/groups_controller.rb')
| -rw-r--r-- | app/controllers/groups_controller.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 14b9d6c22bd..283c3e5f1e0 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -14,7 +14,6 @@ class GroupsController < Groups::ApplicationController before_action :authorize_create_group!, only: [:new] before_action :group_projects, only: [:projects, :activity, :issues, :merge_requests] - before_action :group_merge_requests, only: [:merge_requests] before_action :event_filter, only: [:activity] before_action :user_actions, only: [:show, :subgroups] |