diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-10-07 08:07:33 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-10-07 08:07:33 +0000 |
| commit | 5ee20b637553dcb70590edfa30b81d972de37170 (patch) | |
| tree | 7079e097120fc25438b411c6162a1ae81656c129 /app/models/project.rb | |
| parent | c0cfc9ebd26583c444f2cce1a23f939bfa7d8969 (diff) | |
| parent | d4f3963e98397a0aee4b7a65c76ae404300b41d1 (diff) | |
| download | gitlab-ce-5ee20b637553dcb70590edfa30b81d972de37170.tar.gz | |
Merge branch 'master' into '37970-ci-sections-tracking'
# Conflicts:
# db/schema.rb
Diffstat (limited to 'app/models/project.rb')
| -rw-r--r-- | app/models/project.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 4d4d028dd7e..608b545f99f 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -165,6 +165,7 @@ class Project < ActiveRecord::Base has_one :import_data, class_name: 'ProjectImportData', inverse_of: :project, autosave: true has_one :project_feature, inverse_of: :project has_one :statistics, class_name: 'ProjectStatistics' + has_one :cluster, class_name: 'Gcp::Cluster', inverse_of: :project # Container repositories need to remove data from the container registry, # which is not managed by the DB. Hence we're still using dependent: :destroy @@ -1035,6 +1036,8 @@ class Project < ActiveRecord::Base end true + rescue GRPC::Internal # if the path is too long + false end def create_repository(force: false) |