diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-04 03:08:37 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-04 03:08:37 +0000 |
commit | 7ec2694360b4d4bd9a4b00ef5166a77c854d9d4f (patch) | |
tree | 6f3c9a688625b5c4dc1bae11be1fc8a4af388b23 /app/models/namespace.rb | |
parent | 27a18afc7dba4e09a5ec78e5c251c31216d7792a (diff) | |
download | gitlab-ce-7ec2694360b4d4bd9a4b00ef5166a77c854d9d4f.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/namespace.rb')
-rw-r--r-- | app/models/namespace.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/models/namespace.rb b/app/models/namespace.rb index 621a98e9ab6..efe14a3e614 100644 --- a/app/models/namespace.rb +++ b/app/models/namespace.rb @@ -131,6 +131,11 @@ class Namespace < ApplicationRecord name = host.delete_suffix(gitlab_host) Namespace.find_by_full_path(name) end + + # overridden in ee + def reset_ci_minutes!(namespace_id) + false + end end def visibility_level_field |