diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2018-02-05 15:16:41 -0600 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2018-02-05 15:16:41 -0600 |
| commit | 46ae03628de47d1bef2683a3a5fe4963b3df7d52 (patch) | |
| tree | aca69b4acab10d5699a6315556de7e7530e65dbe /app/controllers/admin/runners_controller.rb | |
| parent | e6016d0bc2b640801914369e25e1a3639d3e50eb (diff) | |
| parent | 2150ed4094ddb67d7b403cd56360700c80e7d928 (diff) | |
| download | gitlab-ce-46ae03628de47d1bef2683a3a5fe4963b3df7d52.tar.gz | |
Merge branch 'master' into jivl-update-katex
Diffstat (limited to 'app/controllers/admin/runners_controller.rb')
| -rw-r--r-- | app/controllers/admin/runners_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/admin/runners_controller.rb b/app/controllers/admin/runners_controller.rb index 38b808cdc31..4b01904f2a1 100644 --- a/app/controllers/admin/runners_controller.rb +++ b/app/controllers/admin/runners_controller.rb @@ -65,6 +65,7 @@ class Admin::RunnersController < Admin::ApplicationController else Project.all end + @projects = @projects.where.not(id: runner.projects.select(:id)) if runner.projects.any? @projects = @projects.page(params[:page]).per(30) end |