diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2018-06-07 12:27:22 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-06-07 12:27:22 +0000 |
| commit | df326d061e23a7d5eb2618e542c193d4aef79c1a (patch) | |
| tree | 592f22d4770019257eb2647186004a361099bdd0 | |
| parent | 5a08cef23feb3f0f46da7b8c7481373c1b5d137b (diff) | |
| parent | a2ccadb8b6ad76132bb28251937401d0666829ec (diff) | |
| download | gitlab-ce-47408-migrateuploadsworker-is-doing-n-1-queries-on-migration-2.tar.gz | |
Merge branch '47470-gke-cluster-creation-form-has-project-id-label-for-project-name-field' into 'master'47408-migrateuploadsworker-is-doing-n-1-queries-on-migration-2
Resolve "GKE cluster creation form has 'project id' label for 'project name' field"
Closes #47470
See merge request gitlab-org/gitlab-ce!19528
| -rw-r--r-- | app/views/projects/clusters/gcp/_form.html.haml | 2 | ||||
| -rw-r--r-- | locale/gitlab.pot | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/clusters/gcp/_form.html.haml b/app/views/projects/clusters/gcp/_form.html.haml index ca7a6d5a886..59c4eeec17a 100644 --- a/app/views/projects/clusters/gcp/_form.html.haml +++ b/app/views/projects/clusters/gcp/_form.html.haml @@ -15,7 +15,7 @@ = field.fields_for :provider_gcp, @cluster.provider_gcp do |provider_gcp_field| .form-group - = provider_gcp_field.label :gcp_project_id, s_('ClusterIntegration|Google Cloud Platform project ID') + = provider_gcp_field.label :gcp_project_id, s_('ClusterIntegration|Google Cloud Platform project') .js-gcp-project-id-dropdown-entry-point{ data: { docsUrl: 'https://console.cloud.google.com/home/dashboard' } } = provider_gcp_field.hidden_field :gcp_project_id .dropdown diff --git a/locale/gitlab.pot b/locale/gitlab.pot index f63f2a89aa9..43afb140051 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -1086,7 +1086,7 @@ msgstr "" msgid "ClusterIntegration|GitLab Runner" msgstr "" -msgid "ClusterIntegration|Google Cloud Platform project ID" +msgid "ClusterIntegration|Google Cloud Platform project" msgstr "" msgid "ClusterIntegration|Google Kubernetes Engine" |