Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
cc6b394a06
commit
41efffa17c
|
@ -51,7 +51,7 @@ export default {
|
||||||
shouldRenderPagination() {
|
shouldRenderPagination() {
|
||||||
return this.repo.pagination.total > this.repo.pagination.perPage;
|
return this.repo.pagination.total > this.repo.pagination.perPage;
|
||||||
},
|
},
|
||||||
modalTitle() {
|
modalAction() {
|
||||||
return n__(
|
return n__(
|
||||||
'ContainerRegistry|Remove tag',
|
'ContainerRegistry|Remove tag',
|
||||||
'ContainerRegistry|Remove tags',
|
'ContainerRegistry|Remove tags',
|
||||||
|
@ -269,8 +269,8 @@ export default {
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<gl-modal ref="deleteModal" :modal-id="modalId" ok-variant="danger">
|
<gl-modal ref="deleteModal" :modal-id="modalId" ok-variant="danger">
|
||||||
<template v-slot:modal-title>{{ modalTitle }}</template>
|
<template v-slot:modal-title>{{ modalAction }}</template>
|
||||||
<template v-slot:modal-ok>{{ s__('ContainerRegistry|Remove tag(s)') }}</template>
|
<template v-slot:modal-ok>{{ modalAction }}</template>
|
||||||
<p v-html="modalDescription"></p>
|
<p v-html="modalDescription"></p>
|
||||||
</gl-modal>
|
</gl-modal>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -3,21 +3,24 @@
|
||||||
|
|
||||||
%fieldset
|
%fieldset
|
||||||
.sub-section
|
.sub-section
|
||||||
|
%h4= _("Hashed repository storage paths")
|
||||||
.form-group
|
.form-group
|
||||||
.form-check
|
.form-check
|
||||||
= f.check_box :hashed_storage_enabled, class: 'form-check-input qa-hashed-storage-checkbox'
|
= f.check_box :hashed_storage_enabled, class: 'form-check-input qa-hashed-storage-checkbox'
|
||||||
= f.label :hashed_storage_enabled, class: 'form-check-label' do
|
= f.label :hashed_storage_enabled, _("Use hashed storage"), class: 'label-bold form-check-label'
|
||||||
Use hashed storage paths for newly created and renamed projects
|
|
||||||
.form-text.text-muted
|
.form-text.text-muted
|
||||||
Enable immutable, hash-based paths and repository names to store repositories on disk. This prevents
|
= _("Use hashed storage paths for newly created and renamed projects. Enable immutable, hash-based paths and repository names to store repositories on disk. This prevents repositories from having to be moved or renamed when the Project URL changes and may improve disk I/O performance.")
|
||||||
repositories from having to be moved or renamed when the Project URL changes and may improve disk I/O performance.
|
.sub-section
|
||||||
|
%h4= _("Storage nodes for new projects")
|
||||||
.form-group
|
.form-group
|
||||||
= f.label :repository_storages, 'Storage paths for new projects', class: 'label-bold'
|
.form-text
|
||||||
= f.select :repository_storages, repository_storages_options_for_select(@application_setting.repository_storages),
|
%p.text-secondary
|
||||||
{include_hidden: false}, multiple: true, class: 'form-control'
|
= _('Select the configured storaged available for new projects to be placed on.')
|
||||||
.form-text.text-muted
|
= link_to icon('question-circle'), help_page_path('administration/repository_storage_paths')
|
||||||
Manage repository storage paths. Learn more in the
|
.form-check
|
||||||
= succeed "." do
|
= f.collection_check_boxes :repository_storages, Gitlab.config.repositories.storages, :first, :first, include_hidden: false do |b|
|
||||||
= link_to "repository storages documentation", help_page_path("administration/repository_storage_paths")
|
= b.check_box class: 'form-check-input'
|
||||||
|
= b.label class: 'label-bold form-check-label'
|
||||||
|
%br
|
||||||
|
|
||||||
= f.submit 'Save changes', class: "btn btn-success qa-save-changes-button"
|
= f.submit _('Save changes'), class: "btn btn-success qa-save-changes-button"
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Container registry tag(s) delete button pluralization
|
||||||
|
merge_request: 18260
|
||||||
|
author:
|
||||||
|
type: changed
|
|
@ -4258,9 +4258,6 @@ msgid_plural "ContainerRegistry|Remove tags"
|
||||||
msgstr[0] ""
|
msgstr[0] ""
|
||||||
msgstr[1] ""
|
msgstr[1] ""
|
||||||
|
|
||||||
msgid "ContainerRegistry|Remove tag(s)"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "ContainerRegistry|Size"
|
msgid "ContainerRegistry|Size"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -8240,6 +8237,9 @@ msgstr ""
|
||||||
msgid "HTTP Basic: Access denied\\nYou must use a personal access token with 'api' scope for Git over HTTP.\\nYou can generate one at %{profile_personal_access_tokens_url}"
|
msgid "HTTP Basic: Access denied\\nYou must use a personal access token with 'api' scope for Git over HTTP.\\nYou can generate one at %{profile_personal_access_tokens_url}"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Hashed repository storage paths"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
msgid "Have your users email"
|
msgid "Have your users email"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -14363,6 +14363,9 @@ msgstr ""
|
||||||
msgid "Select the branch you want to set as the default for this project. All merge requests and commits will automatically be made against this branch unless you specify a different one."
|
msgid "Select the branch you want to set as the default for this project. All merge requests and commits will automatically be made against this branch unless you specify a different one."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Select the configured storaged available for new projects to be placed on."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
msgid "Select the custom project template source group."
|
msgid "Select the custom project template source group."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -15376,6 +15379,9 @@ msgstr ""
|
||||||
msgid "Storage"
|
msgid "Storage"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Storage nodes for new projects"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
msgid "Storage:"
|
msgid "Storage:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -17515,6 +17521,12 @@ msgstr ""
|
||||||
msgid "Use group milestones to manage issues from multiple projects in the same milestone."
|
msgid "Use group milestones to manage issues from multiple projects in the same milestone."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Use hashed storage"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Use hashed storage paths for newly created and renamed projects. Enable immutable, hash-based paths and repository names to store repositories on disk. This prevents repositories from having to be moved or renamed when the Project URL changes and may improve disk I/O performance."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
msgid "Use one line per URI"
|
msgid "Use one line per URI"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
|
@ -196,7 +196,7 @@ describe('table registry', () => {
|
||||||
it('should show the singular title and image name when deleting a single image', () => {
|
it('should show the singular title and image name when deleting a single image', () => {
|
||||||
wrapper.setData({ itemsToBeDeleted: [1] });
|
wrapper.setData({ itemsToBeDeleted: [1] });
|
||||||
wrapper.vm.setModalDescription(0);
|
wrapper.vm.setModalDescription(0);
|
||||||
expect(wrapper.vm.modalTitle).toBe('Remove tag');
|
expect(wrapper.vm.modalAction).toBe('Remove tag');
|
||||||
expect(wrapper.vm.modalDescription).toContain(firstImage.tag);
|
expect(wrapper.vm.modalDescription).toContain(firstImage.tag);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -204,7 +204,7 @@ describe('table registry', () => {
|
||||||
wrapper.setData({ itemsToBeDeleted: [1, 2] });
|
wrapper.setData({ itemsToBeDeleted: [1, 2] });
|
||||||
wrapper.vm.setModalDescription();
|
wrapper.vm.setModalDescription();
|
||||||
|
|
||||||
expect(wrapper.vm.modalTitle).toBe('Remove tags');
|
expect(wrapper.vm.modalAction).toBe('Remove tags');
|
||||||
expect(wrapper.vm.modalDescription).toContain('<b>2</b> tags');
|
expect(wrapper.vm.modalDescription).toContain('<b>2</b> tags');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -91,7 +91,6 @@ describe Clusters::Applications::Jupyter do
|
||||||
it 'includes valid values' do
|
it 'includes valid values' do
|
||||||
expect(values).to include('ingress')
|
expect(values).to include('ingress')
|
||||||
expect(values).to include('hub')
|
expect(values).to include('hub')
|
||||||
expect(values).to include('rbac')
|
|
||||||
expect(values).to include('proxy')
|
expect(values).to include('proxy')
|
||||||
expect(values).to include('auth')
|
expect(values).to include('auth')
|
||||||
expect(values).to include('singleuser')
|
expect(values).to include('singleuser')
|
||||||
|
@ -111,7 +110,6 @@ describe Clusters::Applications::Jupyter do
|
||||||
it 'includes valid values' do
|
it 'includes valid values' do
|
||||||
expect(values).to include('ingress')
|
expect(values).to include('ingress')
|
||||||
expect(values).to include('hub')
|
expect(values).to include('hub')
|
||||||
expect(values).to include('rbac')
|
|
||||||
expect(values).to include('proxy')
|
expect(values).to include('proxy')
|
||||||
expect(values).to include('auth')
|
expect(values).to include('auth')
|
||||||
expect(values).to include('singleuser')
|
expect(values).to include('singleuser')
|
||||||
|
|
|
@ -0,0 +1,28 @@
|
||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
require 'spec_helper'
|
||||||
|
|
||||||
|
describe 'admin/application_settings/_repository_storage.html.haml' do
|
||||||
|
let(:app_settings) { build(:application_setting) }
|
||||||
|
let(:storages) do
|
||||||
|
{
|
||||||
|
"mepmep" => { "path" => "/tmp" },
|
||||||
|
"foobar" => { "path" => "/tmp" }
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
before do
|
||||||
|
assign(:application_setting, app_settings)
|
||||||
|
stub_storage_settings(storages)
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when multiple storages are available' do
|
||||||
|
it 'lists them all' do
|
||||||
|
render
|
||||||
|
|
||||||
|
storages.keys.each do |storage_name|
|
||||||
|
expect(rendered).to have_content(storage_name)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
|
@ -7,8 +7,3 @@ controller:
|
||||||
podAnnotations:
|
podAnnotations:
|
||||||
prometheus.io/scrape: "true"
|
prometheus.io/scrape: "true"
|
||||||
prometheus.io/port: "10254"
|
prometheus.io/port: "10254"
|
||||||
|
|
||||||
rbac:
|
|
||||||
create: false
|
|
||||||
createRole: false
|
|
||||||
createClusterRole: false
|
|
||||||
|
|
|
@ -1,6 +1,3 @@
|
||||||
rbac:
|
|
||||||
enabled: false
|
|
||||||
|
|
||||||
hub:
|
hub:
|
||||||
extraEnv:
|
extraEnv:
|
||||||
JUPYTER_ENABLE_LAB: 1
|
JUPYTER_ENABLE_LAB: 1
|
||||||
|
|
|
@ -12,9 +12,6 @@ nodeExporter:
|
||||||
pushgateway:
|
pushgateway:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
|
||||||
rbac:
|
|
||||||
create: false
|
|
||||||
|
|
||||||
server:
|
server:
|
||||||
fullnameOverride: "prometheus-prometheus-server"
|
fullnameOverride: "prometheus-prometheus-server"
|
||||||
image:
|
image:
|
||||||
|
|
|
@ -11,7 +11,6 @@ checkInterval: 3
|
||||||
|
|
||||||
## For RBAC support
|
## For RBAC support
|
||||||
rbac:
|
rbac:
|
||||||
create: false
|
|
||||||
clusterWideAccess: false
|
clusterWideAccess: false
|
||||||
|
|
||||||
## Configuration for the Pods that that the runner launches for each new job
|
## Configuration for the Pods that that the runner launches for each new job
|
||||||
|
|
Loading…
Reference in New Issue