summaryrefslogtreecommitdiff
path: root/app/models/namespace.rb
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2017-01-20 12:25:53 +0100
committerKamil Trzcinski <ayufan@ayufan.eu>2017-01-20 12:25:53 +0100
commitb7f4553e3e4681d5a4a53af35650bcbb1c83b390 (patch)
tree281f19e15f9c06e978382fbaffb42ddb1ad705eb /app/models/namespace.rb
parent491f1375fc055805c623a3079a383de988689f3d (diff)
downloadgitlab-ce-b7f4553e3e4681d5a4a53af35650bcbb1c83b390.tar.gz
Backport changes introduced by https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1083
Diffstat (limited to 'app/models/namespace.rb')
-rw-r--r--app/models/namespace.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/models/namespace.rb b/app/models/namespace.rb
index d41833de66f..778b9c127ad 100644
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -4,6 +4,7 @@ class Namespace < ActiveRecord::Base
include CacheMarkdownField
include Sortable
include Gitlab::ShellAdapter
+ include Gitlab::CurrentSettings
include Routable
cache_markdown_field :description, pipeline: :description
@@ -174,6 +175,10 @@ class Namespace < ActiveRecord::Base
end
end
+ def shared_runners_enabled?
+ projects.with_shared_runners.any?
+ end
+
def full_name
@full_name ||=
if parent