diff options
| author | PotHix <pothix@pothix.com> | 2016-04-06 12:05:50 -0300 |
|---|---|---|
| committer | PotHix <pothix@pothix.com> | 2016-04-06 13:56:28 -0300 |
| commit | 222e1dc59cd559f893a4565040dede300645248b (patch) | |
| tree | 0427068eef129755fbd50d5d0870262b2ff3f0c9 /app | |
| parent | 801e870ddbce07b9171c08d739ea40007895a0cd (diff) | |
| download | gitlab-ce-222e1dc59cd559f893a4565040dede300645248b.tar.gz | |
Fixes #14638.
The SQL query was ambiguous and in this case we want to filter projects.
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? |