diff options
| -rw-r--r-- | app/views/shared/snippets/_form.html.haml | 8 | ||||
| -rw-r--r-- | app/views/shared/snippets/_header.html.haml | 6 | ||||
| -rw-r--r-- | doc/ci/README.md | 2 | ||||
| -rw-r--r-- | doc/ci/secrets/index.md | 2 | ||||
| -rw-r--r-- | doc/user/clusters/agent/index.md | 2 | ||||
| -rw-r--r-- | doc/user/group/repositories_analytics/index.md | 2 | ||||
| -rw-r--r-- | doc/user/project/import/index.md | 6 | ||||
| -rw-r--r-- | locale/gitlab.pot | 5 |
8 files changed, 22 insertions, 11 deletions
diff --git a/app/views/shared/snippets/_form.html.haml b/app/views/shared/snippets/_form.html.haml index 198735df5ee..0c26cb533a5 100644 --- a/app/views/shared/snippets/_form.html.haml +++ b/app/views/shared/snippets/_form.html.haml @@ -46,11 +46,11 @@ .form-actions - if @snippet.new_record? - = f.submit 'Create snippet', class: "btn-success btn", data: { qa_selector: 'submit_button' } + = f.submit 'Create snippet', class: "btn-success btn gl-button", data: { qa_selector: 'submit_button' } - else - = f.submit 'Save changes', class: "btn-success btn", data: { qa_selector: 'submit_button' } + = f.submit 'Save changes', class: "btn-success btn gl-button", data: { qa_selector: 'submit_button' } - if @snippet.project_id - = link_to "Cancel", project_snippets_path(@project), class: "btn btn-cancel" + = link_to "Cancel", project_snippets_path(@project), class: "btn gl-button btn-default" - else - = link_to "Cancel", snippets_path(@project), class: "btn btn-cancel" + = link_to "Cancel", snippets_path(@project), class: "btn gl-button btn-default" diff --git a/app/views/shared/snippets/_header.html.haml b/app/views/shared/snippets/_header.html.haml index a9226117727..1cf20f805dc 100644 --- a/app/views/shared/snippets/_header.html.haml +++ b/app/views/shared/snippets/_header.html.haml @@ -31,15 +31,15 @@ .embed-snippet .input-group .input-group-prepend - %button.btn.btn-svg.embed-toggle.input-group-text{ 'data-toggle': 'dropdown', type: 'button' } + %button.btn.gl-button.btn-svg.embed-toggle.input-group-text{ 'data-toggle': 'dropdown', type: 'button' } %span.js-embed-action= _("Embed") = sprite_icon('angle-down', size: 12, css_class: 'caret-down') %ul.dropdown-menu.dropdown-menu-selectable.embed-toggle-list %li - %button.js-embed-btn.btn.btn-transparent.is-active{ type: 'button' } + %button.js-embed-btn.btn.gl-button.btn-default-tertiary.is-active{ type: 'button' } %strong.embed-toggle-list-item= _("Embed") %li - %button.js-share-btn.btn.btn-transparent{ type: 'button' } + %button.js-share-btn.btn.gl-button.btn-default-tertiary{ type: 'button' } %strong.embed-toggle-list-item= _("Share") = snippet_embed_input(@snippet) .input-group-append diff --git a/doc/ci/README.md b/doc/ci/README.md index 9d3f7f2a8f2..ec8697224b8 100644 --- a/doc/ci/README.md +++ b/doc/ci/README.md @@ -24,7 +24,7 @@ webcast to learn about continuous methods and how GitLab’s built-in CI can hel ## Overview Continuous Integration works by pushing small code chunks to your -application's code base hosted in a Git repository, and, to every +application's code base hosted in a Git repository, and to every push, run a pipeline of scripts to build, test, and validate the code changes before merging them into the main branch. diff --git a/doc/ci/secrets/index.md b/doc/ci/secrets/index.md index 09aeebcc7cc..ca1d1aeaf17 100644 --- a/doc/ci/secrets/index.md +++ b/doc/ci/secrets/index.md @@ -40,7 +40,7 @@ is summarized by this diagram: 1. HashiCorp Vault verifies the JWT. 1. HashiCorp Vault checks the bounded claims and attaches policies. 1. HashiCorp Vault returns the token. -1. Runner reads secrets from the HashiCoupr Vault. +1. Runner reads secrets from the HashiCorp Vault. NOTE: **Note:** Read the [Authenticating and Reading Secrets With HashiCorp Vault](../examples/authenticating-with-hashicorp-vault/index.md) diff --git a/doc/user/clusters/agent/index.md b/doc/user/clusters/agent/index.md index 0bd0b68b8a7..c44502033d0 100644 --- a/doc/user/clusters/agent/index.md +++ b/doc/user/clusters/agent/index.md @@ -173,7 +173,7 @@ Next, install the in-cluster component of the Agent. This example file contains Kubernetes resources required for the Agent to be installed. You can modify this example [`resources.yml` file](#example-resourcesyml-file) in the following ways: -- You can replace `gitlab-agent` with your desired namespace. +- You can replace `gitlab-agent` with `<YOUR-DESIRED-NAMESPACE>`. - For the `kas-address` (Kubernetes Agent Server), you can replace `grpc://host.docker.internal:5005` with the address of the `kas` agent initialized in your Helm install. diff --git a/doc/user/group/repositories_analytics/index.md b/doc/user/group/repositories_analytics/index.md index b013e371ed2..323411ccbab 100644 --- a/doc/user/group/repositories_analytics/index.md +++ b/doc/user/group/repositories_analytics/index.md @@ -1,7 +1,7 @@ --- type: reference stage: Verify -group: Analytics +group: Testing info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers --- diff --git a/doc/user/project/import/index.md b/doc/user/project/import/index.md index 86b671c8371..93a8b30aebc 100644 --- a/doc/user/project/import/index.md +++ b/doc/user/project/import/index.md @@ -30,6 +30,12 @@ repository is too large the import can timeout. There is also the option of [connecting your external repository to get CI/CD benefits](../../../ci/ci_cd_for_external_repos/index.md). **(PREMIUM)** +## LFS authentication + +When importing a project that contains LFS objects, if the project has an +`.lfsconfig` file with the user/password set on the URL, this authentication +information will take precedence over the import authentication data. + ## Migrating from self-managed GitLab to GitLab.com If you only need to migrate Git repos, you can [import each project by URL](repo_by_url.md). Issues and merge requests can't be imported. diff --git a/locale/gitlab.pot b/locale/gitlab.pot index b786dc3d556..88dd95d539b 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -77,6 +77,11 @@ msgstr "" msgid "\"el\" parameter is required for createInstance()" msgstr "" +msgid "%d Approval" +msgid_plural "%d Approvals" +msgstr[0] "" +msgstr[1] "" + msgid "%d Scanned URL" msgid_plural "%d Scanned URLs" msgstr[0] "" |