diff options
author | Shinya Maeda <shinya@gitlab.com> | 2017-10-02 21:58:50 +0900 |
---|---|---|
committer | Shinya Maeda <shinya@gitlab.com> | 2017-10-02 21:58:50 +0900 |
commit | 34e66c427dde2070c2c09a07ce08f991e46de92f (patch) | |
tree | d0894218a41a2b67313fc232f19cc734f3dc7b67 /lib | |
parent | 2cb1d617d90b4a9311e3a35434bec958f266d22a (diff) | |
download | gitlab-ce-34e66c427dde2070c2c09a07ce08f991e46de92f.tar.gz |
PollingInterval, rename to gke_clusters, has_one :cluster
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/gcp/model.rb | 13 | ||||
-rw-r--r-- | lib/google_api/cloud_platform/client.rb | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/lib/gitlab/gcp/model.rb b/lib/gitlab/gcp/model.rb new file mode 100644 index 00000000000..195391f0e3c --- /dev/null +++ b/lib/gitlab/gcp/model.rb @@ -0,0 +1,13 @@ +module Gitlab + module Gcp + module Model + def table_name_prefix + "gcp_" + end + + def model_name + @model_name ||= ActiveModel::Name.new(self, nil, self.name.split("::").last) + end + end + end +end diff --git a/lib/google_api/cloud_platform/client.rb b/lib/google_api/cloud_platform/client.rb index ec77e6bdd72..aa85fcdabef 100644 --- a/lib/google_api/cloud_platform/client.rb +++ b/lib/google_api/cloud_platform/client.rb @@ -86,7 +86,7 @@ module GoogleApi end def parse_operation_id(self_link) - self_link.match(/projects\/.*\/zones\/.*\/operations\/(.*)/)[1] + self_link.match(%r{projects/.*/zones/.*/operations/(.*)})[1] end end end |