diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-04-07 08:35:38 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-04-07 08:35:38 +0000 |
| commit | d62a3decf945b448a7fcf2fdcf4c523d0b7d2eae (patch) | |
| tree | 073a0fe9d046119c8caa28079a928bb93bc1890e /app | |
| parent | 2817c541375bcb5478bc2d922decb017efbe26a5 (diff) | |
| parent | 222e1dc59cd559f893a4565040dede300645248b (diff) | |
| download | gitlab-ce-d62a3decf945b448a7fcf2fdcf4c523d0b7d2eae.tar.gz | |
Merge branch 'fix_14638' into 'master'
Fixes #14638.
The SQL query was ambiguous and in this case we want to filter projects.
See merge request !3462
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/admin/projects_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/projects_controller.rb b/app/controllers/admin/projects_controller.rb index 4089091d569..c6b3105544a 100644 --- a/app/controllers/admin/projects_controller.rb +++ b/app/controllers/admin/projects_controller.rb @@ -5,7 +5,7 @@ class Admin::ProjectsController < Admin::ApplicationController def index @projects = Project.all @projects = @projects.in_namespace(params[:namespace_id]) if params[:namespace_id].present? - @projects = @projects.where("visibility_level IN (?)", params[:visibility_levels]) if params[:visibility_levels].present? + @projects = @projects.where("projects.visibility_level IN (?)", params[:visibility_levels]) if params[:visibility_levels].present? @projects = @projects.with_push if params[:with_push].present? @projects = @projects.abandoned if params[:abandoned].present? @projects = @projects.non_archived unless params[:with_archived].present? |