diff options
Diffstat (limited to 'lib/ci')
-rw-r--r-- | lib/ci/api/helpers.rb | 2 | ||||
-rw-r--r-- | lib/ci/migrate/tags.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/ci/api/helpers.rb b/lib/ci/api/helpers.rb index 9197f917d73..e602cda81d6 100644 --- a/lib/ci/api/helpers.rb +++ b/lib/ci/api/helpers.rb @@ -1,6 +1,8 @@ module Ci module API module Helpers + UPDATE_RUNNER_EVERY = 60 + def authenticate_runners! forbidden! unless params[:token] == GitlabCi::REGISTRATION_TOKEN end diff --git a/lib/ci/migrate/tags.rb b/lib/ci/migrate/tags.rb index f4114c698d2..125a535e9a9 100644 --- a/lib/ci/migrate/tags.rb +++ b/lib/ci/migrate/tags.rb @@ -40,7 +40,7 @@ module Ci tags = ActiveRecord::Base.connection.select_all( 'select ci_tags.name from ci_tags ' + 'join ci_taggings on ci_tags.id = ci_taggings.tag_id ' + - "where taggable_type = #{ActiveRecord::Base::sanitize(type)} and taggable_id = #{ActiveRecord::Base::sanitize(id)} and context = \"tags\"" + "where taggable_type = #{ActiveRecord::Base::sanitize(type)} and taggable_id = #{ActiveRecord::Base::sanitize(id)} and context = 'tags'" ) tags.map { |tag| tag['name'] } end |