diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-22 11:19:12 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-22 11:19:12 +0300 |
| commit | 8d70ac008dbb43752e2c1f69530c4453eb8e0e2d (patch) | |
| tree | e1dc083892bb02c4606d02efb0b61b9d2dfa5966 /app/controllers | |
| parent | 9de23248d8f3d6464d329b979ccfe98c23eb4aa3 (diff) | |
| parent | f4e2865d2fabf55bb017f7f88fa2ef0d1c3d4fad (diff) | |
| download | gitlab-ce-8d70ac008dbb43752e2c1f69530c4453eb8e0e2d.tar.gz | |
Merge branch 'master' into 6-0-dev
Conflicts:
VERSION
db/schema.rb
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin/groups_controller.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb index 44ec6079e5b..824eaca348f 100644 --- a/app/controllers/admin/groups_controller.rb +++ b/app/controllers/admin/groups_controller.rb @@ -8,10 +8,6 @@ class Admin::GroupsController < Admin::ApplicationController end def show - @projects = Project.scoped - @projects = @projects.not_in_group(@group) if @group.projects.present? - @projects = @projects.all - @projects.reject!(&:empty_repo?) end def new |