summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-08-26 17:47:18 -0700
committerDouwe Maan <douwe@gitlab.com>2015-08-26 17:47:18 -0700
commit6afd69f4445cc0688aa1695389eb3f79033e3121 (patch)
tree729b58c8a0a7013e4166dca05e2e68adfe274a1d /app/controllers
parent046b28312704f3131e72dcd2dbdacc5264d4aa62 (diff)
downloadgitlab-ce-6afd69f4445cc0688aa1695389eb3f79033e3121.tar.gz
Update gitignore, change literal DB table names, fix errors, fix fontawesome
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/ci/runners_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/ci/runners_controller.rb b/app/controllers/ci/runners_controller.rb
index 01eebf7e6a7..0ef32ce928f 100644
--- a/app/controllers/ci/runners_controller.rb
+++ b/app/controllers/ci/runners_controller.rb
@@ -11,7 +11,7 @@ module Ci
def index
@runners = @project.runners.order('id DESC')
@specific_runners = current_user.authorized_runners.
- where.not(id: @runners).order('runners.id DESC').page(params[:page]).per(20)
+ where.not(id: @runners).order("#{Ci::Runner.table_name}.id DESC").page(params[:page]).per(20)
@shared_runners = Ci::Runner.shared.active
@shared_runners_count = @shared_runners.count(:all)
end