diff options
131 files changed, 2914 insertions, 1863 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index 2985c1446e4..9143966b864 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -8,6 +8,7 @@ require: - rubocop-rspec AllCops: + TargetRubyVersion: 2.5 TargetRailsVersion: 5.0 Exclude: - 'vendor/**/*' @@ -184,3 +185,8 @@ Cop/InjectEnterpriseEditionModule: Style/ReturnNil: Enabled: true + +# It isn't always safe to replace `=~` with `.match?`, especially when there are +# nil values on the left hand side +Performance/RegexpMatch: + Enabled: false diff --git a/app/assets/javascripts/environments/folder/environments_folder_view.vue b/app/assets/javascripts/environments/folder/environments_folder_view.vue index 80f0e00400b..6fd0561f682 100644 --- a/app/assets/javascripts/environments/folder/environments_folder_view.vue +++ b/app/assets/javascripts/environments/folder/environments_folder_view.vue @@ -1,4 +1,5 @@ <script> +import folderMixin from 'ee_else_ce/environments/mixins/environments_folder_view_mixin'; import environmentsMixin from '../mixins/environments_mixin'; import CIPaginationMixin from '../../vue_shared/mixins/ci_pagination_api_mixin'; import StopEnvironmentModal from '../components/stop_environment_modal.vue'; @@ -8,7 +9,7 @@ export default { StopEnvironmentModal, }, - mixins: [environmentsMixin, CIPaginationMixin], + mixins: [environmentsMixin, CIPaginationMixin, folderMixin], props: { endpoint: { @@ -41,7 +42,8 @@ export default { <div v-if="!isLoading" class="top-area"> <h4 class="js-folder-name environments-folder-name"> - {{ s__('Environments|Environments') }} / <b>{{ folderName }}</b> + {{ s__('Environments|Environments') }} / + <b>{{ folderName }}</b> </h4> <tabs :tabs="tabs" scope="environments" @onChangeTab="onChangeTab" /> @@ -52,6 +54,11 @@ export default { :environments="state.environments" :pagination="state.paginationInformation" :can-read-environment="canReadEnvironment" + :canary-deployment-feature-id="canaryDeploymentFeatureId" + :show-canary-deployment-callout="showCanaryDeploymentCallout" + :user-callouts-path="userCalloutsPath" + :lock-promotion-svg-path="lockPromotionSvgPath" + :help-canary-deployments-path="helpCanaryDeploymentsPath" @onChangePage="onChangePage" /> </div> diff --git a/app/assets/javascripts/environments/index.js b/app/assets/javascripts/environments/index.js index 6af66d0f86e..b53d42f202b 100644 --- a/app/assets/javascripts/environments/index.js +++ b/app/assets/javascripts/environments/index.js @@ -1,4 +1,5 @@ import Vue from 'vue'; +import canaryCalloutMixin from 'ee_else_ce/environments/mixins/canary_callout_mixin'; import environmentsComponent from './components/environments_app.vue'; import { parseBoolean } from '../lib/utils/common_utils'; import Translate from '../vue_shared/translate'; @@ -11,6 +12,7 @@ export default () => components: { environmentsComponent, }, + mixins: [canaryCalloutMixin], data() { const environmentsData = document.querySelector(this.$options.el).dataset; @@ -32,6 +34,7 @@ export default () => cssContainerClass: this.cssContainerClass, canCreateEnvironment: this.canCreateEnvironment, canReadEnvironment: this.canReadEnvironment, + ...this.canaryCalloutProps, }, }); }, diff --git a/app/assets/javascripts/environments/mixins/canary_callout_mixin.js b/app/assets/javascripts/environments/mixins/canary_callout_mixin.js new file mode 100644 index 00000000000..f6d3d67b777 --- /dev/null +++ b/app/assets/javascripts/environments/mixins/canary_callout_mixin.js @@ -0,0 +1,5 @@ +export default { + computed: { + canaryCalloutProps() {}, + }, +}; diff --git a/app/assets/javascripts/environments/mixins/environments_folder_view_mixin.js b/app/assets/javascripts/environments/mixins/environments_folder_view_mixin.js new file mode 100644 index 00000000000..e793a7cadf2 --- /dev/null +++ b/app/assets/javascripts/environments/mixins/environments_folder_view_mixin.js @@ -0,0 +1,29 @@ +export default { + props: { + canaryDeploymentFeatureId: { + type: String, + required: false, + default: '', + }, + showCanaryDeploymentCallout: { + type: Boolean, + required: false, + default: false, + }, + userCalloutsPath: { + type: String, + required: false, + default: '', + }, + lockPromotionSvgPath: { + type: String, + required: false, + default: '', + }, + helpCanaryDeploymentsPath: { + type: String, + required: false, + default: '', + }, + }, +}; diff --git a/app/assets/javascripts/environments/mixins/environments_mixin.js b/app/assets/javascripts/environments/mixins/environments_mixin.js index 71b6b578196..a5812b173dc 100644 --- a/app/assets/javascripts/environments/mixins/environments_mixin.js +++ b/app/assets/javascripts/environments/mixins/environments_mixin.js @@ -3,13 +3,13 @@ */ import _ from 'underscore'; import Visibility from 'visibilityjs'; +import EnvironmentsStore from 'ee_else_ce/environments/stores/environments_store'; import Poll from '../../lib/utils/poll'; import { getParameterByName } from '../../lib/utils/common_utils'; import { s__ } from '../../locale'; import Flash from '../../flash'; import eventHub from '../event_hub'; -import EnvironmentsStore from '../stores/environments_store'; import EnvironmentsService from '../services/environments_service'; import tablePagination from '../../vue_shared/components/table_pagination.vue'; import environmentTable from '../components/environments_table.vue'; diff --git a/app/assets/javascripts/environments/stores/environments_store.js b/app/assets/javascripts/environments/stores/environments_store.js index ac9a31c202c..5fb420e9da5 100644 --- a/app/assets/javascripts/environments/stores/environments_store.js +++ b/app/assets/javascripts/environments/stores/environments_store.js @@ -1,4 +1,6 @@ import { parseIntPagination, normalizeHeaders } from '~/lib/utils/common_utils'; +import { setDeployBoard } from 'ee_else_ce/environments/stores/helpers'; + /** * Environments Store. * @@ -31,6 +33,14 @@ export default class EnvironmentsStore { * If the `size` is bigger than 1, it means it should be rendered as a folder. * In those cases we add `isFolder` key in order to render it properly. * + * Top level environments - when the size is 1 - with `rollout_status` + * can render a deploy board. We add `isDeployBoardVisible` and `deployBoardData` + * keys to those environments. + * The first key will let's us know if we should or not render the deploy board. + * It will be toggled when the user clicks to seee the deploy board. + * + * The second key will allow us to update the environment with the received deploy board data. + * * @param {Array} environments * @returns {Array} */ @@ -63,6 +73,7 @@ export default class EnvironmentsStore { filtered = Object.assign(filtered, env); } + filtered = setDeployBoard(oldEnvironmentState, filtered); return filtered; }); @@ -71,6 +82,20 @@ export default class EnvironmentsStore { return filteredEnvironments; } + /** + * Stores the pagination information needed to render the pagination for the + * table. + * + * Normalizes the headers to uppercase since they can be provided either + * in uppercase or lowercase. + * + * Parses to an integer the normalized ones needed for the pagination component. + * + * Stores the normalized and parsed information. + * + * @param {Object} pagination = {} + * @return {Object} + */ setPagination(pagination = {}) { const normalizedHeaders = normalizeHeaders(pagination); const paginationInformation = parseIntPagination(normalizedHeaders); diff --git a/app/assets/javascripts/environments/stores/helpers.js b/app/assets/javascripts/environments/stores/helpers.js new file mode 100644 index 00000000000..8eba6c00601 --- /dev/null +++ b/app/assets/javascripts/environments/stores/helpers.js @@ -0,0 +1,8 @@ +/** + * Deploy boards are EE only. + * + * @param {Object} environment + * @returns {Object} + */ +// eslint-disable-next-line import/prefer-default-export +export const setDeployBoard = (oldEnvironmentState, environment) => environment; diff --git a/app/assets/javascripts/pages/groups/details/index.js b/app/assets/javascripts/pages/groups/details/index.js new file mode 100644 index 00000000000..3bcaa0f0232 --- /dev/null +++ b/app/assets/javascripts/pages/groups/details/index.js @@ -0,0 +1,5 @@ +import initGroupDetails from '../shared/group_details'; + +document.addEventListener('DOMContentLoaded', () => { + initGroupDetails('details'); +}); diff --git a/app/assets/javascripts/pages/groups/shared/group_details.js b/app/assets/javascripts/pages/groups/shared/group_details.js new file mode 100644 index 00000000000..01ef3f1db2b --- /dev/null +++ b/app/assets/javascripts/pages/groups/shared/group_details.js @@ -0,0 +1,31 @@ +/* eslint-disable no-new */ + +import { getPagePath } from '~/lib/utils/common_utils'; +import { ACTIVE_TAB_SHARED, ACTIVE_TAB_ARCHIVED } from '~/groups/constants'; +import NewGroupChild from '~/groups/new_group_child'; +import notificationsDropdown from '~/notifications_dropdown'; +import NotificationsForm from '~/notifications_form'; +import ProjectsList from '~/projects_list'; +import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; +import GroupTabs from './group_tabs'; + +export default function initGroupDetails(actionName = 'show') { + const newGroupChildWrapper = document.querySelector('.js-new-project-subgroup'); + const loadableActions = [ACTIVE_TAB_SHARED, ACTIVE_TAB_ARCHIVED]; + const paths = window.location.pathname.split('/'); + const subpath = paths[paths.length - 1]; + let action = loadableActions.includes(subpath) ? subpath : getPagePath(1); + if (actionName && action === actionName) { + action = 'show'; // 'show' resets GroupTabs to default action through base class + } + + new GroupTabs({ parentEl: '.groups-listing', action }); + new ShortcutsNavigation(); + new NotificationsForm(); + notificationsDropdown(); + new ProjectsList(); + + if (newGroupChildWrapper) { + new NewGroupChild(newGroupChildWrapper); + } +} diff --git a/app/assets/javascripts/pages/groups/show/group_tabs.js b/app/assets/javascripts/pages/groups/shared/group_tabs.js index c6fe61d2bd9..c6fe61d2bd9 100644 --- a/app/assets/javascripts/pages/groups/show/group_tabs.js +++ b/app/assets/javascripts/pages/groups/shared/group_tabs.js diff --git a/app/assets/javascripts/pages/groups/show/index.js b/app/assets/javascripts/pages/groups/show/index.js index 3a45fd70d02..af924e74f1f 100644 --- a/app/assets/javascripts/pages/groups/show/index.js +++ b/app/assets/javascripts/pages/groups/show/index.js @@ -1,28 +1,5 @@ -/* eslint-disable no-new */ - -import { getPagePath } from '~/lib/utils/common_utils'; -import { ACTIVE_TAB_SHARED, ACTIVE_TAB_ARCHIVED } from '~/groups/constants'; -import NewGroupChild from '~/groups/new_group_child'; -import notificationsDropdown from '~/notifications_dropdown'; -import NotificationsForm from '~/notifications_form'; -import ProjectsList from '~/projects_list'; -import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; -import GroupTabs from './group_tabs'; +import initGroupDetails from '../shared/group_details'; document.addEventListener('DOMContentLoaded', () => { - const newGroupChildWrapper = document.querySelector('.js-new-project-subgroup'); - const loadableActions = [ACTIVE_TAB_SHARED, ACTIVE_TAB_ARCHIVED]; - const paths = window.location.pathname.split('/'); - const subpath = paths[paths.length - 1]; - const action = loadableActions.includes(subpath) ? subpath : getPagePath(1); - - new GroupTabs({ parentEl: '.groups-listing', action }); - new ShortcutsNavigation(); - new NotificationsForm(); - notificationsDropdown(); - new ProjectsList(); - - if (newGroupChildWrapper) { - new NewGroupChild(newGroupChildWrapper); - } + initGroupDetails(); }); diff --git a/app/assets/javascripts/pages/users/user_tabs.js b/app/assets/javascripts/pages/users/user_tabs.js index 636308c5401..7f800d20835 100644 --- a/app/assets/javascripts/pages/users/user_tabs.js +++ b/app/assets/javascripts/pages/users/user_tabs.js @@ -91,6 +91,7 @@ export default class UserTabs { this.actions = Object.keys(this.loaded); this.bindEvents(); + // TODO: refactor to make this configurable via constructor params with a default value of 'show' if (this.action === 'show') { this.action = this.defaultAction; } diff --git a/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue b/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue index 09a50d25020..348c407f1b5 100644 --- a/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue +++ b/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue @@ -1,5 +1,6 @@ <script> import _ from 'underscore'; +import stageColumnMixin from 'ee_else_ce/pipelines/mixins/stage_column_mixin'; import JobItem from './job_item.vue'; import JobGroupDropdown from './job_group_dropdown.vue'; @@ -8,6 +9,7 @@ export default { JobItem, JobGroupDropdown, }, + mixins: [stageColumnMixin], props: { title: { type: String, @@ -32,9 +34,6 @@ export default { groupId(group) { return `ci-badge-${_.escape(group.name)}`; }, - buildConnnectorClass(index) { - return index === 0 && !this.isFirstColumn ? 'left-connector' : ''; - }, pipelineActionRequestComplete() { this.$emit('refreshPipelineGraph'); }, diff --git a/app/assets/javascripts/pipelines/mixins/graph_pipeline_bundle_mixin.js b/app/assets/javascripts/pipelines/mixins/graph_pipeline_bundle_mixin.js new file mode 100644 index 00000000000..9177943f88a --- /dev/null +++ b/app/assets/javascripts/pipelines/mixins/graph_pipeline_bundle_mixin.js @@ -0,0 +1,6 @@ +export default { + methods: { + clickTriggeredByPipeline() {}, + clickTriggeredPipeline() {}, + }, +}; diff --git a/app/assets/javascripts/pipelines/mixins/stage_column_mixin.js b/app/assets/javascripts/pipelines/mixins/stage_column_mixin.js new file mode 100644 index 00000000000..64283ed0e58 --- /dev/null +++ b/app/assets/javascripts/pipelines/mixins/stage_column_mixin.js @@ -0,0 +1,7 @@ +export default { + methods: { + buildConnnectorClass(index) { + return index === 0 && !this.isFirstColumn ? 'left-connector' : ''; + }, + }, +}; diff --git a/app/assets/javascripts/pipelines/pipeline_details_bundle.js b/app/assets/javascripts/pipelines/pipeline_details_bundle.js index dc9befe6349..8adbd39edd4 100644 --- a/app/assets/javascripts/pipelines/pipeline_details_bundle.js +++ b/app/assets/javascripts/pipelines/pipeline_details_bundle.js @@ -2,8 +2,9 @@ import Vue from 'vue'; import Flash from '~/flash'; import Translate from '~/vue_shared/translate'; import { __ } from '~/locale'; +import pipelineGraph from 'ee_else_ce/pipelines/components/graph/graph_component.vue'; +import GraphEEMixin from 'ee_else_ce/pipelines/mixins/graph_pipeline_bundle_mixin'; import PipelinesMediator from './pipeline_details_mediator'; -import pipelineGraph from './components/graph/graph_component.vue'; import pipelineHeader from './components/header_component.vue'; import eventHub from './event_hub'; @@ -22,6 +23,7 @@ export default () => { components: { pipelineGraph, }, + mixins: [GraphEEMixin], data() { return { mediator, @@ -44,6 +46,10 @@ export default () => { }, on: { refreshPipelineGraph: this.requestRefreshPipelineGraph, + onClickTriggeredBy: (parentPipeline, pipeline) => + this.clickTriggeredByPipeline(parentPipeline, pipeline), + onClickTriggered: (parentPipeline, pipeline) => + this.clickTriggeredPipeline(parentPipeline, pipeline), }, }); }, diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss index aad5150c0b5..d47931a49e4 100644 --- a/app/assets/stylesheets/framework/common.scss +++ b/app/assets/stylesheets/framework/common.scss @@ -376,18 +376,21 @@ img.emoji { .prepend-top-default { margin-top: $gl-padding !important; } .prepend-top-16 { margin-top: 16px; } .prepend-top-20 { margin-top: 20px; } +.prepend-top-32 { margin-top: 32px; } .prepend-left-4 { margin-left: 4px; } .prepend-left-5 { margin-left: 5px; } .prepend-left-8 { margin-left: 8px; } .prepend-left-10 { margin-left: 10px; } .prepend-left-default { margin-left: $gl-padding; } .prepend-left-20 { margin-left: 20px; } +.prepend-left-32 { margin-left: 32px; } .append-right-4 { margin-right: 4px; } .append-right-5 { margin-right: 5px; } .append-right-8 { margin-right: 8px; } .append-right-10 { margin-right: 10px; } .append-right-default { margin-right: $gl-padding; } .append-right-20 { margin-right: 20px; } +.prepend-right-32 { margin-right: 32px; } .append-bottom-0 { margin-bottom: 0; } .append-bottom-4 { margin-bottom: $gl-padding-4; } .append-bottom-5 { margin-bottom: 5px; } @@ -396,6 +399,7 @@ img.emoji { .append-bottom-15 { margin-bottom: 15px; } .append-bottom-20 { margin-bottom: 20px; } .append-bottom-default { margin-bottom: $gl-padding; } +.prepend-bottom-32 { margin-bottom: 32px; } .inline { display: inline-block; } .center { text-align: center; } .vertical-align-middle { vertical-align: middle; } diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 1349845f300..8e53876eb4f 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -693,10 +693,6 @@ } } -.project-empty-note-panel { - border-bottom: 1px solid $border-color; -} - .project-stats, .project-buttons { .scrolling-tabs-container { diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 4e50106398a..0192b1c253e 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -58,11 +58,24 @@ class GroupsController < Groups::ApplicationController def show respond_to do |format| - format.html + format.html do + render_show_html + end format.atom do - load_events - render layout: 'xml.atom' + render_details_view_atom + end + end + end + + def details + respond_to do |format| + format.html do + render_details_html + end + + format.atom do + render_details_view_atom end end end @@ -119,6 +132,19 @@ class GroupsController < Groups::ApplicationController protected + def render_show_html + render 'groups/show' + end + + def render_details_html + render 'groups/show' + end + + def render_details_view_atom + load_events + render layout: 'xml.atom', template: 'groups/show' + end + # rubocop: disable CodeReuse/ActiveRecord def authorize_create_group! allowed = if params[:parent_id].present? @@ -178,8 +204,8 @@ class GroupsController < Groups::ApplicationController .includes(:namespace) @events = EventCollection - .new(@projects, offset: params[:offset].to_i, filter: event_filter) - .to_a + .new(@projects, offset: params[:offset].to_i, filter: event_filter) + .to_a Events::RenderService .new(current_user) diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index 4a9ed123161..9d028dccad7 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -4,6 +4,7 @@ module GroupsHelper def group_overview_nav_link_paths %w[ groups#show + groups#details groups#activity groups#subgroups analytics#show diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index 351a662ae83..e53e2c8fc43 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -286,13 +286,11 @@ class MergeRequestDiff < ActiveRecord::Base return yield(@external_diff_file) if @external_diff_file external_diff.open do |file| - begin - @external_diff_file = file + @external_diff_file = file - yield(@external_diff_file) - ensure - @external_diff_file = nil - end + yield(@external_diff_file) + ensure + @external_diff_file = nil end end diff --git a/app/models/merge_request_diff_file.rb b/app/models/merge_request_diff_file.rb index e8d936e265c..16ec4ed470f 100644 --- a/app/models/merge_request_diff_file.rb +++ b/app/models/merge_request_diff_file.rb @@ -23,6 +23,6 @@ class MergeRequestDiffFile < ActiveRecord::Base super end - binary? ? content.unpack('m0').first : content + binary? ? content.unpack1('m0') : content end end diff --git a/app/models/project.rb b/app/models/project.rb index aba63032cdf..59b139e5986 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1209,11 +1209,9 @@ class Project < ActiveRecord::Base def repo_exists? strong_memoize(:repo_exists) do - begin - repository.exists? - rescue - false - end + repository.exists? + rescue + false end end diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb index f7064d5aaea..81302c516c2 100644 --- a/app/models/project_services/jira_service.rb +++ b/app/models/project_services/jira_service.rb @@ -205,12 +205,10 @@ class JiraService < IssueTrackerService # if any transition fails it will log the error message and stop the transition sequence def transition_issue(issue) jira_issue_transition_id.scan(Gitlab::Regex.jira_transition_id_regex).each do |transition_id| - begin - issue.transitions.build.save!(transition: { id: transition_id }) - rescue => error - log_error("Issue transition failed", error: error.message, client_url: client_url) - return false - end + issue.transitions.build.save!(transition: { id: transition_id }) + rescue => error + log_error("Issue transition failed", error: error.message, client_url: client_url) + return false end end diff --git a/app/models/repository.rb b/app/models/repository.rb index 285fce1e6dd..ff355295862 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -265,16 +265,14 @@ class Repository # to avoid unnecessary syncing. def keep_around(*shas) shas.each do |sha| - begin - next unless sha.present? && commit_by(oid: sha) + next unless sha.present? && commit_by(oid: sha) - next if kept_around?(sha) + next if kept_around?(sha) - # This will still fail if the file is corrupted (e.g. 0 bytes) - raw_repository.write_ref(keep_around_ref_name(sha), sha) - rescue Gitlab::Git::CommandError => ex - Rails.logger.error "Unable to create keep-around reference for repository #{disk_path}: #{ex}" - end + # This will still fail if the file is corrupted (e.g. 0 bytes) + raw_repository.write_ref(keep_around_ref_name(sha), sha) + rescue Gitlab::Git::CommandError => ex + Rails.logger.error "Unable to create keep-around reference for repository #{disk_path}: #{ex}" end end diff --git a/app/models/user_interacted_project.rb b/app/models/user_interacted_project.rb index ae6778e49be..5fc59b274f5 100644 --- a/app/models/user_interacted_project.rb +++ b/app/models/user_interacted_project.rb @@ -26,16 +26,14 @@ class UserInteractedProject < ActiveRecord::Base cached_exists?(attributes) do transaction(requires_new: true) do - begin - where(attributes).select(1).first || create!(attributes) - true # not caching the whole record here for now - rescue ActiveRecord::RecordNotUnique - # Note, above queries are not atomic and prone - # to race conditions (similar like #find_or_create!). - # In the case where we hit this, the record we want - # already exists - shortcut and return. - true - end + where(attributes).select(1).first || create!(attributes) + true # not caching the whole record here for now + rescue ActiveRecord::RecordNotUnique + # Note, above queries are not atomic and prone + # to race conditions (similar like #find_or_create!). + # In the case where we hit this, the record we want + # already exists - shortcut and return. + true end end end diff --git a/app/presenters/project_presenter.rb b/app/presenters/project_presenter.rb index 000b7c433a2..161eebcfb3f 100644 --- a/app/presenters/project_presenter.rb +++ b/app/presenters/project_presenter.rb @@ -42,11 +42,7 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated def empty_repo_statistics_anchors [ - license_anchor_data, - commits_anchor_data, - branches_anchor_data, - tags_anchor_data, - files_anchor_data + license_anchor_data ].compact.select { |item| item.is_link } end @@ -55,9 +51,7 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated new_file_anchor_data, readme_anchor_data, changelog_anchor_data, - contribution_guide_anchor_data, - autodevops_anchor_data, - kubernetes_cluster_anchor_data + contribution_guide_anchor_data ].compact.reject { |item| item.is_link } end diff --git a/app/serializers/detailed_status_entity.rb b/app/serializers/detailed_status_entity.rb index da994d78286..4f23ef0ed82 100644 --- a/app/serializers/detailed_status_entity.rb +++ b/app/serializers/detailed_status_entity.rb @@ -9,16 +9,14 @@ class DetailedStatusEntity < Grape::Entity expose :details_path expose :illustration do |status| - begin - illustration = { - image: ActionController::Base.helpers.image_path(status.illustration[:image]) - } - illustration = status.illustration.merge(illustration) + illustration = { + image: ActionController::Base.helpers.image_path(status.illustration[:image]) + } + illustration = status.illustration.merge(illustration) - illustration - rescue NotImplementedError - # ignored - end + illustration + rescue NotImplementedError + # ignored end expose :favicon do |status| diff --git a/app/services/projects/lfs_pointers/lfs_download_link_list_service.rb b/app/services/projects/lfs_pointers/lfs_download_link_list_service.rb index 7998976b00a..a9570176e81 100644 --- a/app/services/projects/lfs_pointers/lfs_download_link_list_service.rb +++ b/app/services/projects/lfs_pointers/lfs_download_link_list_service.rb @@ -42,17 +42,15 @@ module Projects def parse_response_links(objects_response) objects_response.each_with_object([]) do |entry, link_list| - begin - link = entry.dig('actions', DOWNLOAD_ACTION, 'href') + link = entry.dig('actions', DOWNLOAD_ACTION, 'href') - raise DownloadLinkNotFound unless link + raise DownloadLinkNotFound unless link - link_list << LfsDownloadObject.new(oid: entry['oid'], - size: entry['size'], - link: add_credentials(link)) - rescue DownloadLinkNotFound, Addressable::URI::InvalidURIError - log_error("Link for Lfs Object with oid #{entry['oid']} not found or invalid.") - end + link_list << LfsDownloadObject.new(oid: entry['oid'], + size: entry['size'], + link: add_credentials(link)) + rescue DownloadLinkNotFound, Addressable::URI::InvalidURIError + log_error("Link for Lfs Object with oid #{entry['oid']} not found or invalid.") end end diff --git a/app/services/projects/lfs_pointers/lfs_download_service.rb b/app/services/projects/lfs_pointers/lfs_download_service.rb index 398f00a598d..a009f479d5d 100644 --- a/app/services/projects/lfs_pointers/lfs_download_service.rb +++ b/app/services/projects/lfs_pointers/lfs_download_service.rb @@ -75,17 +75,15 @@ module Projects create_tmp_storage_dir File.open(tmp_filename, 'wb') do |file| - begin - yield file - rescue StandardError => e - # If the lfs file is successfully downloaded it will be removed - # when it is added to the project's lfs files. - # Nevertheless if any excetion raises the file would remain - # in the file system. Here we ensure to remove it - File.unlink(file) if File.exist?(file) - - raise e - end + yield file + rescue StandardError => e + # If the lfs file is successfully downloaded it will be removed + # when it is added to the project's lfs files. + # Nevertheless if any excetion raises the file would remain + # in the file system. Here we ensure to remove it + File.unlink(file) if File.exist?(file) + + raise e end end diff --git a/app/validators/sha_validator.rb b/app/validators/sha_validator.rb index 085fca4d65d..77e7cfa4f6b 100644 --- a/app/validators/sha_validator.rb +++ b/app/validators/sha_validator.rb @@ -2,7 +2,7 @@ class ShaValidator < ActiveModel::EachValidator def validate_each(record, attribute, value) - return if value.blank? || value.match(/\A\h{40}\z/) + return if value.blank? || Commit.valid_hash?(value) record.errors.add(attribute, 'is not a valid SHA') end diff --git a/app/views/layouts/header/_new_dropdown.haml b/app/views/layouts/header/_new_dropdown.haml index 5a66b02c048..438340464bd 100644 --- a/app/views/layouts/header/_new_dropdown.haml +++ b/app/views/layouts/header/_new_dropdown.haml @@ -38,4 +38,4 @@ %li= link_to _('New project'), new_project_path, class: 'qa-global-new-project-link' - if current_user.can_create_group? %li= link_to _('New group'), new_group_path - %li= link_to _('New snippet'), new_snippet_path + %li= link_to _('New snippet'), new_snippet_path, class: 'qa-global-new-snippet-link' diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml index f659c89dd30..1ec368f8910 100644 --- a/app/views/layouts/nav/_dashboard.html.haml +++ b/app/views/layouts/nav/_dashboard.html.haml @@ -29,7 +29,7 @@ - if dashboard_nav_link?(:snippets) = nav_link(controller: 'dashboard/snippets', html_options: { class: ["d-none d-xl-block", ("d-lg-block" unless has_extra_nav_icons?)] }) do - = link_to dashboard_snippets_path, class: 'dashboard-shortcuts-snippets', title: _('Snippets') do + = link_to dashboard_snippets_path, class: 'dashboard-shortcuts-snippets qa-snippets-link', title: _('Snippets') do = _('Snippets') - if any_dashboard_nav_link?([:groups, :milestones, :activity, :snippets]) diff --git a/app/views/layouts/nav/sidebar/_group.html.haml b/app/views/layouts/nav/sidebar/_group.html.haml index 21ea9f3b2f3..eefe86eb6b4 100644 --- a/app/views/layouts/nav/sidebar/_group.html.haml +++ b/app/views/layouts/nav/sidebar/_group.html.haml @@ -20,13 +20,14 @@ = _('Overview') %ul.sidebar-sub-level-items - = nav_link(path: ['groups#show', 'groups#activity', 'groups#subgroups'], html_options: { class: "fly-out-top-item" } ) do + = nav_link(path: ['groups#show', 'groups#details', 'groups#activity', 'groups#subgroups'], html_options: { class: "fly-out-top-item" } ) do = link_to group_path(@group) do %strong.fly-out-top-item-name = _('Overview') %li.divider.fly-out-top-item - = nav_link(path: ['groups#show', 'groups#subgroups'], html_options: { class: 'home' }) do - = link_to group_path(@group), title: _('Group details') do + + = nav_link(path: ['groups#show', 'groups#details', 'groups#subgroups'], html_options: { class: 'home' }) do + = link_to details_group_path(@group), title: _('Group details') do %span = _('Details') @@ -40,9 +41,9 @@ - if group_sidebar_link?(:contribution_analytics) = nav_link(path: 'analytics#show') do - = link_to group_analytics_path(@group), title: 'Contribution Analytics', data: {placement: 'right'} do + = link_to group_analytics_path(@group), title: _('Contribution Analytics'), data: { placement: 'right' } do %span - Contribution Analytics + = _('Contribution Analytics') = render_if_exists "layouts/nav/ee/epic_link", group: @group diff --git a/app/views/projects/_flash_messages.html.haml b/app/views/projects/_flash_messages.html.haml index 7a5fff96676..b72f0e39b23 100644 --- a/app/views/projects/_flash_messages.html.haml +++ b/app/views/projects/_flash_messages.html.haml @@ -5,4 +5,5 @@ - if current_user && can?(current_user, :download_code, project) = render 'shared/no_ssh' = render 'shared/no_password' - = render 'shared/auto_devops_implicitly_enabled_banner', project: project + - unless project.empty_repo? + = render 'shared/auto_devops_implicitly_enabled_banner', project: project diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml index 1d7287410ea..4ac5a74c85c 100644 --- a/app/views/projects/_home_panel.html.haml +++ b/app/views/projects/_home_panel.html.haml @@ -57,7 +57,10 @@ - if can?(current_user, :download_code, @project) %nav.project-stats .nav-links.quick-links - = render 'stat_anchor_list', anchors: @project.statistics_anchors(show_auto_devops_callout: show_auto_devops_callout) + - if @project.empty_repo? + = render 'stat_anchor_list', anchors: @project.empty_repo_statistics_anchors + - else + = render 'stat_anchor_list', anchors: @project.statistics_anchors(show_auto_devops_callout: show_auto_devops_callout) .home-panel-home-desc.mt-1 - if @project.description.present? diff --git a/app/views/projects/blob/_header_content.html.haml b/app/views/projects/blob/_header_content.html.haml index 4bef45932d0..88fa31a73b0 100644 --- a/app/views/projects/blob/_header_content.html.haml +++ b/app/views/projects/blob/_header_content.html.haml @@ -1,7 +1,7 @@ .file-header-content = blob_icon blob.mode, blob.name - %strong.file-title-name + %strong.file-title-name.qa-file-title-name = blob.name = copy_file_path_button(blob.path) diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml index 081990ac9b7..9fa31c147eb 100644 --- a/app/views/projects/empty.html.haml +++ b/app/views/projects/empty.html.haml @@ -7,89 +7,64 @@ %div{ class: [container_class, ("limit-container-width" unless fluid_layout)] } = render "home_panel" - .project-empty-note-panel - %h4.append-bottom-20 - = _('The repository for this project is empty') + %h4.prepend-top-0.append-bottom-8 + = _('The repository for this project is empty') - - if @project.can_current_user_push_code? - %p - - link_to_cli = link_to _('command line instructions'), '#repo-command-line-instructions' - = _('If you already have files you can push them using the %{link_to_cli} below.').html_safe % { link_to_cli: link_to_cli } - %p - %em - - link_to_protected_branches = link_to _('Learn more about protected branches'), help_page_path('user/project/protected_branches') - = _('Note that the master branch is automatically protected. %{link_to_protected_branches}').html_safe % { link_to_protected_branches: link_to_protected_branches } - - %hr - %p - - link_to_auto_devops_settings = link_to(s_('AutoDevOps|enable Auto DevOps'), project_settings_ci_cd_path(@project, anchor: 'autodevops-settings')) - - link_to_add_kubernetes_cluster = link_to(s_('AutoDevOps|add a Kubernetes cluster'), new_project_cluster_path(@project)) - = s_('AutoDevOps|You can automatically build and test your application if you %{link_to_auto_devops_settings} for this project. You can automatically deploy it as well, if you %{link_to_add_kubernetes_cluster}.').html_safe % { link_to_auto_devops_settings: link_to_auto_devops_settings, link_to_add_kubernetes_cluster: link_to_add_kubernetes_cluster } + - if @project.can_current_user_push_code? + %p.append-bottom-0 + = _('You can create files directly in GitLab using one of the following options.') - %hr - %p - = _('Otherwise it is recommended you start with one of the options below.') - .prepend-top-20 - - %nav.project-buttons - .scrolling-tabs-container.inner-page-scroll-tabs.is-smaller.qa-quick-actions - .fade-left= icon('angle-left') - .fade-right= icon('angle-right') - .nav-links.scrolling-tabs.quick-links - = render 'stat_anchor_list', anchors: @project.empty_repo_statistics_buttons + .project-buttons.qa-quick-actions + = render 'stat_anchor_list', anchors: @project.empty_repo_statistics_buttons - if can?(current_user, :push_code, @project) - %div - .prepend-top-20 - .empty_wrapper - %h3#repo-command-line-instructions.page-title-empty - = _('Command line instructions') - .git-empty.js-git-empty - %fieldset - %h5= _('Git global setup') - %pre.bg-light - :preserve - git config --global user.name "#{h git_user_name}" - git config --global user.email "#{h git_user_email}" - - %fieldset - %h5= _('Create a new repository') - %pre.bg-light - :preserve - git clone #{ content_tag(:span, default_url_to_repo, class: 'js-clone')} - cd #{h @project.path} - touch README.md - git add README.md - git commit -m "add README" - - if @project.can_current_user_push_to_default_branch? - %span>< - git push -u origin master + .empty-wrapper.prepend-top-32 + %h3#repo-command-line-instructions.page-title-empty + = _('Command line instructions') + %p + = _('You can also upload existing files from your computer using the instructions below.') + .git-empty.js-git-empty + %fieldset + %h5= _('Git global setup') + %pre.bg-light + :preserve + git config --global user.name "#{h git_user_name}" + git config --global user.email "#{h git_user_email}" - %fieldset - %h5= _('Existing folder') - %pre.bg-light - :preserve - cd existing_folder - git init - git remote add origin #{ content_tag(:span, default_url_to_repo, class: 'js-clone')} - git add . - git commit -m "Initial commit" - - if @project.can_current_user_push_to_default_branch? - %span>< - git push -u origin master + %fieldset + %h5= _('Create a new repository') + %pre.bg-light + :preserve + git clone #{ content_tag(:span, default_url_to_repo, class: 'js-clone')} + cd #{h @project.path} + touch README.md + git add README.md + git commit -m "add README" + - if @project.can_current_user_push_to_default_branch? + %span>< + git push -u origin master - %fieldset - %h5= _('Existing Git repository') - %pre.bg-light - :preserve - cd existing_repo - git remote rename origin old-origin - git remote add origin #{ content_tag(:span, default_url_to_repo, class: 'js-clone')} - - if @project.can_current_user_push_to_default_branch? - %span>< - git push -u origin --all - git push -u origin --tags + %fieldset + %h5= _('Push an existing folder') + %pre.bg-light + :preserve + cd existing_folder + git init + git remote add origin #{ content_tag(:span, default_url_to_repo, class: 'js-clone')} + git add . + git commit -m "Initial commit" + - if @project.can_current_user_push_to_default_branch? + %span>< + git push -u origin master - - if can? current_user, :remove_project, @project - .prepend-top-20 - = link_to _('Remove project'), [@project.namespace.becomes(Namespace), @project], data: { confirm: remove_project_message(@project)}, method: :delete, class: "btn btn-inverted btn-remove float-right" + %fieldset + %h5= _('Push an existing Git repository') + %pre.bg-light + :preserve + cd existing_repo + git remote rename origin old-origin + git remote add origin #{ content_tag(:span, default_url_to_repo, class: 'js-clone')} + - if @project.can_current_user_push_to_default_branch? + %span>< + git push -u origin --all + git push -u origin --tags diff --git a/app/views/shared/_file_highlight.html.haml b/app/views/shared/_file_highlight.html.haml index 5073e6ad48f..d7e57fc0d01 100644 --- a/app/views/shared/_file_highlight.html.haml +++ b/app/views/shared/_file_highlight.html.haml @@ -1,4 +1,4 @@ -.file-content.code.js-syntax-highlight +.file-content.code.js-syntax-highlight.qa-file-content .line-numbers - if blob.data.present? - link_icon = icon('link') diff --git a/app/views/shared/snippets/_form.html.haml b/app/views/shared/snippets/_form.html.haml index 3007da0c189..6f2ddc5bdba 100644 --- a/app/views/shared/snippets/_form.html.haml +++ b/app/views/shared/snippets/_form.html.haml @@ -9,7 +9,7 @@ .form-group.row = f.label :title, class: 'col-form-label col-sm-2' .col-sm-10 - = f.text_field :title, class: 'form-control', required: true, autofocus: true + = f.text_field :title, class: 'form-control qa-snippet-title', required: true, autofocus: true = render 'shared/form_elements/description', model: @snippet, project: @project, form: f @@ -21,7 +21,7 @@ .col-sm-10 .file-holder.snippet .js-file-title.file-title - = f.text_field :file_name, placeholder: "Optionally name this file to add code highlighting, e.g. example.rb for Ruby.", class: 'form-control snippet-file-name' + = f.text_field :file_name, placeholder: "Optionally name this file to add code highlighting, e.g. example.rb for Ruby.", class: 'form-control snippet-file-name qa-snippet-file-name' .file-content.code %pre#editor= @snippet.content = f.hidden_field :content, class: 'snippet-file-content' @@ -31,7 +31,7 @@ .form-actions - if @snippet.new_record? - = f.submit 'Create snippet', class: "btn-success btn" + = f.submit 'Create snippet', class: "btn-success btn qa-create-snippet-button" - else = f.submit 'Save changes', class: "btn-success btn" diff --git a/app/views/shared/snippets/_header.html.haml b/app/views/shared/snippets/_header.html.haml index a43296aa806..0c07eae8643 100644 --- a/app/views/shared/snippets/_header.html.haml +++ b/app/views/shared/snippets/_header.html.haml @@ -1,6 +1,6 @@ .detail-page-header .detail-page-header-body - .snippet-box.has-tooltip.inline.append-right-5{ title: snippet_visibility_level_description(@snippet.visibility_level, @snippet), data: { container: "body" } } + .snippet-box.qa-snippet-box.has-tooltip.inline.append-right-5{ title: snippet_visibility_level_description(@snippet.visibility_level, @snippet), data: { container: "body" } } %span.sr-only = visibility_level_label(@snippet.visibility_level) = visibility_level_icon(@snippet.visibility_level, fw: false) @@ -17,11 +17,11 @@ = render "snippets/actions" .snippet-header.limited-header-width - %h2.snippet-title.prepend-top-0.append-bottom-0 + %h2.snippet-title.prepend-top-0.append-bottom-0.qa-snippet-title = markdown_field(@snippet, :title) - if @snippet.description.present? - .description + .description.qa-snippet-description .wiki = markdown_field(@snippet, :description) %textarea.hidden.js-task-list-field @@ -34,7 +34,7 @@ .embed-snippet .input-group .input-group-prepend - %button.btn.btn-svg.embed-toggle.input-group-text{ 'data-toggle': 'dropdown', type: 'button' } + %button.btn.btn-svg.embed-toggle.input-group-text.qa-embed-type{ '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 diff --git a/app/workers/concerns/waitable_worker.rb b/app/workers/concerns/waitable_worker.rb index 27b94a82444..17946bbc5ca 100644 --- a/app/workers/concerns/waitable_worker.rb +++ b/app/workers/concerns/waitable_worker.rb @@ -25,11 +25,9 @@ module WaitableWorker failed = [] args_list.each do |args| - begin - new.perform(*args) - rescue - failed << args - end + new.perform(*args) + rescue + failed << args end bulk_perform_async(failed) if failed.present? diff --git a/app/workers/create_gpg_signature_worker.rb b/app/workers/create_gpg_signature_worker.rb index 49c7a403838..2827529cc1c 100644 --- a/app/workers/create_gpg_signature_worker.rb +++ b/app/workers/create_gpg_signature_worker.rb @@ -20,11 +20,9 @@ class CreateGpgSignatureWorker # This calculates and caches the signature in the database commits.each do |commit| - begin - Gitlab::Gpg::Commit.new(commit).signature - rescue => e - Rails.logger.error("Failed to create signature for commit #{commit.id}. Error: #{e.message}") - end + Gitlab::Gpg::Commit.new(commit).signature + rescue => e + Rails.logger.error("Failed to create signature for commit #{commit.id}. Error: #{e.message}") end end # rubocop: enable CodeReuse/ActiveRecord diff --git a/app/workers/emails_on_push_worker.rb b/app/workers/emails_on_push_worker.rb index 17ad1d5ab88..ed3e354e4c2 100644 --- a/app/workers/emails_on_push_worker.rb +++ b/app/workers/emails_on_push_worker.rb @@ -52,24 +52,22 @@ class EmailsOnPushWorker end valid_recipients(recipients).each do |recipient| - begin - send_email( - recipient, - project_id, - author_id: author_id, - ref: ref, - action: action, - compare: compare, - reverse_compare: reverse_compare, - diff_refs: diff_refs, - send_from_committer_email: send_from_committer_email, - disable_diffs: disable_diffs - ) - - # These are input errors and won't be corrected even if Sidekiq retries - rescue Net::SMTPFatalError, Net::SMTPSyntaxError => e - logger.info("Failed to send e-mail for project '#{project.full_name}' to #{recipient}: #{e}") - end + send_email( + recipient, + project_id, + author_id: author_id, + ref: ref, + action: action, + compare: compare, + reverse_compare: reverse_compare, + diff_refs: diff_refs, + send_from_committer_email: send_from_committer_email, + disable_diffs: disable_diffs + ) + + # These are input errors and won't be corrected even if Sidekiq retries + rescue Net::SMTPFatalError, Net::SMTPSyntaxError => e + logger.info("Failed to send e-mail for project '#{project.full_name}' to #{recipient}: #{e}") end ensure @email = nil diff --git a/app/workers/object_storage/migrate_uploads_worker.rb b/app/workers/object_storage/migrate_uploads_worker.rb index fe5d27b087d..206eb71b898 100644 --- a/app/workers/object_storage/migrate_uploads_worker.rb +++ b/app/workers/object_storage/migrate_uploads_worker.rb @@ -126,11 +126,9 @@ module ObjectStorage def process_uploader(uploader) MigrationResult.new(uploader.upload).tap do |result| - begin - uploader.migrate!(@to_store) - rescue => e - result.error = e - end + uploader.migrate!(@to_store) + rescue => e + result.error = e end end end diff --git a/app/workers/pipeline_schedule_worker.rb b/app/workers/pipeline_schedule_worker.rb index ac4e9710f33..02a69ea3b54 100644 --- a/app/workers/pipeline_schedule_worker.rb +++ b/app/workers/pipeline_schedule_worker.rb @@ -8,16 +8,15 @@ class PipelineScheduleWorker def perform Ci::PipelineSchedule.active.where("next_run_at < ?", Time.now) .preload(:owner, :project).find_each do |schedule| - begin - Ci::CreatePipelineService.new(schedule.project, - schedule.owner, - ref: schedule.ref) - .execute!(:schedule, ignore_skip_ci: true, save_on_errors: true, schedule: schedule) - rescue => e - error(schedule, e) - ensure - schedule.schedule_next_run! - end + + Ci::CreatePipelineService.new(schedule.project, + schedule.owner, + ref: schedule.ref) + .execute!(:schedule, ignore_skip_ci: true, save_on_errors: true, schedule: schedule) + rescue => e + error(schedule, e) + ensure + schedule.schedule_next_run! end end # rubocop: enable CodeReuse/ActiveRecord diff --git a/app/workers/remove_expired_members_worker.rb b/app/workers/remove_expired_members_worker.rb index 41913900571..3497a1f9280 100644 --- a/app/workers/remove_expired_members_worker.rb +++ b/app/workers/remove_expired_members_worker.rb @@ -6,11 +6,9 @@ class RemoveExpiredMembersWorker def perform Member.expired.find_each do |member| - begin - Members::DestroyService.new.execute(member, skip_authorization: true) - rescue => ex - logger.error("Expired Member ID=#{member.id} cannot be removed - #{ex}") - end + Members::DestroyService.new.execute(member, skip_authorization: true) + rescue => ex + logger.error("Expired Member ID=#{member.id} cannot be removed - #{ex}") end end end diff --git a/changelogs/unreleased/56833-project-improve-empty-repository-state-ui-fe.yml b/changelogs/unreleased/56833-project-improve-empty-repository-state-ui-fe.yml new file mode 100644 index 00000000000..19cf3d69db1 --- /dev/null +++ b/changelogs/unreleased/56833-project-improve-empty-repository-state-ui-fe.yml @@ -0,0 +1,5 @@ +--- +title: 'Project: Improve empty repository state UI' +merge_request: 26024 +author: +type: other diff --git a/changelogs/unreleased/58208-explicitly-set-masterauth.yml b/changelogs/unreleased/58208-explicitly-set-masterauth.yml new file mode 100644 index 00000000000..e3512d11113 --- /dev/null +++ b/changelogs/unreleased/58208-explicitly-set-masterauth.yml @@ -0,0 +1,6 @@ +--- +title: Explicitly set master_auth setting to enable basic auth and client certificate + for new GKE clusters +merge_request: 26018 +author: +type: other diff --git a/changelogs/unreleased/fj-58804-fix-bitbucket-import.yml b/changelogs/unreleased/fj-58804-fix-bitbucket-import.yml new file mode 100644 index 00000000000..dc44c64a055 --- /dev/null +++ b/changelogs/unreleased/fj-58804-fix-bitbucket-import.yml @@ -0,0 +1,5 @@ +--- +title: Fix bug in BitBucket imports with SHA shorter than 40 chars +merge_request: 26050 +author: +type: fixed diff --git a/config/initializers/trusted_proxies.rb b/config/initializers/trusted_proxies.rb index 7af465d8443..13896408806 100644 --- a/config/initializers/trusted_proxies.rb +++ b/config/initializers/trusted_proxies.rb @@ -14,10 +14,8 @@ module Rack end gitlab_trusted_proxies = Array(Gitlab.config.gitlab.trusted_proxies).map do |proxy| - begin - IPAddr.new(proxy) - rescue IPAddr::InvalidAddressError - end + IPAddr.new(proxy) +rescue IPAddr::InvalidAddressError end.compact Rails.application.config.action_dispatch.trusted_proxies = ( diff --git a/config/karma.config.js b/config/karma.config.js index 23eae40dceb..c30c58edc6f 100644 --- a/config/karma.config.js +++ b/config/karma.config.js @@ -6,6 +6,7 @@ const argumentsParser = require('commander'); const webpackConfig = require('./webpack.config.js'); const ROOT_PATH = path.resolve(__dirname, '..'); +const SPECS_PATH = /^(?:\.[\\\/])?(ee[\\\/])?spec[\\\/]javascripts[\\\/]/; function fatalError(message) { console.error(chalk.red(`\nError: ${message}\n`)); @@ -41,9 +42,19 @@ const specFilters = argumentsParser ) .parse(process.argv).filterSpec; -if (specFilters.length) { - const specsPath = /^(?:\.[\\\/])?spec[\\\/]javascripts[\\\/]/; +const createContext = (specFiles, regex, suffix) => { + const newContext = specFiles.reduce((context, file) => { + const relativePath = file.replace(SPECS_PATH, ''); + context[file] = `./${relativePath}`; + return context; + }, {}); + + webpackConfig.plugins.push( + new webpack.ContextReplacementPlugin(regex, path.join(ROOT_PATH, suffix), newContext), + ); +}; +if (specFilters.length) { // resolve filters let filteredSpecFiles = specFilters.map(filter => glob @@ -64,23 +75,15 @@ if (specFilters.length) { fatalError('Your filter did not match any test files.'); } - if (!filteredSpecFiles.every(file => specsPath.test(file))) { + if (!filteredSpecFiles.every(file => SPECS_PATH.test(file))) { fatalError('Test files must be located within /spec/javascripts.'); } - const newContext = filteredSpecFiles.reduce((context, file) => { - const relativePath = file.replace(specsPath, ''); - context[file] = `./${relativePath}`; - return context; - }, {}); + const CE_FILES = filteredSpecFiles.filter(file => !file.startsWith('ee')); + createContext(CE_FILES, /[^e]{2}[\\\/]spec[\\\/]javascripts$/, 'spec/javascripts'); - webpackConfig.plugins.push( - new webpack.ContextReplacementPlugin( - /spec[\\\/]javascripts$/, - path.join(ROOT_PATH, 'spec/javascripts'), - newContext, - ), - ); + const EE_FILES = filteredSpecFiles.filter(file => file.startsWith('ee')); + createContext(EE_FILES, /ee[\\\/]spec[\\\/]javascripts$/, 'ee/spec/javascripts'); } // Karma configuration @@ -111,10 +114,20 @@ module.exports = function(config) { ], preprocessors: { 'spec/javascripts/**/*.js': ['webpack', 'sourcemap'], + 'ee/spec/javascripts/**/*.js': ['webpack', 'sourcemap'], }, reporters: ['mocha'], webpack: webpackConfig, webpackMiddleware: { stats: 'errors-only' }, + plugins: [ + 'karma-chrome-launcher', + 'karma-coverage-istanbul-reporter', + 'karma-jasmine', + 'karma-junit-reporter', + 'karma-mocha-reporter', + 'karma-sourcemap-loader', + 'karma-webpack', + ], }; if (process.env.CI) { @@ -123,6 +136,19 @@ module.exports = function(config) { outputFile: 'junit_karma.xml', useBrowserName: false, }; + } else { + // ignore 404s in local environment because we are not fixing them and they bloat the log + function ignore404() { + return (request, response /* next */) => { + response.writeHead(404); + return response.end('NOT FOUND'); + }; + } + + karmaConfig.middleware = ['ignore-404']; + karmaConfig.plugins.push({ + 'middleware:ignore-404': ['factory', ignore404], + }); } if (process.env.BABEL_ENV === 'coverage' || process.env.NODE_ENV === 'coverage') { diff --git a/config/routes/group.rb b/config/routes/group.rb index f42c1ee6e7d..b300fcb757f 100644 --- a/config/routes/group.rb +++ b/config/routes/group.rb @@ -14,6 +14,7 @@ constraints(::Constraints::GroupUrlConstrainer.new) do get :issues, as: :issues_group get :merge_requests, as: :merge_requests_group get :projects, as: :projects_group + get :details, as: :details_group get :activity, as: :activity_group put :transfer, as: :transfer_group # TODO: Remove as part of refactor in https://gitlab.com/gitlab-org/gitlab-ce/issues/49693 diff --git a/config/webpack.config.js b/config/webpack.config.js index 55122e341c3..20b3f4c0264 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -324,6 +324,10 @@ module.exports = { reportFilename: path.join(ROOT_PATH, 'webpack-report/index.html'), statsFilename: path.join(ROOT_PATH, 'webpack-report/stats.json'), }), + + new webpack.DefinePlugin({ + 'process.env.EE': JSON.stringify(IS_EE), + }), ].filter(Boolean), devServer: { diff --git a/db/migrate/20170530130129_project_foreign_keys_with_cascading_deletes.rb b/db/migrate/20170530130129_project_foreign_keys_with_cascading_deletes.rb index d40c61f24b1..b4658bc4017 100644 --- a/db/migrate/20170530130129_project_foreign_keys_with_cascading_deletes.rb +++ b/db/migrate/20170530130129_project_foreign_keys_with_cascading_deletes.rb @@ -126,11 +126,10 @@ class ProjectForeignKeysWithCascadingDeletes < ActiveRecord::Migration[4.2] queues.each do |queue| # Stealing is racy so it's possible a pop might be called on an # already-empty queue. - begin - remove_orphans(*queue.pop(true)) - stolen = true - rescue ThreadError - end + + remove_orphans(*queue.pop(true)) + stolen = true + rescue ThreadError end break unless stolen diff --git a/doc/ci/examples/laravel_with_gitlab_and_envoy/index.md b/doc/ci/examples/laravel_with_gitlab_and_envoy/index.md index 183ed20071f..0f809ed05ca 100644 --- a/doc/ci/examples/laravel_with_gitlab_and_envoy/index.md +++ b/doc/ci/examples/laravel_with_gitlab_and_envoy/index.md @@ -269,7 +269,7 @@ The `releases` directory will hold all our deployments: echo 'Cloning repository' [ -d {{ $releases_dir }} ] || mkdir {{ $releases_dir }} git clone --depth 1 {{ $repository }} {{ $new_release_dir }} - cd {{ $releases_dir }} + cd {{ $new_release_dir }} git reset --hard {{ $commit }} @endtask @@ -347,7 +347,7 @@ At the end, our `Envoy.blade.php` file will look like this: echo 'Cloning repository' [ -d {{ $releases_dir }} ] || mkdir {{ $releases_dir }} git clone --depth 1 {{ $repository }} {{ $new_release_dir }} - cd {{ $releases_dir }} + cd {{ $new_release_dir }} git reset --hard {{ $commit }} @endtask diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index a44f4b62a0e..5ed7ad42a8d 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -2561,4 +2561,4 @@ git push -o ci.skip [environment]: ../environments.md "CI/CD environments" [schedules]: ../../user/project/pipelines/schedules.md "Pipelines schedules" [variables]: ../variables/README.md "CI/CD variables" -[push-option]: https://git-scm.com/docs/git-push#git-push--oltoptiongt +[push-option]: https://git-scm.com/docs/git-push#Documentation/git-push.txt--oltoptiongt diff --git a/doc/development/contributing/index.md b/doc/development/contributing/index.md index f7a0fdbeb40..bfe1ef75914 100644 --- a/doc/development/contributing/index.md +++ b/doc/development/contributing/index.md @@ -119,6 +119,7 @@ This [documentation](merge_request_workflow.md) outlines the current merge reque - [Merge request guidelines](merge_request_workflow.md#merge-request-guidelines) - [Contribution acceptance criteria](merge_request_workflow.md#contribution-acceptance-criteria) - [Definition of done](merge_request_workflow.md#definition-of-done) +- [Dependencies](merge_request_workflow.md#dependencies) ## Style guides diff --git a/doc/development/contributing/merge_request_workflow.md b/doc/development/contributing/merge_request_workflow.md index 8b14c3b20ea..5e310092a6e 100644 --- a/doc/development/contributing/merge_request_workflow.md +++ b/doc/development/contributing/merge_request_workflow.md @@ -1,91 +1,95 @@ # Merge requests -We welcome merge requests with fixes and improvements to GitLab code, tests, -and/or documentation. The issues that are specifically suitable for -community contributions are listed with -[the `Accepting merge requests` label](issue_workflow.md#label-for-community-contributors), -but you are free to contribute to any other issue you want. - -Please note that if an issue is marked for the current milestone either before -or while you are working on it, a team member may take over the merge request +We welcome merge requests from everyone, with fixes and improvements +to GitLab code, tests, and documentation. The issues that are specifically suitable +for community contributions are listed with the [`Accepting merge requests`](issue_workflow.md#label-for-community-contributors) +label, but you are free to contribute to any issue you want. + +Please note that if an issue is marked for the current milestone at any time, even +when you are working on it, a GitLab Inc. team member may take over the merge request in order to ensure the work is finished before the release date. -If you want to add a new feature that is not labeled it is best to first create -a feedback issue (if there isn't one already) and leave a comment asking for it +If you want to add a new feature that is not labeled, it is best to first create +an issue (if there isn't one already) and leave a comment asking for it to be marked as `Accepting Merge Requests`. Please include screenshots or -wireframes if the feature will also change the UI. +wireframes of the proposed feature if it will also change the UI. -Merge requests should be opened at [GitLab.com][gitlab-mr-tracker]. +Merge requests should be submitted to the appropriate project at GitLab.com, for example +[GitLab CE](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests), +[GitLab EE](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests), +[GitLab Runner](https://gitlab.com/gitlab-org/gitlab-runner/merge_requests), +[GitLab Omnibus](https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests), etc. If you are new to GitLab development (or web development in general), see the -[I want to contribute!](index.md#i-want-to-contribute) section to get you started with +[I want to contribute!](index.md#i-want-to-contribute) section to get started with some potentially easy issues. -To start with GitLab development download the [GitLab Development Kit][gdk] and -see the [Development section](../../README.md) for some guidelines. - -[gitlab-mr-tracker]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests -[gdk]: https://gitlab.com/gitlab-org/gitlab-development-kit +To start developing GitLab, download the [GitLab Development Kit](https://gitlab.com/gitlab-org/gitlab-development-kit) +and see the [Development section](../../README.md) for the required guidelines. ## Merge request guidelines -If you can, please submit a merge request with the fix or improvements -including tests. If you don't know how to fix the issue but can write a test -that exposes the issue we will accept that as well. In general bug fixes that -include a regression test are merged quickly while new features without proper -tests are least likely to receive timely feedback. The workflow to make a merge +If you find an issue, please submit a merge request with a fix or improvement, if +you can, and include tests. If you don't know how to fix the issue but can write a test +that exposes the issue, we will accept that as well. In general, bug fixes that +include a regression test are merged quickly, while new features without proper +tests might be slower to receive feedback. The workflow to make a merge request is as follows: -1. Fork the project into your personal space on GitLab.com -1. Create a feature branch, branch away from `master` -1. Write [tests](https://docs.gitlab.com/ee/development/rake_tasks.html#run-tests) and code -1. [Generate a changelog entry with `bin/changelog`][changelog] +1. [Fork](../../workflow/forking_workflow.md#creating-a-fork) the project into + your personal namespace (or group) on GitLab.com. +1. Create a feature branch in your fork (don't work off `master`). +1. Write [tests](../rake_tasks.md#run-tests) and code. +1. [Generate a changelog entry with `bin/changelog`](../changelog.md) 1. If you are writing documentation, make sure to follow the - [documentation guidelines][doc-guidelines] -1. If you have multiple commits please combine them into a few logically - organized commits by [squashing them][git-squash] -1. Push the commit(s) to your fork -1. Submit a merge request (MR) to the `master` branch - 1. Your merge request needs at least 1 approval but feel free to require more. - For instance if you're touching backend and frontend code, it's a good idea + [documentation guidelines](../documentation/index.md). +1. Follow the [commit messages guidelines](#commit-messages-guidelines). +1. If you have multiple commits, combine them into a few logically organized + commits by [squashing them](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History#_squashing), + but do not change the commit history if you're working on shared branches though. +1. Push the commit(s) to your working branch in your fork. +1. Submit a merge request (MR) to the `master` branch in the main GitLab project. + 1. Your merge request needs at least 1 approval, but feel free to require more. + For instance if you're touching both backend and frontend code, it's a good idea to require 2 approvals: 1 from a backend maintainer and 1 from a frontend - maintainer - 1. You don't have to select any approvers, but you can if you really want - specific people to approve your merge request -1. The MR title should describe the change you want to make -1. The MR description should give a motive for your change and the method you - used to achieve it. - 1. If you are contributing code, fill in the template already provided in the - "Description" field. + maintainer. + 1. If you're submitting changes to documentation, you'll need approval from a technical + writer, based on the appropriate [product category](https://about.gitlab.com/handbook/product/categories/). + Only assign the MR to them when it's ready for docs review. + 1. You don't have to select any specific approvers, but you can if you really want + specific people to approve your merge request. +1. The MR title should describe the change you want to make. +1. The MR description should give a reason for your change. + 1. If you are contributing code, fill in the description according to the default + template already provided in the "Description" field. 1. If you are contributing documentation, choose `Documentation` from the - "Choose a template" menu and fill in the template. + "Choose a template" menu and fill in the description according to the template. 1. Mention the issue(s) your merge request solves, using the `Solves #XXX` or - `Closes #XXX` syntax to auto-close the issue(s) once the merge request will - be merged. -1. If you're allowed to, set a relevant milestone and labels -1. If the MR changes the UI it should include *Before* and *After* screenshots -1. If the MR changes CSS classes please include the list of affected pages, - `grep css-class ./app -R` -1. Be prepared to answer questions and incorporate feedback even if requests - for this arrive weeks or months after your MR submission - 1. If a discussion has been addressed, select the "Resolve discussion" button - beneath it to mark it resolved. -1. If your MR touches code that executes shell commands, reads or opens files or + `Closes #XXX` syntax to [auto-close](../../user/project/issues/automatic_issue_closing.md) + the issue(s) once the merge request is merged. +1. If you're allowed to (Core team members, for example), set a relevant milestone + and [labels](issue_workflow.md). +1. If the MR changes the UI, it should include *Before* and *After* screenshots. +1. If the MR changes CSS classes, please include the list of affected pages, which + can be found by running `grep css-class ./app -R`. +1. Be prepared to answer questions and incorporate feedback into your MR with new + commits. Once you have fully addressed a suggestion from a reviewer, click the + "Resolve discussion" button beneath it to mark it resolved. + 1. The merge request author resolves only the discussions they have fully addressed. + If there's an open reply or discussion, a suggestion, a question, or anything else, + the discussion should be left to be resolved by the reviewer. +1. If your MR touches code that executes shell commands, reads or opens files, or handles paths to files on disk, make sure it adheres to the [shell command guidelines](../shell_commands.md) 1. If your code creates new files on disk please read the [shared files guidelines](../shared_files.md). -1. When writing commit messages please follow - [these](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) - [guidelines](http://chris.beams.io/posts/git-commit/). 1. If your merge request adds one or more migrations, make sure to execute all migrations on a fresh database before the MR is reviewed. If the review leads - to large changes in the MR, do this again once the review is complete. -1. For more complex migrations, write tests. -1. Merge requests **must** adhere to the [merge request performance - guidelines](../merge_request_performance_guidelines.md). -1. For tests that use Capybara or PhantomJS, see this [article on how - to write reliable asynchronous tests](https://robots.thoughtbot.com/write-reliable-asynchronous-integration-tests-with-capybara). + to large changes in the MR, execute the migrations again once the review is complete. +1. Write tests for more complex migrations. +1. Merge requests **must** adhere to the [merge request performance guidelines](../merge_request_performance_guidelines.md). +1. For tests that use Capybara, read + [how to write reliable, asynchronous integration tests](https://robots.thoughtbot.com/write-reliable-asynchronous-integration-tests-with-capybara). 1. If your merge request introduces changes that require additional steps when installing GitLab from source, add them to `doc/install/installation.md` in the same merge request. @@ -95,109 +99,117 @@ request is as follows: instructions are specific to a version, add them to the "Version specific upgrading instructions" section. -Please keep the change in a single MR **as small as possible**. If you want to -contribute a large feature think very hard what the minimum viable change is. -Can you split the functionality? Can you only submit the backend/API code? Can -you start with a very simple UI? Can you do part of the refactor? The increased -reviewability of small MRs that leads to higher code quality is more important -to us than having a minimal commit log. The smaller an MR is the more likely it -is it will be merged (quickly). After that you can send more MRs to enhance it. -The ['How to get faster PR reviews' document of Kubernetes](https://github.com/kubernetes/community/blob/master/contributors/devel/faster_reviews.md) also has some great points regarding this. - -For examples of feedback on merge requests please look at already -[closed merge requests][closed-merge-requests]. If you would like quick feedback -on your merge request feel free to mention someone from the [core team] or one -of the [Merge request coaches][team]. -Please ensure that your merge request meets the contribution acceptance criteria. - -When having your code reviewed and when reviewing merge requests please take the -[code review guidelines](../code_review.md) into account. - -[git-squash]: https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits -[closed-merge-requests]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests?assignee_id=&label_name=&milestone_id=&scope=&sort=&state=closed -[team]: https://about.gitlab.com/team/ +If you would like quick feedback on your merge request feel free to mention someone +from the [core team](https://about.gitlab.com/community/core-team/) or one of the +[merge request coaches](https://about.gitlab.com/team/). When having your code reviewed +and when reviewing merge requests, please keep the [code review guidelines](../code_review.md) +in mind. + +### Keep it simple + +*Live by smaller iterations.* Please keep the amount of changes in a single MR **as small as possible**. +If you want to contribute a large feature, think very carefully about what the +[minimum viable change](https://about.gitlab.com/handbook/product/#the-minimally-viable-change) +is. Can you split the functionality into two smaller MRs? Can you submit only the +backend/API code? Can you start with a very simple UI? Can you do just a part of the +refactor? + +Small MRs which are more easily reviewed, lead to higher code quality which is +more important to GitLab than having a minimal commit log. The smaller an MR is, +the more likely it will be merged quickly. After that you can send more MRs to +enhance and expand the feature. The [How to get faster PR reviews](https://github.com/kubernetes/kubernetes/blob/release-1.5/docs/devel/faster_reviews.md) +document from the Kubernetes team also has some great points regarding this. + +### Commit messages guidelines + +When writing commit messages, please follow the guidelines below: + +- The commit subject must contain at least 3 words. +- The commit subject should ideally contain up to 50 characters, +and must not be longer than 72 characters. +- The commit subject must start with a capital letter. +- The commit subject must not end with a period. +- The commit subject and body must be separated by a blank line. +- The commit body must not contain more than 72 characters per line. +- Commits that change 30 or more lines across at least 3 files must +describe these changes in the commit body. +- The commit subject or body must not contain Emojis. +- Use issues and merge requests' full URLs instead of short references, +as they are displayed as plain text outside of GitLab. +- The merge request must not contain more than 10 commit messages. + +If the guidelines are not met, the MR will not pass the +[Danger checks](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/danger/commit_messages/Dangerfile). +For more information see [How to Write a Git Commit Message](https://chris.beams.io/posts/git-commit/). ## Contribution acceptance criteria -1. The change is as small as possible +To make sure that your merge request can be approved, please ensure that it meets +the contribution acceptance criteria below: + +1. The change is as small as possible. 1. Include proper tests and make all tests pass (unless it contains a test exposing a bug in existing code). Every new class should have corresponding unit tests, even if the class is exercised at a higher level, such as a feature test. -1. If you suspect a failing CI build is unrelated to your contribution, you may - try and restart the failing CI job or ask a developer to fix the - aforementioned failing test -1. Your MR initially contains a single commit (please use `git rebase -i` to - squash commits) -1. Your changes can merge without problems (if not please rebase if you're the - only one working on your feature branch, otherwise, merge `master`) -1. Does not break any existing functionality -1. Fixes one specific issue or implements one specific feature (do not combine - things, send separate merge requests if needed) -1. Migrations should do only one thing (e.g., either create a table, move data - to a new table or remove an old table) to aid retrying on failure -1. Keeps the GitLab code base clean and well structured -1. Contains functionality we think other users will benefit from too -1. Doesn't add configuration options or settings options since they complicate - making and testing future changes -1. Changes do not adversely degrade performance. - - Avoid repeated polling of endpoints that require a significant amount of overhead - - Check for N+1 queries via the SQL log or [`QueryRecorder`](https://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - - Avoid repeated access of filesystem -1. If you need polling to support real-time features, please use - [polling with ETag caching][polling-etag]. -1. Changes after submitting the merge request should be in separate commits - (no squashing). -1. It conforms to the [style guides](style_guides.md) and the following: - - If your change touches a line that does not follow the style, modify the - entire line to follow it. This prevents linting tools from generating warnings. - - Don't touch neighbouring lines. As an exception, automatic mass - refactoring modifications may leave style non-compliant. -1. If the merge request adds any new libraries (gems, JavaScript libraries, - etc.), they should conform to our [Licensing guidelines][license-finder-doc]. - See the instructions in that document for help if your MR fails the - "license-finder" test with a "Dependencies that need approval" error. -1. The merge request meets the [definition of done](#definition-of-done). - -[license-finder-doc]: ../licensing.md -[polling-etag]: ../polling.md + - If a failing CI build seems to be unrelated to your contribution, you can try + restarting the failing CI job, rebasing from master to bring in updates that + may resolve the failure, or if it has not been fixed yet, ask a developer to + help you fix the test. +1. The MR initially contains a a few logically organized commits. +1. The changes can merge without problems. If not, you should rebase if you're the + only one working on your feature branch, otherwise merge `master`. +1. Only one specific issue is fixed or one specific feature is implemented. Do not + combine things; send separate merge requests for each issue or feature. +1. Migrations should do only one thing (e.g., create a table, move data to a new + table, or remove an old table) to aid retrying on failure. +1. Contains functionality that other users will benefit from. +1. Doesn't add configuration options or settings options since they complicate making + and testing future changes. +1. Changes do not degrade performance: + - Avoid repeated polling of endpoints that require a significant amount of overhead. + - Check for N+1 queries via the SQL log or [`QueryRecorder`](../merge_request_performance_guidelines.md). + - Avoid repeated access of the filesystem. + - Use [polling with ETag caching](../polling.md) if needed to support real-time features. +1. If the merge request adds any new libraries (gems, JavaScript libraries, etc.), + they should conform to our [Licensing guidelines](../licensing.md). See those + instructions for help if the "license-finder" test fails with a + `Dependencies that need approval` error. Also, make the reviewer aware of the new + library and explain why you need it. +1. The merge request meets GitLab's [definition of done](#definition-of-done), below. ## Definition of done If you contribute to GitLab please know that changes involve more than just -code. We have the following [definition of done][definition-of-done]. Please ensure you support -the feature you contribute through all of these steps. - -1. Description explaining the relevancy (see following item) -1. Working and clean code that is commented where needed -1. [Unit, integration, and system tests][testing] that pass on the CI server -1. Performance/scalability implications have been considered, addressed, and tested -1. [Documented][doc-guidelines] in the `/doc` directory -1. [Changelog entry added][changelog], if necessary -1. Reviewed by UX/FE/BE and any concerns are addressed -1. Merged by a project maintainer -1. Added to the release blog article, if relevant -1. Added to [the website](https://gitlab.com/gitlab-com/www-gitlab-com/), if relevant -1. Community questions answered -1. Answers to questions radiated (in docs/wiki/support etc.) -1. [Black-box tests/end-to-end tests](../testing_guide/testing_levels.md#black-box-tests-at-the-system-level-aka-end-to-end-tests) added if required. Please contact [the quality team](https://about.gitlab.com/handbook/engineering/quality/#teams) with any questions +code. We use the following [definition of done](https://www.agilealliance.org/glossary/definition-of-done). +Your contribution is not *done* until you have made sure it meets all of these +requirements. + +1. Clear description explaining the relevancy of the contribution. +1. Working and clean code that is commented where needed. +1. [Unit, integration, and system tests](../testing_guide/index.md) that all pass + on the CI server. +1. Performance/scalability implications have been considered, addressed, and tested. +1. [Documented](../documentation/index.md) in the `/doc` directory. +1. [Changelog entry added](../changelog.md), if necessary. +1. Reviewed by relevant (UX/FE/BE/tech writing) reviewers and all concerns are addressed. +1. Merged by a project maintainer. +1. Added to the [release post](https://about.gitlab.com/handbook/marketing/blog/release-posts/), + if relevant. +1. Added to [the website](https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/data/features.yml), if relevant. +1. [Black-box tests/end-to-end tests](../testing_guide/testing_levels.md#black-box-tests-at-the-system-level-aka-end-to-end-tests) + added if required. Please contact [the quality team](https://about.gitlab.com/handbook/engineering/quality/#teams) + with any questions. + +## Dependencies If you add a dependency in GitLab (such as an operating system package) please -consider updating the following and note the applicability of each in your -merge request: - -1. Note the addition in the release blog post (create one if it doesn't exist yet) <https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/> -1. Upgrade guide, for example <https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/update/7.5-to-7.6.md> -1. Installation guide <https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/installation.md#1-packages-dependencies> -1. GitLab Development Kit <https://gitlab.com/gitlab-org/gitlab-development-kit> -1. Test suite <https://gitlab.com/gitlab-org/gitlab-ce/blob/master/scripts/prepare_build.sh> -1. Omnibus package creator <https://gitlab.com/gitlab-org/omnibus-gitlab> - -[definition-of-done]: http://guide.agilealliance.org/guide/definition-of-done.html -[testing]: ../testing_guide/index.md - ---- - -[Return to Contributing documentation](index.md) - -[changelog]: ../changelog.md "Generate a changelog entry" -[doc-guidelines]: ../documentation/index.md "Documentation guidelines" +consider updating the following, and note the applicability of each in your merge +request: + +1. Note the addition in the [release blog post](https://about.gitlab.com/handbook/marketing/blog/release-posts/) + (create one if it doesn't exist yet). +1. [The upgrade guide](../../update/upgrading_from_source.md). +1. The [GitLab Installation Guide](../../install/installation.md#1-packages-and-dependencies). +1. The [GitLab Development Kit](https://gitlab.com/gitlab-org/gitlab-development-kit). +1. The [CI environment preparation](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/scripts/prepare_build.sh). +1. The [Omnibus package creator](https://gitlab.com/gitlab-org/omnibus-gitlab). diff --git a/doc/development/documentation/styleguide.md b/doc/development/documentation/styleguide.md index 0c51d3832aa..c0386290785 100644 --- a/doc/development/documentation/styleguide.md +++ b/doc/development/documentation/styleguide.md @@ -80,11 +80,10 @@ yield a useful result, and ensuring content is helpful and easy to consume. ## Text -- Split up long lines (wrap text), this makes it much easier to review and edit. Only - double line breaks are shown as a full line break by creating new paragraphs. - 80-100 characters is the recommended line length. +- Splitting long lines (preferably up to 100 characters) can make it easier to provide feedback on small chunks of text. +- Insert an empty line for new paragraphs. - Use sentence case for titles, headings, labels, menu items, and buttons. -- Jump a line between different markups (e.g., after every paragraph, header, list, etc). Example: +- Insert an empty line between different markups (e.g., after every paragraph, header, list, etc). Example: ```md ## Header diff --git a/doc/development/testing_guide/frontend_testing.md b/doc/development/testing_guide/frontend_testing.md index 9bfb1e69f9e..d4a2ac246c4 100644 --- a/doc/development/testing_guide/frontend_testing.md +++ b/doc/development/testing_guide/frontend_testing.md @@ -15,7 +15,7 @@ information on general testing practices at GitLab. ## Jest -GitLab has started to migrate tests to the (Jest)[https://jestjs.io] +GitLab has started to migrate tests to the [Jest](https://jestjs.io) testing framework. You can read a [detailed evaluation](https://gitlab.com/gitlab-org/gitlab-ce/issues/49171) of Jest compared to our use of Karma and Jasmine. In summary, it will allow us to improve the performance and consistency of our frontend tests. diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md index 758b8b3f4ee..c73e810545e 100644 --- a/doc/topics/autodevops/index.md +++ b/doc/topics/autodevops/index.md @@ -704,6 +704,7 @@ also be customized, and you can easily use a [custom buildpack](#custom-buildpac | `INCREMENTAL_ROLLOUT_MODE`| From GitLab 11.4, this variable, if present, can be used to enable an [incremental rollout](#incremental-rollout-to-production-premium) of your application for the production environment.<br/>Set to: <ul><li>`manual`, for manual deployment jobs.</li><li>`timed`, for automatic rollout deployments with a 5 minute delay each one.</li></ul> | | `TEST_DISABLED` | From GitLab 11.0, this variable can be used to disable the `test` job. If the variable is present, the job will not be created. | | `CODE_QUALITY_DISABLED` | From GitLab 11.0, this variable can be used to disable the `codequality` job. If the variable is present, the job will not be created. | +| `LICENSE_MANAGEMENT_DISABLED` | From GitLab 11.0, this variable can be used to disable the `license_management` job. If the variable is present, the job will not be created. | | `SAST_DISABLED` | From GitLab 11.0, this variable can be used to disable the `sast` job. If the variable is present, the job will not be created. | | `DEPENDENCY_SCANNING_DISABLED` | From GitLab 11.0, this variable can be used to disable the `dependency_scanning` job. If the variable is present, the job will not be created. | | `CONTAINER_SCANNING_DISABLED` | From GitLab 11.0, this variable can be used to disable the `sast:container` job. If the variable is present, the job will not be created. | diff --git a/doc/user/project/badges.md b/doc/user/project/badges.md index 19eb95099ce..025f3af0af5 100644 --- a/doc/user/project/badges.md +++ b/doc/user/project/badges.md @@ -63,6 +63,12 @@ are available: - `%{commit_sha}`: ID of the most recent commit to the default branch of a project's repository +NOTE: **NOTE** +Placeholders allow badges to expose otherwise-private information, such as the +default branch or commit SHA when the project is configured to have a private +repository. This is by design, as badges are intended to be used publicly. Avoid +using these placeholders if the information is sensitive. + ## API You can also configure badges via the GitLab API. As in the settings, there is diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md index e84c3ca4bef..d1206b0c80a 100644 --- a/doc/user/project/clusters/index.md +++ b/doc/user/project/clusters/index.md @@ -75,6 +75,14 @@ new Kubernetes cluster to your project: After a couple of minutes, your cluster will be ready to go. You can now proceed to install some [pre-defined applications](#installing-applications). +NOTE: **Note:** +GitLab requires basic authentication enabled and a client certificate issued for +the cluster in order to setup an [initial service +account](#access-controls). Starting from [GitLab +11.10](https://gitlab.com/gitlab-org/gitlab-ce/issues/58208), the cluster +creation process will explicitly request that basic authentication and +client certificate is enabled. + ## Adding an existing Kubernetes cluster To add an existing Kubernetes cluster to your project: diff --git a/doc/user/project/protected_branches.md b/doc/user/project/protected_branches.md index 3eb8123144f..480cc921d76 100644 --- a/doc/user/project/protected_branches.md +++ b/doc/user/project/protected_branches.md @@ -96,7 +96,7 @@ all matching branches: ## Creating a protected branch -> [Introduced][https://gitlab.com/gitlab-org/gitlab-ce/issues/53361] in GitLab 11.9. +> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/53361) in GitLab 11.9. When a protected branch or wildcard protected branches are set to [**No one** is **Allowed to push**](#using-the-allowed-to-merge-and-allowed-to-push-settings), diff --git a/lib/api/project_milestones.rb b/lib/api/project_milestones.rb index ca24742b7a3..9ecbf37b49a 100644 --- a/lib/api/project_milestones.rb +++ b/lib/api/project_milestones.rb @@ -103,17 +103,15 @@ module API detail 'This feature was introduced in GitLab 11.9' end post ':id/milestones/:milestone_id/promote' do - begin - authorize! :admin_milestone, user_project - authorize! :admin_milestone, user_project.group + authorize! :admin_milestone, user_project + authorize! :admin_milestone, user_project.group - milestone = user_project.milestones.find(params[:milestone_id]) - Milestones::PromoteService.new(user_project, current_user).execute(milestone) + milestone = user_project.milestones.find(params[:milestone_id]) + Milestones::PromoteService.new(user_project, current_user).execute(milestone) - status(200) - rescue Milestones::PromoteService::PromoteMilestoneError => error - render_api_error!(error.message, 400) - end + status(200) + rescue Milestones::PromoteService::PromoteMilestoneError => error + render_api_error!(error.message, 400) end end end diff --git a/lib/api/repositories.rb b/lib/api/repositories.rb index 32e05d84491..4106a2cdf38 100644 --- a/lib/api/repositories.rb +++ b/lib/api/repositories.rb @@ -89,11 +89,9 @@ module API optional :format, type: String, desc: 'The archive format' end get ':id/repository/archive', requirements: { format: Gitlab::PathRegex.archive_formats_regex } do - begin - send_git_archive user_project.repository, ref: params[:sha], format: params[:format], append_sha: true - rescue - not_found!('File') - end + send_git_archive user_project.repository, ref: params[:sha], format: params[:format], append_sha: true + rescue + not_found!('File') end desc 'Compare two branches, tags, or commits' do @@ -118,12 +116,10 @@ module API optional :sort, type: String, values: %w[asc desc], default: 'asc', desc: 'Sort by asc (ascending) or desc (descending)' end get ':id/repository/contributors' do - begin - contributors = ::Kaminari.paginate_array(user_project.repository.contributors(order_by: params[:order_by], sort: params[:sort])) - present paginate(contributors), with: Entities::Contributor - rescue - not_found! - end + contributors = ::Kaminari.paginate_array(user_project.repository.contributors(order_by: params[:order_by], sort: params[:sort])) + present paginate(contributors), with: Entities::Contributor + rescue + not_found! end desc 'Get the common ancestor between commits' do diff --git a/lib/gitlab/background_migration/archive_legacy_traces.rb b/lib/gitlab/background_migration/archive_legacy_traces.rb index 92096e29ef1..7ee783b8489 100644 --- a/lib/gitlab/background_migration/archive_legacy_traces.rb +++ b/lib/gitlab/background_migration/archive_legacy_traces.rb @@ -11,11 +11,10 @@ module Gitlab # So we chose a way to use ::Ci::Build directly and we don't change the `archive!` method until 11.1 ::Ci::Build.finished.without_archived_trace .where(id: start_id..stop_id).find_each do |build| - begin - build.trace.archive! - rescue => e - Rails.logger.error "Failed to archive live trace. id: #{build.id} message: #{e.message}" - end + + build.trace.archive! + rescue => e + Rails.logger.error "Failed to archive live trace. id: #{build.id} message: #{e.message}" end end end diff --git a/lib/gitlab/background_migration/normalize_ldap_extern_uids_range.rb b/lib/gitlab/background_migration/normalize_ldap_extern_uids_range.rb index 698f5e46c0c..48aa369705f 100644 --- a/lib/gitlab/background_migration/normalize_ldap_extern_uids_range.rb +++ b/lib/gitlab/background_migration/normalize_ldap_extern_uids_range.rb @@ -302,14 +302,12 @@ module Gitlab ldap_identities = Identity.where("provider like 'ldap%'").where(id: start_id..end_id) ldap_identities.each do |identity| - begin - identity.extern_uid = Gitlab::Auth::LDAP::DN.new(identity.extern_uid).to_normalized_s - unless identity.save - Rails.logger.info "Unable to normalize \"#{identity.extern_uid}\". Skipping." - end - rescue Gitlab::Auth::LDAP::DN::FormatError => e - Rails.logger.info "Unable to normalize \"#{identity.extern_uid}\" due to \"#{e.message}\". Skipping." + identity.extern_uid = Gitlab::Auth::LDAP::DN.new(identity.extern_uid).to_normalized_s + unless identity.save + Rails.logger.info "Unable to normalize \"#{identity.extern_uid}\". Skipping." end + rescue Gitlab::Auth::LDAP::DN::FormatError => e + Rails.logger.info "Unable to normalize \"#{identity.extern_uid}\" due to \"#{e.message}\". Skipping." end end diff --git a/lib/gitlab/background_migration/populate_untracked_uploads.rb b/lib/gitlab/background_migration/populate_untracked_uploads.rb index a19dc9747fb..755b5ee725a 100644 --- a/lib/gitlab/background_migration/populate_untracked_uploads.rb +++ b/lib/gitlab/background_migration/populate_untracked_uploads.rb @@ -34,18 +34,16 @@ module Gitlab def filter_error_files(files) files.partition do |file| - begin - file.to_h - true - rescue => e - msg = <<~MSG + file.to_h + true + rescue => e + msg = <<~MSG Error parsing path "#{file.path}": #{e.message} #{e.backtrace.join("\n ")} MSG - Rails.logger.error(msg) - false - end + Rails.logger.error(msg) + false end end diff --git a/lib/gitlab/bitbucket_import/importer.rb b/lib/gitlab/bitbucket_import/importer.rb index 441fdec8a1e..769d3279f91 100644 --- a/lib/gitlab/bitbucket_import/importer.rb +++ b/lib/gitlab/bitbucket_import/importer.rb @@ -79,31 +79,29 @@ module Gitlab create_labels client.issues(repo).each do |issue| - begin - description = '' - description += @formatter.author_line(issue.author) unless find_user_id(issue.author) - description += issue.description - - label_name = issue.kind - milestone = issue.milestone ? project.milestones.find_or_create_by(title: issue.milestone) : nil - - gitlab_issue = project.issues.create!( - iid: issue.iid, - title: issue.title, - description: description, - state: issue.state, - author_id: gitlab_user_id(project, issue.author), - milestone: milestone, - created_at: issue.created_at, - updated_at: issue.updated_at - ) - - gitlab_issue.labels << @labels[label_name] - - import_issue_comments(issue, gitlab_issue) if gitlab_issue.persisted? - rescue StandardError => e - errors << { type: :issue, iid: issue.iid, errors: e.message } - end + description = '' + description += @formatter.author_line(issue.author) unless find_user_id(issue.author) + description += issue.description + + label_name = issue.kind + milestone = issue.milestone ? project.milestones.find_or_create_by(title: issue.milestone) : nil + + gitlab_issue = project.issues.create!( + iid: issue.iid, + title: issue.title, + description: description, + state: issue.state, + author_id: gitlab_user_id(project, issue.author), + milestone: milestone, + created_at: issue.created_at, + updated_at: issue.updated_at + ) + + gitlab_issue.labels << @labels[label_name] + + import_issue_comments(issue, gitlab_issue) if gitlab_issue.persisted? + rescue StandardError => e + errors << { type: :issue, iid: issue.iid, errors: e.message } end end # rubocop: enable CodeReuse/ActiveRecord @@ -150,37 +148,35 @@ module Gitlab pull_requests = client.pull_requests(repo) pull_requests.each do |pull_request| - begin - description = '' - description += @formatter.author_line(pull_request.author) unless find_user_id(pull_request.author) - description += pull_request.description - - source_branch_sha = pull_request.source_branch_sha - target_branch_sha = pull_request.target_branch_sha - source_branch_sha = project.repository.commit(source_branch_sha)&.sha || source_branch_sha - target_branch_sha = project.repository.commit(target_branch_sha)&.sha || target_branch_sha - - merge_request = project.merge_requests.create!( - iid: pull_request.iid, - title: pull_request.title, - description: description, - source_project: project, - source_branch: pull_request.source_branch_name, - source_branch_sha: source_branch_sha, - target_project: project, - target_branch: pull_request.target_branch_name, - target_branch_sha: target_branch_sha, - state: pull_request.state, - author_id: gitlab_user_id(project, pull_request.author), - assignee_id: nil, - created_at: pull_request.created_at, - updated_at: pull_request.updated_at - ) - - import_pull_request_comments(pull_request, merge_request) if merge_request.persisted? - rescue StandardError => e - errors << { type: :pull_request, iid: pull_request.iid, errors: e.message, trace: e.backtrace.join("\n"), raw_response: pull_request.raw } - end + description = '' + description += @formatter.author_line(pull_request.author) unless find_user_id(pull_request.author) + description += pull_request.description + + source_branch_sha = pull_request.source_branch_sha + target_branch_sha = pull_request.target_branch_sha + source_branch_sha = project.repository.commit(source_branch_sha)&.sha || source_branch_sha + target_branch_sha = project.repository.commit(target_branch_sha)&.sha || target_branch_sha + + merge_request = project.merge_requests.create!( + iid: pull_request.iid, + title: pull_request.title, + description: description, + source_project: project, + source_branch: pull_request.source_branch_name, + source_branch_sha: source_branch_sha, + target_project: project, + target_branch: pull_request.target_branch_name, + target_branch_sha: target_branch_sha, + state: pull_request.state, + author_id: gitlab_user_id(project, pull_request.author), + assignee_id: nil, + created_at: pull_request.created_at, + updated_at: pull_request.updated_at + ) + + import_pull_request_comments(pull_request, merge_request) if merge_request.persisted? + rescue StandardError => e + errors << { type: :pull_request, iid: pull_request.iid, errors: e.message, trace: e.backtrace.join("\n"), raw_response: pull_request.raw } end end @@ -211,23 +207,21 @@ module Gitlab end inline_comments.each do |comment| - begin - attributes = pull_request_comment_attributes(comment) - attributes[:discussion_id] = discussion_map[comment.parent_id] if comment.has_parent? + attributes = pull_request_comment_attributes(comment) + attributes[:discussion_id] = discussion_map[comment.parent_id] if comment.has_parent? - attributes.merge!( - position: position_map[comment.iid], - type: 'DiffNote') + attributes.merge!( + position: position_map[comment.iid], + type: 'DiffNote') - note = merge_request.notes.create!(attributes) + note = merge_request.notes.create!(attributes) - # We can't store a discussion ID until a note is created, so if - # replies are created before the parent the discussion ID won't be - # linked properly. - discussion_map[comment.iid] = note.discussion_id - rescue StandardError => e - errors << { type: :pull_request, iid: comment.iid, errors: e.message } - end + # We can't store a discussion ID until a note is created, so if + # replies are created before the parent the discussion ID won't be + # linked properly. + discussion_map[comment.iid] = note.discussion_id + rescue StandardError => e + errors << { type: :pull_request, iid: comment.iid, errors: e.message } end end @@ -245,11 +239,9 @@ module Gitlab def import_standalone_pr_comments(pr_comments, merge_request) pr_comments.each do |comment| - begin - merge_request.notes.create!(pull_request_comment_attributes(comment)) - rescue StandardError => e - errors << { type: :pull_request, iid: comment.iid, errors: e.message } - end + merge_request.notes.create!(pull_request_comment_attributes(comment)) + rescue StandardError => e + errors << { type: :pull_request, iid: comment.iid, errors: e.message } end end diff --git a/lib/gitlab/bitbucket_server_import/importer.rb b/lib/gitlab/bitbucket_server_import/importer.rb index 4a789ae457f..1d3ddeeb0f1 100644 --- a/lib/gitlab/bitbucket_server_import/importer.rb +++ b/lib/gitlab/bitbucket_server_import/importer.rb @@ -162,27 +162,23 @@ module Gitlab restore_branches(batch) if recover_missing_commits batch.each do |pull_request| - begin - import_bitbucket_pull_request(pull_request) - rescue StandardError => e - backtrace = Gitlab::Profiler.clean_backtrace(e.backtrace) - log_error(stage: 'import_pull_requests', iid: pull_request.iid, error: e.message, backtrace: backtrace) - - errors << { type: :pull_request, iid: pull_request.iid, errors: e.message, backtrace: backtrace.join("\n"), raw_response: pull_request.raw } - end + import_bitbucket_pull_request(pull_request) + rescue StandardError => e + backtrace = Gitlab::Profiler.clean_backtrace(e.backtrace) + log_error(stage: 'import_pull_requests', iid: pull_request.iid, error: e.message, backtrace: backtrace) + + errors << { type: :pull_request, iid: pull_request.iid, errors: e.message, backtrace: backtrace.join("\n"), raw_response: pull_request.raw } end end end def delete_temp_branches @temp_branches.each do |branch| - begin - client.delete_branch(project_key, repository_slug, branch.name, branch.sha) - project.repository.delete_branch(branch.name) - rescue BitbucketServer::Connection::ConnectionError => e - log_error(stage: 'delete_temp_branches', branch: branch.name, error: e.message) - @errors << { type: :delete_temp_branches, branch_name: branch.name, errors: e.message } - end + client.delete_branch(project_key, repository_slug, branch.name, branch.sha) + project.repository.delete_branch(branch.name) + rescue BitbucketServer::Connection::ConnectionError => e + log_error(stage: 'delete_temp_branches', branch: branch.name, error: e.message) + @errors << { type: :delete_temp_branches, branch_name: branch.name, errors: e.message } end end @@ -323,16 +319,14 @@ module Gitlab def import_standalone_pr_comments(pr_comments, merge_request) pr_comments.each do |comment| - begin - merge_request.notes.create!(pull_request_comment_attributes(comment)) + merge_request.notes.create!(pull_request_comment_attributes(comment)) - comment.comments.each do |replies| - merge_request.notes.create!(pull_request_comment_attributes(replies)) - end - rescue StandardError => e - log_error(stage: 'import_standalone_pr_comments', merge_request_id: merge_request.id, comment_id: comment.id, error: e.message) - errors << { type: :pull_request, comment_id: comment.id, errors: e.message } + comment.comments.each do |replies| + merge_request.notes.create!(pull_request_comment_attributes(replies)) end + rescue StandardError => e + log_error(stage: 'import_standalone_pr_comments', merge_request_id: merge_request.id, comment_id: comment.id, error: e.message) + errors << { type: :pull_request, comment_id: comment.id, errors: e.message } end end diff --git a/lib/gitlab/ci/build/artifacts/metadata.rb b/lib/gitlab/ci/build/artifacts/metadata.rb index d45a044686e..7011dd1aaf2 100644 --- a/lib/gitlab/ci/build/artifacts/metadata.rb +++ b/lib/gitlab/ci/build/artifacts/metadata.rb @@ -98,7 +98,7 @@ module Gitlab def read_uint32(gz) binary = gz.read(4) - binary.unpack('L>')[0] if binary + binary.unpack1('L>') if binary end def read_string(gz) diff --git a/lib/gitlab/database.rb b/lib/gitlab/database.rb index b6ca777e029..e2637ad602a 100644 --- a/lib/gitlab/database.rb +++ b/lib/gitlab/database.rb @@ -76,7 +76,7 @@ module Gitlab postgresql? && version.to_f >= 9.4 end - def self.pg_stat_wal_receiver_supported? + def self.postgresql_minimum_supported_version? postgresql? && version.to_f >= 9.6 end @@ -98,6 +98,10 @@ module Gitlab Gitlab::Database.postgresql_9_or_less? ? 'pg_last_xlog_replay_location' : 'pg_last_wal_replay_lsn' end + def self.pg_last_xact_replay_timestamp + 'pg_last_xact_replay_timestamp' + end + def self.nulls_last_order(field, direction = 'ASC') order = "#{field} #{direction}" diff --git a/lib/gitlab/database/multi_threaded_migration.rb b/lib/gitlab/database/multi_threaded_migration.rb index 1d39a3d0b57..65a6cb8e369 100644 --- a/lib/gitlab/database/multi_threaded_migration.rb +++ b/lib/gitlab/database/multi_threaded_migration.rb @@ -35,12 +35,10 @@ module Gitlab threads = Array.new(thread_count) do Thread.new do pool.with_connection do |connection| - begin - Thread.current[MULTI_THREAD_AR_CONNECTION] = connection - yield - ensure - Thread.current[MULTI_THREAD_AR_CONNECTION] = nil - end + Thread.current[MULTI_THREAD_AR_CONNECTION] = connection + yield + ensure + Thread.current[MULTI_THREAD_AR_CONNECTION] = nil end end end diff --git a/lib/gitlab/database/sha_attribute.rb b/lib/gitlab/database/sha_attribute.rb index 8d97adaff99..109ae7893da 100644 --- a/lib/gitlab/database/sha_attribute.rb +++ b/lib/gitlab/database/sha_attribute.rb @@ -22,7 +22,7 @@ module Gitlab # Casts binary data to a SHA1 in hexadecimal. def deserialize(value) value = super(value) - value ? value.unpack(PACK_FORMAT)[0] : nil + value ? value.unpack1(PACK_FORMAT) : nil end # Casts a SHA1 in hexadecimal to the proper binary format. diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb index 0a371889af2..e3b9a7a1a89 100644 --- a/lib/gitlab/gitaly_client.rb +++ b/lib/gitlab/gitaly_client.rb @@ -75,13 +75,11 @@ module Gitlab @certs = stub_cert_paths.flat_map do |cert_file| File.read(cert_file).scan(PEM_REGEX).map do |cert| - begin - OpenSSL::X509::Certificate.new(cert).to_pem - rescue OpenSSL::OpenSSLError => e - Rails.logger.error "Could not load certificate #{cert_file} #{e}" - Gitlab::Sentry.track_exception(e, extra: { cert_file: cert_file }) - nil - end + OpenSSL::X509::Certificate.new(cert).to_pem + rescue OpenSSL::OpenSSLError => e + Rails.logger.error "Could not load certificate #{cert_file} #{e}" + Gitlab::Sentry.track_exception(e, extra: { cert_file: cert_file }) + nil end.compact end.uniq.join("\n") end diff --git a/lib/gitlab/gitaly_client/blobs_stitcher.rb b/lib/gitlab/gitaly_client/blobs_stitcher.rb index 01bab854082..f860d8ce517 100644 --- a/lib/gitlab/gitaly_client/blobs_stitcher.rb +++ b/lib/gitlab/gitaly_client/blobs_stitcher.rb @@ -13,17 +13,15 @@ module Gitlab current_blob_data = nil @rpc_response.each do |msg| - begin - if msg.oid.blank? && msg.data.blank? - next - elsif msg.oid.present? - yield new_blob(current_blob_data) if current_blob_data - - current_blob_data = msg.to_h.slice(:oid, :path, :size, :revision, :mode) - current_blob_data[:data] = msg.data.dup - else - current_blob_data[:data] << msg.data - end + if msg.oid.blank? && msg.data.blank? + next + elsif msg.oid.present? + yield new_blob(current_blob_data) if current_blob_data + + current_blob_data = msg.to_h.slice(:oid, :path, :size, :revision, :mode) + current_blob_data[:data] = msg.data.dup + else + current_blob_data[:data] << msg.data end end diff --git a/lib/gitlab/legacy_github_import/importer.rb b/lib/gitlab/legacy_github_import/importer.rb index f3323c98af2..70b18221a66 100644 --- a/lib/gitlab/legacy_github_import/importer.rb +++ b/lib/gitlab/legacy_github_import/importer.rb @@ -89,12 +89,10 @@ module Gitlab def import_labels fetch_resources(:labels, repo, per_page: 100) do |labels| labels.each do |raw| - begin - gh_label = LabelFormatter.new(project, raw) - gh_label.create! - rescue => e - errors << { type: :label, url: Gitlab::UrlSanitizer.sanitize(gh_label.url), errors: e.message } - end + gh_label = LabelFormatter.new(project, raw) + gh_label.create! + rescue => e + errors << { type: :label, url: Gitlab::UrlSanitizer.sanitize(gh_label.url), errors: e.message } end end @@ -104,12 +102,10 @@ module Gitlab def import_milestones fetch_resources(:milestones, repo, state: :all, per_page: 100) do |milestones| milestones.each do |raw| - begin - gh_milestone = MilestoneFormatter.new(project, raw) - gh_milestone.create! - rescue => e - errors << { type: :milestone, url: Gitlab::UrlSanitizer.sanitize(gh_milestone.url), errors: e.message } - end + gh_milestone = MilestoneFormatter.new(project, raw) + gh_milestone.create! + rescue => e + errors << { type: :milestone, url: Gitlab::UrlSanitizer.sanitize(gh_milestone.url), errors: e.message } end end end @@ -223,24 +219,22 @@ module Gitlab def create_comments(comments) ActiveRecord::Base.no_touching do comments.each do |raw| - begin - comment = CommentFormatter.new(project, raw, client) + comment = CommentFormatter.new(project, raw, client) - # GH does not return info about comment's parent, so we guess it by checking its URL! - *_, parent, iid = URI(raw.html_url).path.split('/') + # GH does not return info about comment's parent, so we guess it by checking its URL! + *_, parent, iid = URI(raw.html_url).path.split('/') - issuable = if parent == 'issues' - Issue.find_by(project_id: project.id, iid: iid) - else - MergeRequest.find_by(target_project_id: project.id, iid: iid) - end + issuable = if parent == 'issues' + Issue.find_by(project_id: project.id, iid: iid) + else + MergeRequest.find_by(target_project_id: project.id, iid: iid) + end - next unless issuable + next unless issuable - issuable.notes.create!(comment.attributes) - rescue => e - errors << { type: :comment, url: Gitlab::UrlSanitizer.sanitize(raw.url), errors: e.message } - end + issuable.notes.create!(comment.attributes) + rescue => e + errors << { type: :comment, url: Gitlab::UrlSanitizer.sanitize(raw.url), errors: e.message } end end end @@ -281,12 +275,10 @@ module Gitlab def import_releases fetch_resources(:releases, repo, per_page: 100) do |releases| releases.each do |raw| - begin - gh_release = ReleaseFormatter.new(project, raw) - gh_release.create! if gh_release.valid? - rescue => e - errors << { type: :release, url: Gitlab::UrlSanitizer.sanitize(gh_release.url), errors: e.message } - end + gh_release = ReleaseFormatter.new(project, raw) + gh_release.create! if gh_release.valid? + rescue => e + errors << { type: :release, url: Gitlab::UrlSanitizer.sanitize(gh_release.url), errors: e.message } end end end diff --git a/lib/gitlab/metrics/influx_db.rb b/lib/gitlab/metrics/influx_db.rb index 0b04340fbb5..269d90fa971 100644 --- a/lib/gitlab/metrics/influx_db.rb +++ b/lib/gitlab/metrics/influx_db.rb @@ -52,10 +52,8 @@ module Gitlab pool&.with do |connection| prepared.each_slice(settings[:packet_size]) do |slice| - begin - connection.write_points(slice) - rescue StandardError - end + connection.write_points(slice) + rescue StandardError end end rescue Errno::EADDRNOTAVAIL, SocketError => ex diff --git a/lib/google_api/cloud_platform/client.rb b/lib/google_api/cloud_platform/client.rb index e74ff6a9129..b5f99ea012b 100644 --- a/lib/google_api/cloud_platform/client.rb +++ b/lib/google_api/cloud_platform/client.rb @@ -10,6 +10,7 @@ module GoogleApi class Client < GoogleApi::Auth SCOPE = 'https://www.googleapis.com/auth/cloud-platform'.freeze LEAST_TOKEN_LIFE_TIME = 10.minutes + CLUSTER_MASTER_AUTH_USERNAME = 'admin'.freeze class << self def session_key_for_token @@ -64,6 +65,12 @@ module GoogleApi "node_config": { "machine_type": machine_type }, + "master_auth": { + "username": CLUSTER_MASTER_AUTH_USERNAME, + "client_certificate_config": { + issue_client_certificate: true + } + }, "legacy_abac": { "enabled": legacy_abac } diff --git a/lib/tasks/gitlab/artifacts/migrate.rake b/lib/tasks/gitlab/artifacts/migrate.rake index e7634d2ed4f..9012e55a70c 100644 --- a/lib/tasks/gitlab/artifacts/migrate.rake +++ b/lib/tasks/gitlab/artifacts/migrate.rake @@ -11,14 +11,13 @@ namespace :gitlab do Ci::Build.joins(:project) .with_artifacts_stored_locally .find_each(batch_size: 10) do |build| - begin - build.artifacts_file.migrate!(ObjectStorage::Store::REMOTE) - build.artifacts_metadata.migrate!(ObjectStorage::Store::REMOTE) - logger.info("Transferred artifact ID #{build.id} with size #{build.artifacts_size} to object storage") - rescue => e - logger.error("Failed to transfer artifacts of #{build.id} with error: #{e.message}") - end + build.artifacts_file.migrate!(ObjectStorage::Store::REMOTE) + build.artifacts_metadata.migrate!(ObjectStorage::Store::REMOTE) + + logger.info("Transferred artifact ID #{build.id} with size #{build.artifacts_size} to object storage") + rescue => e + logger.error("Failed to transfer artifacts of #{build.id} with error: #{e.message}") end end end diff --git a/lib/tasks/gitlab/lfs/migrate.rake b/lib/tasks/gitlab/lfs/migrate.rake index a45e5ca91e0..97c15175a23 100644 --- a/lib/tasks/gitlab/lfs/migrate.rake +++ b/lib/tasks/gitlab/lfs/migrate.rake @@ -9,13 +9,12 @@ namespace :gitlab do LfsObject.with_files_stored_locally .find_each(batch_size: 10) do |lfs_object| - begin - lfs_object.file.migrate!(LfsObjectUploader::Store::REMOTE) - logger.info("Transferred LFS object #{lfs_object.oid} of size #{lfs_object.size.to_i.bytes} to object storage") - rescue => e - logger.error("Failed to transfer LFS object #{lfs_object.oid} with error: #{e.message}") - end + lfs_object.file.migrate!(LfsObjectUploader::Store::REMOTE) + + logger.info("Transferred LFS object #{lfs_object.oid} of size #{lfs_object.size.to_i.bytes} to object storage") + rescue => e + logger.error("Failed to transfer LFS object #{lfs_object.oid} with error: #{e.message}") end end end diff --git a/lib/tasks/gitlab/traces.rake b/lib/tasks/gitlab/traces.rake index 5a232091a7e..5e1ec481ece 100644 --- a/lib/tasks/gitlab/traces.rake +++ b/lib/tasks/gitlab/traces.rake @@ -26,13 +26,12 @@ namespace :gitlab do Ci::Build.joins(:project) .with_archived_trace_stored_locally .find_each(batch_size: 10) do |build| - begin - build.job_artifacts_trace.file.migrate!(ObjectStorage::Store::REMOTE) - logger.info("Transferred job trace of #{build.id} to object storage") - rescue => e - logger.error("Failed to transfer artifacts of #{build.id} with error: #{e.message}") - end + build.job_artifacts_trace.file.migrate!(ObjectStorage::Store::REMOTE) + + logger.info("Transferred job trace of #{build.id} to object storage") + rescue => e + logger.error("Failed to transfer artifacts of #{build.id} with error: #{e.message}") end end end diff --git a/lib/tasks/lint.rake b/lib/tasks/lint.rake index 5d673a1a285..c5d0f2c292f 100644 --- a/lib/tasks/lint.rake +++ b/lib/tasks/lint.rake @@ -19,11 +19,9 @@ unless Rails.env.production? desc "GitLab | lint | Lint HAML files" task :haml do - begin - Rake::Task['haml_lint'].invoke - rescue RuntimeError # The haml_lint tasks raise a RuntimeError - exit(1) - end + Rake::Task['haml_lint'].invoke + rescue RuntimeError # The haml_lint tasks raise a RuntimeError + exit(1) end desc "GitLab | lint | Run several lint checks" diff --git a/lib/tasks/migrate/migrate_iids.rake b/lib/tasks/migrate/migrate_iids.rake index aa2d01730d7..cb7c496c31c 100644 --- a/lib/tasks/migrate/migrate_iids.rake +++ b/lib/tasks/migrate/migrate_iids.rake @@ -2,49 +2,43 @@ desc "GitLab | Build internal ids for issues and merge requests" task migrate_iids: :environment do puts 'Issues'.color(:yellow) Issue.where(iid: nil).find_each(batch_size: 100) do |issue| - begin - issue.set_iid + issue.set_iid - if issue.update_attribute(:iid, issue.iid) - print '.' - else - print 'F' - end - rescue + if issue.update_attribute(:iid, issue.iid) + print '.' + else print 'F' end + rescue + print 'F' end puts 'done' puts 'Merge Requests'.color(:yellow) MergeRequest.where(iid: nil).find_each(batch_size: 100) do |mr| - begin - mr.set_iid + mr.set_iid - if mr.update_attribute(:iid, mr.iid) - print '.' - else - print 'F' - end - rescue + if mr.update_attribute(:iid, mr.iid) + print '.' + else print 'F' end + rescue + print 'F' end puts 'done' puts 'Milestones'.color(:yellow) Milestone.where(iid: nil).find_each(batch_size: 100) do |m| - begin - m.set_iid + m.set_iid - if m.update_attribute(:iid, m.iid) - print '.' - else - print 'F' - end - rescue + if m.update_attribute(:iid, m.iid) + print '.' + else print 'F' end + rescue + print 'F' end puts 'done' diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 29cbf59cee2..5b192f4ccbc 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -966,15 +966,6 @@ msgstr "" msgid "AutoDevOps|The Auto DevOps pipeline has been enabled and will be used if no alternative CI configuration file is found. %{more_information_link}" msgstr "" -msgid "AutoDevOps|You can automatically build and test your application if you %{link_to_auto_devops_settings} for this project. You can automatically deploy it as well, if you %{link_to_add_kubernetes_cluster}." -msgstr "" - -msgid "AutoDevOps|add a Kubernetes cluster" -msgstr "" - -msgid "AutoDevOps|enable Auto DevOps" -msgstr "" - msgid "Automatically marked as default internal user" msgstr "" @@ -2315,6 +2306,9 @@ msgstr "" msgid "Contribution" msgstr "" +msgid "Contribution Analytics" +msgstr "" + msgid "Contribution Charts" msgstr "" @@ -3373,12 +3367,6 @@ msgstr "" msgid "Except policy:" msgstr "" -msgid "Existing Git repository" -msgstr "" - -msgid "Existing folder" -msgstr "" - msgid "Existing members and groups" msgstr "" @@ -4073,9 +4061,6 @@ msgstr "" msgid "If enabled" msgstr "" -msgid "If you already have files you can push them using the %{link_to_cli} below." -msgstr "" - msgid "If your HTTP repository is not publicly accessible, add authentication information to the URL: <code>https://username:password@gitlab.company.com/group/project.git</code>." msgstr "" @@ -4540,9 +4525,6 @@ msgstr "" msgid "Learn more about Kubernetes" msgstr "" -msgid "Learn more about protected branches" -msgstr "" - msgid "Learn more about signing commits" msgstr "" @@ -5210,9 +5192,6 @@ msgstr "" msgid "Not started" msgstr "" -msgid "Note that the master branch is automatically protected. %{link_to_protected_branches}" -msgstr "" - msgid "Note that this invitation was sent to %{mail_to_invite_email}, but you are signed in as %{link_to_current_user} with email %{mail_to_current_user}." msgstr "" @@ -5404,9 +5383,6 @@ msgstr "" msgid "Other Labels" msgstr "" -msgid "Otherwise it is recommended you start with one of the options below." -msgstr "" - msgid "Outbound requests" msgstr "" @@ -6265,6 +6241,12 @@ msgstr "" msgid "Push" msgstr "" +msgid "Push an existing Git repository" +msgstr "" + +msgid "Push an existing folder" +msgstr "" + msgid "Push events" msgstr "" @@ -8768,6 +8750,12 @@ msgstr "" msgid "You can also star a label to make it a priority label." msgstr "" +msgid "You can also upload existing files from your computer using the instructions below." +msgstr "" + +msgid "You can create files directly in GitLab using one of the following options." +msgstr "" + msgid "You can easily contribute to them by requesting to join these groups." msgstr "" @@ -8972,9 +8960,6 @@ msgstr "" msgid "branch name" msgstr "" -msgid "command line instructions" -msgstr "" - msgid "commented on %{link_to_project}" msgstr "" diff --git a/locale/uk/gitlab.po b/locale/uk/gitlab.po index 67d9a556621..86b7048ad3d 100644 --- a/locale/uk/gitlab.po +++ b/locale/uk/gitlab.po @@ -13,7 +13,7 @@ msgstr "" "X-Crowdin-Project: gitlab-ee\n" "X-Crowdin-Language: uk\n" "X-Crowdin-File: /master/locale/gitlab.pot\n" -"PO-Revision-Date: 2019-02-11 08:11\n" +"PO-Revision-Date: 2019-03-14 07:35\n" msgid " Status" msgstr " СтатуÑ" @@ -36,17 +36,24 @@ msgstr[2] " покращилоÑÑ Ð½Ð° %d одиниць" msgstr[3] " покращилоÑÑ Ð½Ð° %d одиниць" msgid " or " -msgstr "" +msgstr " або " msgid " or <#epic id>" -msgstr "" +msgstr " або <#epic id>" msgid " or <#issue id>" -msgstr "" +msgstr " або <#issue id>" msgid "\"%{query}\" in projects" msgstr "\"%{query}\" в проектах" +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "%d коментар" +msgstr[1] "%d коментарі" +msgstr[2] "%d коментарів" +msgstr[3] "%d коментарів" + msgid "%d commit" msgid_plural "%d commits" msgstr[0] "%d коміт" @@ -62,7 +69,7 @@ msgstr[2] "%d комітів позаду" msgstr[3] "%d комітів позаду" msgid "%d commits" -msgstr "" +msgstr "%d комітів" msgid "%d exporter" msgid_plural "%d exporters" @@ -94,10 +101,10 @@ msgstr[3] "%d задач" msgid "%d issue selected" msgid_plural "%d issues selected" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "%d вибрана задача" +msgstr[1] "%d вибрані задачі" +msgstr[2] "%d вибраних задач" +msgstr[3] "%d вибраних задач" msgid "%d layer" msgid_plural "%d layers" @@ -156,12 +163,28 @@ msgstr "%{counter_storage} (%{counter_repositories} репозиторій, %{co msgid "%{count} %{alerts}" msgstr "%{count} %{alerts}" -msgid "%{count} more" +msgid "%{count} approval required from %{name}" +msgid_plural "%{count} approvals required from %{name}" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +msgid "%{count} approvals from %{name}" msgstr "" +msgid "%{count} more" +msgstr "%{count} більше" + msgid "%{count} more assignees" msgstr "%{count} більше виконавців" +msgid "%{count} of %{required} approvals from %{name}" +msgstr "" + +msgid "%{count} of %{total}" +msgstr "%{count} з %{total}" + msgid "%{count} participant" msgid_plural "%{count} participants" msgstr[0] "%{count} учаÑтник" @@ -182,18 +205,18 @@ msgstr "%{filePath} видалено" msgid "%{firstLabel} +%{labelCount} more" msgstr "%{firstLabel} +%{labelCount} більше" -msgid "%{firstOption} +%{extraOptionCount} more" -msgstr "" - msgid "%{group_docs_link_start}Groups%{group_docs_link_end} allow you to manage and collaborate across multiple projects. Members of a group have access to all of its projects." msgstr "%{group_docs_link_start}Групи%{group_docs_link_end} дозволÑÑŽÑ‚ÑŒ вам керувати Ñ– взаємодіÑти між кількома проектами. Члени групи мають доÑтуп до уÑÑ–Ñ… Ñ—Ñ— проектів." msgid "%{issuableType} will be removed! Are you sure?" msgstr "%{issuableType} буде видалено! Ви впевнені?" -msgid "%{link_start}Read more%{link_end} about role permissions" +msgid "%{label_for_message} unavailable" msgstr "" +msgid "%{link_start}Read more%{link_end} about role permissions" +msgstr "%{link_start}Читати більше%{link_end} про дозволи ролей" + msgid "%{loadingIcon} Started" msgstr "%{loadingIcon} Початок" @@ -213,31 +236,31 @@ msgid "%{percent}%% complete" msgstr "%{percent}%% завершено" msgid "%{state} epics" -msgstr "" +msgstr "%{state} епіки" msgid "%{strong_start}%{branch_count}%{strong_end} Branch" msgid_plural "%{strong_start}%{branch_count}%{strong_end} Branches" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "%{strong_start}%{branch_count}%{strong_end} Гілка" +msgstr[1] "%{strong_start}%{branch_count}%{strong_end} Гілки" +msgstr[2] "%{strong_start}%{branch_count}%{strong_end} Гілок" +msgstr[3] "%{strong_start}%{branch_count}%{strong_end} Гілок" msgid "%{strong_start}%{commit_count}%{strong_end} Commit" msgid_plural "%{strong_start}%{commit_count}%{strong_end} Commits" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "%{strong_start}%{commit_count}%{strong_end} Коміт" +msgstr[1] "%{strong_start}%{commit_count}%{strong_end} Коміти" +msgstr[2] "%{strong_start}%{commit_count}%{strong_end} Комітів" +msgstr[3] "%{strong_start}%{commit_count}%{strong_end} Комітів" msgid "%{strong_start}%{human_size}%{strong_end} Files" -msgstr "" +msgstr "%{strong_start}%{human_size}%{strong_end} Файлів" msgid "%{strong_start}%{tag_count}%{strong_end} Tag" msgid_plural "%{strong_start}%{tag_count}%{strong_end} Tags" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "%{strong_start}%{tag_count}%{strong_end} Тег" +msgstr[1] "%{strong_start}%{tag_count}%{strong_end} Теги" +msgstr[2] "%{strong_start}%{tag_count}%{strong_end} Тегів" +msgstr[3] "%{strong_start}%{tag_count}%{strong_end} Тегів" msgid "%{text} %{files}" msgid_plural "%{text} %{files} files" @@ -259,10 +282,10 @@ msgid "%{usage_ping_link_start}Learn more%{usage_ping_link_end} about what infor msgstr "%{usage_ping_link_start}ДовідатиÑÑŒ більше%{usage_ping_link_end} про те, Ñкою інформацією Ви ділитеÑÑŒ із GitLab Inc." msgid "%{user_name} profile page" -msgstr "" +msgstr "%{user_name} Ñторінка профілю" msgid "(external source)" -msgstr "" +msgstr "(зовнішнє джерело)" msgid "+ %{count} more" msgstr "+ ще %{count}" @@ -270,8 +293,11 @@ msgstr "+ ще %{count}" msgid "+ %{moreCount} more" msgstr "+ ще %{moreCount}" +msgid "+%{extraOptionCount} more" +msgstr "+%{extraOptionCount} більше" + msgid ", or " -msgstr "" +msgstr ", або " msgid "- Runner is active and can process any new jobs" msgstr "- Runner активний Ñ– може виконувати нові завданнÑ" @@ -296,6 +322,13 @@ msgstr[1] "%{count} %{type} зміни" msgstr[2] "%{count} %{type} змін" msgstr[3] "%{count} %{type} змін" +msgid "1 Day" +msgid_plural "%d Days" +msgstr[0] "1 день" +msgstr[1] "%d дні" +msgstr[2] "%d днів" +msgstr[3] "%d днів" + msgid "1 closed issue" msgid_plural "%d closed issues" msgstr[0] "1 закрита задача" @@ -363,13 +396,13 @@ msgid "1st contribution!" msgstr "Перший внеÑок!" msgid "2FA" -msgstr "" +msgstr "двофакторна автентифікаціÑ" msgid "2FA enabled" -msgstr "Двоетапна Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ ÑƒÐ²Ñ–Ð¼ÐºÐ½ÐµÐ½Ð°" +msgstr "Двофакторна Ð°Ð²Ñ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ ÑƒÐ²Ñ–Ð¼ÐºÐ½ÐµÐ½Ð°" msgid "403|Please contact your GitLab administrator to get permission." -msgstr "" +msgstr "Будь лаÑка, звернітьÑÑ Ð´Ð¾ адмініÑтратора GitLab, щоб отримати дозвіл." msgid "403|You don't have the permission to access this page." msgstr "У Ð²Ð°Ñ Ð½ÐµÐ¼Ð°Ñ” доÑтупу до цієї Ñторінки." @@ -411,11 +444,26 @@ msgid "<strong>%{pushes}</strong> pushes, more than <strong>%{commits}</strong> msgstr "<strong>%{pushes}</strong> відправок (push), більше ніж <strong>%{commits}</strong> зафікÑовано<strong>%{people}</strong> учаÑниками." msgid "<strong>Deletes</strong> source branch" -msgstr "" +msgstr "<strong>ВидалÑÑ”</strong> гілку-джерело" msgid "A 'Runner' is a process which runs a job. You can set up as many Runners as you need." msgstr "'Runner' — це процеÑ, Ñкий виконує завданнÑ. Ви можете Ñтворити потрібну кількіÑÑ‚ÑŒ Runner'ів." +msgid "A .NET Core console application template, customizable for any .NET Core project" +msgstr "" + +msgid "A GitBook site that uses Netlify for CI/CD instead of GitLab, but still with all the other great GitLab features." +msgstr "" + +msgid "A Hexo site that uses Netlify for CI/CD instead of GitLab, but still with all the other great GitLab features." +msgstr "" + +msgid "A Hugo site that uses Netlify for CI/CD instead of GitLab, but still with all the other great GitLab features." +msgstr "" + +msgid "A Jekyll site that uses Netlify for CI/CD instead of GitLab, but still with all the other great GitLab features." +msgstr "" + msgid "A collection of graphs regarding Continuous Integration" msgstr "Ðабір графіків відноÑно безперервної інтеграції" @@ -431,9 +479,18 @@ msgstr "УчаÑник команди GitLab по боротьбі з поруш msgid "A new branch will be created in your fork and a new merge request will be started." msgstr "У вашому форку буде Ñтворено нову гілку, а також буде ініційований новий запит на злиттÑ." +msgid "A plain HTML site that uses Netlify for CI/CD instead of GitLab, but still with all the other great GitLab features." +msgstr "" + msgid "A project is where you house your files (repository), plan your work (issues), and publish your documentation (wiki), %{among_other_things_link}." msgstr "Проект — це міÑце де ви можете розміщувати Ñвої файли (репозиторій), планувати роботу (задачі) Ñ– публікувати документацію (вікі), %{among_other_things_link}." +msgid "A ready-to-go template for use with Android apps." +msgstr "" + +msgid "A ready-to-go template for use with iOS Swift apps." +msgstr "" + msgid "A regular expression that will be used to find the test coverage output in the job trace. Leave blank to disable" msgstr "РегулÑрний вираз, Ñкий буде викориÑтовуватиÑÑ Ð´Ð»Ñ Ð¿Ð¾ÑˆÑƒÐºÑƒ результатів Ð¿Ð¾ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ñ‚ÐµÑтами в завданні. Залиште пуÑтим Ð´Ð»Ñ Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ð½Ñ" @@ -459,7 +516,7 @@ msgid "Abuse reports" msgstr "Звіти про зловживаннÑ" msgid "Accept invitation" -msgstr "" +msgstr "ПрийнÑти запрошеннÑ" msgid "Accept terms" msgstr "ПрийнÑти умови" @@ -498,41 +555,68 @@ msgid "Add" msgstr "Додати" msgid "Add CHANGELOG" -msgstr "" +msgstr "Додати ÑпиÑок змін (CHANGELOG)" msgid "Add CONTRIBUTING" -msgstr "" +msgstr "Додати CONTRIBUTING" msgid "Add Group Webhooks and GitLab Enterprise Edition." msgstr "Додайте групові веб-гуки та GitLab Enterprise Edition." msgid "Add Jaeger URL" -msgstr "Додати URL-Ð°Ð´Ñ€ÐµÑ Jaeger" +msgstr "Додати URL-адреÑу Jaeger" msgid "Add Kubernetes cluster" msgstr "Додати Kubernetes-клаÑтер" msgid "Add README" -msgstr "" +msgstr "Додати інÑтрукцію (README)" + +msgid "Add a bullet list" +msgstr "Додати ненумерований ÑпиÑок" msgid "Add a general comment to this %{noteable_name}." -msgstr "" +msgstr "Додайте загальний коментар до цього %{noteable_name}." msgid "Add a homepage to your wiki that contains information about your project and GitLab will display it here instead of this message." msgstr "Додати домашню Ñторінку в вікі, Ñка міÑтить інформацію про ваш проект, Ñ– GitLab відображатиме його тут заміÑÑ‚ÑŒ цього повідомленнÑ." +msgid "Add a link" +msgstr "Додати поÑиланнÑ" + +msgid "Add a numbered list" +msgstr "Додати нумерований ÑпиÑок" + msgid "Add a table" msgstr "Додати таблицю" +msgid "Add a task list" +msgstr "Додати ÑпиÑок завдань" + msgid "Add additional text to appear in all email communications. %{character_limit} character limit" msgstr "Створіть додатковий текÑÑ‚, Ñкий буде приÑутній у вÑÑ–Ñ… повідомленнÑÑ… електронної пошти. МакÑимальна кількіÑÑ‚ÑŒ Ñимволів — %{character_limit}" +msgid "Add approver(s)" +msgstr "Додати затверджуючих оÑіб" + +msgid "Add approvers" +msgstr "Додати затверджуючих оÑіб" + +msgid "Add bold text" +msgstr "Додати жирний текÑÑ‚" + msgid "Add comment now" msgstr "Додати коментар" +msgid "Add header and footer to emails. Please note that color settings will only be applied within the application interface" +msgstr "" + msgid "Add image comment" msgstr "Додати коментар до зображеннÑ" +msgid "Add italic text" +msgstr "Додати курÑивний текÑÑ‚" + msgid "Add license" msgstr "Додати ліцензію" @@ -549,23 +633,26 @@ msgid "Add reaction" msgstr "Додати реакцію" msgid "Add to project" -msgstr "" +msgstr "Додати до проекту" msgid "Add to review" msgstr "Додати до перевірки" msgid "Add todo" -msgstr "Додати задачу" +msgstr "Додати нагадуваннÑ" msgid "Add user(s) to the group:" msgstr "Додати кориÑтувачів до групу:" msgid "Add users or groups who are allowed to approve every merge request" -msgstr "" +msgstr "Додайте кориÑтувачів або групи, Ñким дозволено затверджувати будь-Ñкий запит на злиттÑ" msgid "Add users to group" msgstr "Додати кориÑтувача до групи" +msgid "Added at" +msgstr "" + msgid "Adding new applications is disabled in your GitLab instance. Please contact your GitLab administrator to get the permission" msgstr "Ð”Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð½Ð¾Ð²Ð¸Ñ… проектів Ð´Ð»Ñ Ð²Ð°ÑˆÐ¾Ð³Ð¾ інÑтанÑу GitLab заборонено. ЗвернітьÑÑ Ð´Ð¾ Ñвого адмініÑтратора GitLab, щоб отримати дозвіл" @@ -612,40 +699,40 @@ msgid "AdminProjects|Delete project" msgstr "Видалити проект" msgid "AdminSettings|Auto DevOps domain" -msgstr "" +msgstr "Домен Auto DevOps" msgid "AdminSettings|Environment variables are protected by default" -msgstr "" +msgstr "Змінні Ñередовища Ñ” захищеними за замовчуваннÑм" msgid "AdminSettings|Specify a domain to use by default for every project's Auto Review Apps and Auto Deploy stages." msgstr "Вкажіть домен, Ñкий буде викориÑтовуватиÑÑ Ð² проекті за замовчуваннÑм Ð´Ð»Ñ Ñтадій Auto Review Apps Ñ– Auto Deploy." msgid "AdminSettings|When creating a new environment variable it will be protected by default." -msgstr "" +msgstr "При Ñтворенні нової змінної Ñередовища вона буде захищена за замовчуваннÑм." msgid "AdminUsers|2FA Disabled" -msgstr "" +msgstr "2FA вимкнено" msgid "AdminUsers|2FA Enabled" -msgstr "" +msgstr "2FA увімкнено" msgid "AdminUsers|Active" -msgstr "" +msgstr "Ðктивні" msgid "AdminUsers|Admin" -msgstr "" +msgstr "ÐдмініÑтратор" msgid "AdminUsers|Admins" -msgstr "" +msgstr "ÐдмініÑтратори" msgid "AdminUsers|Block user" msgstr "Заблоквати кориÑтувача" msgid "AdminUsers|Blocked" -msgstr "" +msgstr "Заблоковано" msgid "AdminUsers|Cannot unblock LDAP blocked users" -msgstr "" +msgstr "Ðеможливо розблокувати кориÑтувачів заблокованих в LDAP" msgid "AdminUsers|Delete User %{username} and contributions?" msgstr "Видалити кориÑтувача %{username} та його внеÑки?" @@ -660,28 +747,28 @@ msgid "AdminUsers|Delete user and contributions" msgstr "Видалити кориÑтувача Ñ– його внеÑки" msgid "AdminUsers|External" -msgstr "" +msgstr "Зовнішні" msgid "AdminUsers|It's you!" -msgstr "" +msgstr "Це ви!" msgid "AdminUsers|New user" -msgstr "" +msgstr "Ðовий кориÑтувач" msgid "AdminUsers|No users found" -msgstr "" +msgstr "КориÑтувачів не знайдено" msgid "AdminUsers|Search by name, email or username" -msgstr "" +msgstr "Шукати за іменем, електронною поштою або іменем кориÑтувача" msgid "AdminUsers|Search users" -msgstr "" +msgstr "Пошук кориÑтувачів" msgid "AdminUsers|Send email to users" -msgstr "" +msgstr "Відправити Ð¿Ð¾Ð²Ñ–Ð´Ð¼Ð¾Ð»ÐµÐ½Ð½Ñ ÐµÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ñ— пошти кориÑтувачам" msgid "AdminUsers|Sort by" -msgstr "" +msgstr "Сортувати за" msgid "AdminUsers|To confirm, type %{projectName}" msgstr "Ð”Ð»Ñ Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ð²Ð²ÐµÐ´Ñ–Ñ‚ÑŒ %{projectName}" @@ -690,9 +777,12 @@ msgid "AdminUsers|To confirm, type %{username}" msgstr "Ð”Ð»Ñ Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ð²Ð²ÐµÐ´Ñ–Ñ‚ÑŒ %{username}" msgid "AdminUsers|User will be blocked" -msgstr "" +msgstr "КориÑтувач буде заблокований" msgid "AdminUsers|Without projects" +msgstr "Без проектів" + +msgid "Advanced" msgstr "" msgid "Advanced permissions, Large File Storage and Two-Factor authentication settings." @@ -701,6 +791,9 @@ msgstr "Додаткові дозволи, Ñховище великих файРmsgid "Advanced settings" msgstr "Додаткові параметри" +msgid "After a successful password update you will be redirected to login screen." +msgstr "" + msgid "Alert" msgid_plural "Alerts" msgstr[0] "ПопередженнÑ" @@ -709,11 +802,14 @@ msgstr[2] "Попереджень" msgstr[3] "Попереджень" msgid "Alerts" -msgstr "" +msgstr "ПопередженнÑ" msgid "All" msgstr "Ð’ÑÑ–" +msgid "All Members" +msgstr "Ð’ÑÑ– учаÑники" + msgid "All changes are committed" msgstr "Ð’ÑÑ– зміни закомічені" @@ -721,7 +817,7 @@ msgid "All features are enabled for blank projects, from templates, or when impo msgstr "Ð’ÑÑ– функції Ð´Ð»Ñ Ð½Ð¾Ð²Ð¸Ñ… проектів берутьÑÑ Ñ–Ð· шаблонів або під Ñ‡Ð°Ñ Ñ–Ð¼Ð¿Ð¾Ñ€Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ, але ви можете вимикати Ñ—Ñ… пізніше в налаштуваннÑÑ… проекту." msgid "All issues for this milestone are closed. You may close this milestone now." -msgstr "" +msgstr "Ð’ÑÑ– задачі Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ етапу закриті. Ви можете закрити цей етап." msgid "All users" msgstr "Ð’ÑÑ– кориÑтувачі" @@ -744,6 +840,9 @@ msgstr "Дозволити Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð´Ñ–Ð°Ð³Ñ€Ð°Ð¼ PlantUML в Ð msgid "Allow requests to the local network from hooks and services." msgstr "Дозволити запити до локальної мережі із гуків та ÑервіÑів." +msgid "Allow this key to push to repository as well? (Default only allows pull access.)" +msgstr "" + msgid "Allow users to request access" msgstr "Дозволити кориÑтувачам запитувати доÑтуп" @@ -783,9 +882,6 @@ msgstr "Порожнє поле Gitlab-кориÑтувача буде запоРmsgid "An error has occurred" msgstr "ТрапилаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°" -msgid "An error occured while fetching the releases. Please try again." -msgstr "" - msgid "An error occurred adding a draft to the discussion." msgstr "Виникла помилка під Ñ‡Ð°Ñ Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ñ‡ÐµÑ€Ð½ÐµÑ‚ÐºÐ¸ до обговореннÑ." @@ -793,6 +889,15 @@ msgid "An error occurred adding a new draft." msgstr "Виникла помилка під Ñ‡Ð°Ñ Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð½Ð¾Ð²Ð¾Ñ— чернетки." msgid "An error occurred creating the new branch." +msgstr "Помилка при Ñтворенні нової гілки." + +msgid "An error occurred fetching the approval rules." +msgstr "" + +msgid "An error occurred fetching the approvers for the new rule." +msgstr "Помилка при отриманні затверджуючих оÑіб Ð´Ð»Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ правила." + +msgid "An error occurred fetching the dropdown data." msgstr "" msgid "An error occurred previewing the blob" @@ -805,7 +910,10 @@ msgid "An error occurred when updating the issue weight" msgstr "Збій під Ñ‡Ð°Ñ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²Ð°Ð³Ð¸ задачі" msgid "An error occurred while adding approver" -msgstr "Помилка при додаванні учаÑника Ð´Ð»Ñ Ð·Ð°Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ" +msgstr "Помилка при додаванні затверджуючої оÑоби" + +msgid "An error occurred while deleting the approvers group" +msgstr "Помилка при видаленні групи затверджуючих оÑіб" msgid "An error occurred while deleting the comment" msgstr "СталаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° під Ñ‡Ð°Ñ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ ÐºÐ¾Ð¼ÐµÐ½Ñ‚Ð°Ñ€Ñ" @@ -843,6 +951,9 @@ msgstr "Помилка при отриманні завдань." msgid "An error occurred while fetching the pipeline." msgstr "Помилка при отриманні данних конвеєра." +msgid "An error occurred while fetching the releases. Please try again." +msgstr "" + msgid "An error occurred while getting projects" msgstr "СталаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° при отриманні проектів" @@ -858,6 +969,9 @@ msgstr "Виникла помилка під Ñ‡Ð°Ñ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð´Ð msgid "An error occurred while loading commit signatures" msgstr "ТрапилаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° при завантаженні Ñигнатур коміту" +msgid "An error occurred while loading designs. Please try again." +msgstr "" + msgid "An error occurred while loading diff" msgstr "Помилка при завантаженні разниці (diff)" @@ -868,19 +982,19 @@ msgid "An error occurred while loading the file" msgstr "Помилка при завантаженні файлу" msgid "An error occurred while loading the subscription details." -msgstr "" +msgstr "Помилка при завантаженні даних підпиÑки." msgid "An error occurred while making the request." msgstr "Помилка при Ñтворенні запиту." msgid "An error occurred while removing approver" -msgstr "Помилка при видаленні учаÑника Ð´Ð»Ñ Ð·Ð°Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ" +msgstr "Помилка при видаленні затверджуючої оÑоби" msgid "An error occurred while removing epics." -msgstr "" +msgstr "Помилка при видаленні епіків." msgid "An error occurred while removing issues." -msgstr "" +msgstr "Помилка при видаленні задач." msgid "An error occurred while rendering KaTeX" msgstr "СталаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° при рендерингу KaTeX" @@ -900,12 +1014,18 @@ msgstr "Помилка при збереженні ÑтатуÑу перевиз msgid "An error occurred while saving assignees" msgstr "Помилка при збереженні виконавців" +msgid "An error occurred while saving the approval settings" +msgstr "" + msgid "An error occurred while subscribing to notifications." msgstr "Помилка при підпиÑці на ÑповіщеннÑ." msgid "An error occurred while unsubscribing to notifications." msgstr "Помилка при відпиÑці від Ñповіщень." +msgid "An error occurred while updating approvers" +msgstr "Помилка при оновленні затверджуючих оÑіб" + msgid "An error occurred while updating the comment" msgstr "Під Ñ‡Ð°Ñ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ÐºÐ¾Ð¼ÐµÐ½Ñ‚Ð°Ñ€Ñ ÑталаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°" @@ -913,56 +1033,59 @@ msgid "An error occurred while validating username" msgstr "СталаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€ÐºÐ¸ імені кориÑтувача" msgid "An error occurred whilst committing your changes." -msgstr "" +msgstr "Помилка при коміті ваших змін." msgid "An error occurred whilst fetching the job trace." -msgstr "" +msgstr "Помилка при отриманні логу завданнÑ." msgid "An error occurred whilst fetching the latest pipeline." -msgstr "" +msgstr "Помилка при отриманні оÑтаннього конвеєра." msgid "An error occurred whilst loading all the files." -msgstr "" +msgstr "Помилка при завантаженні вÑÑ–Ñ… файлів." msgid "An error occurred whilst loading the file content." -msgstr "" +msgstr "Помилка при завантаженні вміÑту файлу." msgid "An error occurred whilst loading the file." -msgstr "" +msgstr "Помилка при завантаженні файлу." msgid "An error occurred whilst loading the merge request changes." -msgstr "" +msgstr "Помилка при завантаженні змін запиту на злиттÑ." msgid "An error occurred whilst loading the merge request version data." -msgstr "" +msgstr "Помилка при завантаженні даних верÑÑ–Ñ— запиту на злиттÑ." msgid "An error occurred whilst loading the merge request." -msgstr "" +msgstr "Помилка при завантаженні запиту на злиттÑ." msgid "An error occurred whilst loading the pipelines jobs." -msgstr "" +msgstr "Помилка при завантаженні завдань конвеєру." msgid "An error occurred. Please try again." msgstr "СталаÑÑŒ помилка. Спробуйте ще раз." msgid "An unexpected error occurred while checking the project environment." -msgstr "" +msgstr "Ðеочікувана помилка при перевірці Ñередовища проекту." msgid "An unexpected error occurred while checking the project runners." -msgstr "" +msgstr "Ðеочікувана помилка при перевірці runner'ів проекту." msgid "An unexpected error occurred while communicating with the Web Terminal." -msgstr "" +msgstr "Ðеочікувана помилка з'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ñ–Ð· Веб-терміналом." msgid "An unexpected error occurred while starting the Web Terminal." -msgstr "" +msgstr "Ðеочікувана помилка при запуÑку Веб-терміналу." msgid "An unexpected error occurred while stopping the Web Terminal." -msgstr "" +msgstr "Ðеочікувана помилка при зупинці Веб-терміналу." msgid "Analytics" msgstr "Ðналітика" +msgid "Ancestors" +msgstr "" + msgid "Anonymous" msgstr "Ðнонімно" @@ -991,19 +1114,65 @@ msgid "Applications" msgstr "ЗаÑтоÑунки" msgid "Applied" -msgstr "" +msgstr "ЗаÑтоÑовано" msgid "Apply suggestion" +msgstr "ЗаÑтоÑувати пропозицію" + +msgid "ApprovalRuleRemove|%d member" +msgid_plural "ApprovalRuleRemove|%d members" +msgstr[0] "%d учаÑник" +msgstr[1] "%d учаÑника" +msgstr[2] "%d учаÑників" +msgstr[3] "%d учаÑників" + +msgid "ApprovalRuleRemove|Approvals from this member are not revoked." +msgid_plural "ApprovalRuleRemove|Approvals from these members are not revoked." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +msgid "ApprovalRuleRemove|You are about to remove the %{name} approver group which has %{nMembers}." +msgstr "Ви збираєтеÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ групу затверджуючих оÑіб %{name} Ñка налічує %{nMembers} учаÑників." + +msgid "ApprovalRuleSummary|%d member" +msgid_plural "ApprovalRuleSummary|%d members" +msgstr[0] "%d учаÑник" +msgstr[1] "%d учаÑника" +msgstr[2] "%d учаÑників" +msgstr[3] "%d учаÑників" + +msgid "ApprovalRuleSummary|%{count} approval required from %{membersCount}" +msgid_plural "ApprovalRuleSummary|%{count} approvals required from %{membersCount}" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +msgid "ApprovalRule|All members with Developer role or higher and code owners (if any)" msgstr "" -msgid "Approvals" +msgid "ApprovalRule|Members" +msgstr "УчаÑники" + +msgid "ApprovalRule|Name" +msgstr "Ім'Ñ" + +msgid "ApprovalRule|No. approvals required" msgstr "" -msgid "Approvals required" +msgid "ApprovalRule|e.g. QA, Security, etc." msgstr "" +msgid "Approvals" +msgstr "ЗатвердженнÑ" + +msgid "Approvals required" +msgstr "Потрібні затвердженнÑ" + msgid "Approvers" -msgstr "" +msgstr "Затверджуючі оÑоби" msgid "Apr" msgstr "квіт." @@ -1018,7 +1187,7 @@ msgid "Archived projects" msgstr "Заархівовані проекти" msgid "Are you sure" -msgstr "" +msgstr "Ви впевнені" msgid "Are you sure you want to delete this pipeline schedule?" msgstr "Ви впевнені, що хочете видалити цей розклад Ð´Ð»Ñ ÐºÐ¾Ð½Ð²ÐµÑ”Ñ€Ð°?" @@ -1030,7 +1199,7 @@ msgid "Are you sure you want to lose unsaved changes?" msgstr "Ви впевнені, що бажаєте втратити незбережені зміни?" msgid "Are you sure you want to lose your issue information?" -msgstr "" +msgstr "Ви впевнені, що хочете втратити інформацію про задачу?" msgid "Are you sure you want to regenerate the public key? You will have to update the public key on the remote server before mirroring will work again." msgstr "Ви впевнені, що хочете повторно згенерувати відкритий ключ? Вам доведетьÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ відкритий ключ на віддаленому Ñервері, перш ніж Ð´Ð·ÐµÑ€ÐºÐ°Ð»ÑŽÐ²Ð°Ð½Ð½Ñ Ð·Ð°Ð¿Ñ€Ð°Ñ†ÑŽÑ” знову." @@ -1038,14 +1207,20 @@ msgstr "Ви впевнені, що хочете повторно згенеру msgid "Are you sure you want to remove %{group_name}?" msgstr "Ви впевнені, що хочете видалити %{group_name}?" +msgid "Are you sure you want to remove approver %{name}" +msgstr "Ви впевнені, що хочете видалити затверджуючу оÑобу %{name}" + msgid "Are you sure you want to remove approver %{name}?" -msgstr "" +msgstr "Ви впевнені, що хочете видалити затверджуючу оÑобу %{name}?" + +msgid "Are you sure you want to remove group %{name}" +msgstr "Ви впевнені, що хочете видалити групу %{name}" msgid "Are you sure you want to remove group %{name}?" -msgstr "" +msgstr "Ви впевнені, що хочете видалити групу %{name}?" msgid "Are you sure you want to remove the attachment?" -msgstr "" +msgstr "Ви впевнені, що бажаєте видалити вкладеннÑ?" msgid "Are you sure you want to remove this identity?" msgstr "Ви впевнені, що хочете видалити цю ідентифікацію?" @@ -1063,7 +1238,7 @@ msgid "Are you sure you want to unlock %{path_lock_path}?" msgstr "Ви впевнені, що хочете розблокувати %{path_lock_path}?" msgid "Are you sure you want to unsubscribe from the %{type}: %{link_to_noteable_text}?" -msgstr "" +msgstr "Ви дійÑно бажаєте ÑкаÑувати підпиÑку на %{type}: %{link_to_noteable_text}?" msgid "Are you sure?" msgstr "Ви впевнені?" @@ -1096,7 +1271,7 @@ msgid "Assign milestone" msgstr "Призначити етап" msgid "Assign some issues to this milestone." -msgstr "" +msgstr "Призначити деÑкі задачі до цього етапу." msgid "Assign to" msgstr "Призначити" @@ -1125,9 +1300,12 @@ msgstr "СпиÑки виконавців показують уÑÑ– задачі msgid "Assignee(s)" msgstr "Виконавець(ці)" -msgid "Attach a file" +msgid "At least one approval from a code owner is required to change files matching the respective CODEOWNER rules." msgstr "" +msgid "Attach a file" +msgstr "Прикріпити файл" + msgid "Attach a file by drag & drop or %{upload_link}" msgstr "Прикріпити файл за допомогою перетÑÐ³ÑƒÐ²Ð°Ð½Ð½Ñ Ð°Ð±Ð¾ %{upload_link}" @@ -1140,9 +1318,6 @@ msgstr "Ñерп." msgid "August" msgstr "Ñерпень" -msgid "Auth Token" -msgstr "" - msgid "Authentication Log" msgstr "Журнал автентифікації" @@ -1159,7 +1334,7 @@ msgid "Authorization code:" msgstr "Код авторизації:" msgid "Authorization key" -msgstr "" +msgstr "Ключ авторизації" msgid "Authorization was granted by entering your username and password in the application." msgstr "ÐÐ²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ñ–Ñ Ð²Ñ–Ð´Ð±ÑƒÐ»Ð°ÑÑ Ð¿Ñ–ÑÐ»Ñ Ð²Ð²Ð¾Ð´Ñƒ вашого імені та паролю у заÑтоÑунку." @@ -1222,25 +1397,25 @@ msgid "Automatically marked as default internal user" msgstr "Ðвтоматично позначено Ñк внутрішній кориÑтувач за замовчуваннÑм" msgid "Automatically resolved" -msgstr "" +msgstr "Вирішено автоматично" msgid "Available" msgstr "ДоÑтупно" msgid "Available group Runners: %{runners}" -msgstr "" +msgstr "ДоÑтупні групові Runner'и: %{runners}" msgid "Available shared Runners:" -msgstr "" +msgstr "ДоÑтупні загальні Runner'и:" msgid "Available specific runners" -msgstr "" +msgstr "ДоÑтупні Ñпеціальні Runner’и" msgid "Avatar for %{assigneeName}" -msgstr "" +msgstr "Ðватар Ð´Ð»Ñ %{assigneeName}" msgid "Avatar for %{name}" -msgstr "" +msgstr "Ðватар Ð´Ð»Ñ %{name}" msgid "Avatar will be removed. Are you sure?" msgstr "Ðватар буде видалено. Ви впевнені?" @@ -1426,10 +1601,10 @@ msgid "Bitbucket import" msgstr "Імпорт з Bitbucket" msgid "Block" -msgstr "" +msgstr "Блок" msgid "Blocked" -msgstr "" +msgstr "Заблокований" msgid "Blog" msgstr "Блог" @@ -1594,34 +1769,34 @@ msgid "Browse files" msgstr "ПереглÑд файлів" msgid "Built-in" -msgstr "" +msgstr "Вбудований" msgid "Business" -msgstr "" +msgstr "БізнеÑ" msgid "Business metrics (Custom)" msgstr "Ð‘Ñ–Ð·Ð½ÐµÑ Ð¼ÐµÑ‚Ñ€Ð¸ÐºÐ¸ (ВлаÑні)" msgid "By %{user_name}" -msgstr "" +msgstr "Від %{user_name}" msgid "ByAuthor|by" msgstr "від" msgid "CHANGELOG" -msgstr "" +msgstr "СпиÑок змін (CHANGELOG)" msgid "CI / CD" msgstr "CI / CD" msgid "CI / CD Charts" -msgstr "" +msgstr "СтатиÑтика CI / CD" msgid "CI / CD Settings" msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ CI/CD" msgid "CI Lint" -msgstr "" +msgstr "Перевірка CI конфігурації" msgid "CI will run using the credentials assigned above." msgstr "CI буде працювати з викориÑтаннÑм облікових даних, визначених вище." @@ -1669,6 +1844,9 @@ msgid "CICD|The Auto DevOps pipeline will run if no alternative CI configuration msgstr "Конвеєр Auto DevOps буде запущено, Ñкщо не буде знайдено альтернативного файлу конфігуріції CI." msgid "CICD|You must add a %{kubernetes_cluster_start}Kubernetes cluster integration%{kubernetes_cluster_end} to this project with a domain in order for your deployment strategy to work correctly." +msgstr "Ви повинні додати %{kubernetes_cluster_start}клаÑтерну інтеграцію Kubernetes%{kubernetes_cluster_end} до цього проекту з доменом Ð´Ð»Ñ ÐºÐ¾Ñ€ÐµÐºÑ‚Ð½Ð¾Ñ— роботи Ñтратегії розгортаннÑ." + +msgid "CICD|group enabled" msgstr "" msgid "CICD|instance enabled" @@ -1681,14 +1859,17 @@ msgid "Callback URL" msgstr "URL зворотнього виклику" msgid "Can override approvers and approvals required per merge request" -msgstr "" +msgstr "Можна змінювати необхідні Ð·Ð°Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ñ‚Ð° затверджуючих оÑіб Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñ‚Ñ–Ð² на злиттÑ" msgid "Can't find HEAD commit for this branch" msgstr "Ðе можу знайти HEAD-коміт Ð´Ð»Ñ Ñ†Ñ–Ñ”Ñ— гілки" -msgid "Canary Deployments is a popular CI strategy, where a small portion of the fleet is updated to the new version of your application." +msgid "Can't remove group members without group managed account" msgstr "" +msgid "Canary Deployments is a popular CI strategy, where a small portion of the fleet is updated to the new version of your application." +msgstr "Canary Deployments — це популÑрна ÑÑ‚Ñ€Ð°Ñ‚ÐµÐ³Ñ–Ñ Ð±ÐµÐ·Ð¿ÐµÑ€ÐµÑ€Ð²Ð½Ð¾Ñ— інтеграції, коли нова верÑÑ–Ñ Ð²Ð°ÑˆÐ¾Ð³Ð¾ заÑтоÑунку вÑтановлюєтьÑÑ Ð½Ð° невелику кількіÑÑ‚ÑŒ машин." + msgid "Cancel" msgstr "СкаÑувати" @@ -1701,11 +1882,14 @@ msgstr "Ðеможливо злити автоматично" msgid "Cannot modify managed Kubernetes cluster" msgstr "Ðеможливо змінити керований клаÑтер Kubernetes" -msgid "Certificate" +msgid "Cannot render the image. Maximum character count (%{charLimit}) has been exceeded." msgstr "" +msgid "Certificate" +msgstr "Сертифікат" + msgid "Certificate (PEM)" -msgstr "" +msgstr "Сертифікат (PEM)" msgid "Certificate fingerprint" msgstr "Відбиток Ñертифіката" @@ -1714,7 +1898,7 @@ msgid "Change Weight" msgstr "Змінити вагу" msgid "Change permissions" -msgstr "" +msgstr "Змінити права доÑтупу" msgid "Change template" msgstr "Змінити шаблон" @@ -1737,6 +1921,9 @@ msgstr "Ðнулювати коміт" msgid "ChangeTypeAction|This will create a new commit in order to revert the existing changes." msgstr "Це Ñтворить новий коміт, щоб анулювати Ñ–Ñнуючі зміни." +msgid "Changes" +msgstr "Зміни" + msgid "Changes are shown as if the <b>source</b> revision was being merged into the <b>target</b> revision." msgstr "Зміни відображаютьÑÑ Ñ‚Ð°Ðº, ніби <b>редакціÑ-джерело</b> була злита в <b>цільову редакцію</b>." @@ -1749,17 +1936,20 @@ msgstr "СтатиÑтика" msgid "Chat" msgstr "Чат" +msgid "Check again" +msgstr "Перевірити знову" + msgid "Check the %{docs_link_start}documentation%{docs_link_end}." msgstr "ПереглÑньте %{docs_link_start}документацію%{docs_link_end}." msgid "Check your .gitlab-ci.yml" -msgstr "" +msgstr "Перевірте Ñвій .gitlab-ci.yml" msgid "Checking %{text} availability…" msgstr "Перевірка доÑтупноÑÑ‚Ñ– %{text}…" msgid "Checking approval status" -msgstr "" +msgstr "Перевірка ÑтатуÑу затвердженнÑ" msgid "Checking branch availability..." msgstr "Перевірка доÑтупноÑÑ‚Ñ– гілки..." @@ -1783,7 +1973,7 @@ msgid "Choose a branch/tag (e.g. %{master}) or enter a commit (e.g. %{sha}) to s msgstr "Виберіть гілку чи тег (напр. %{master}) або введіть коміт (напр. %{sha}) Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ³Ð»Ñду змін або Ð´Ð»Ñ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð·Ð°Ð¿Ð¸Ñ‚Ñƒ на злиттÑ." msgid "Choose a file" -msgstr "" +msgstr "Виберіть файл" msgid "Choose a role permission" msgstr "" @@ -1806,21 +1996,21 @@ msgstr "Виберіть файл..." msgid "Choose the top-level group for your repository imports." msgstr "Оберіть групу найвищого Ñ€Ñ–Ð²Ð½Ñ Ð´Ð»Ñ Ñ–Ð¼Ð¿Ð¾Ñ€Ñ‚Ñƒ репозиторіїв." -msgid "Choose what content you want to see on a group’s overview page" +msgid "Choose visibility level, enable/disable project features (issues, repository, wiki, snippets) and set permissions." msgstr "" -msgid "Choose which groups you wish to synchronize to this secondary node." -msgstr "Виберіть групи Ð´Ð»Ñ Ñинхронізації на цей вторинний вузол." +msgid "Choose what content you want to see on a group’s overview page" +msgstr "Вибрати вміÑÑ‚ оглÑдової Ñторінки групи" msgid "Choose which repositories you want to connect and run CI/CD pipelines." msgstr "Виберіть, Ñкі репозиторії ви хочете підключити Ñ– запуÑтити конвеєри CI/CD." -msgid "Choose which repositories you want to import." -msgstr "Виберіть, Ñкі репозиторії ви хочете імпортувати." - msgid "Choose which shards you wish to synchronize to this secondary node." msgstr "Виберіть Ñегменти Ð´Ð»Ñ Ñинхронізації на цей вторинний вузол." +msgid "Choose your merge method, set up a default merge request description template." +msgstr "" + msgid "CiStatusLabel|canceled" msgstr "ÑкаÑовано" @@ -1903,7 +2093,7 @@ msgid "CiVariable|Create wildcard" msgstr "Створити шаблон" msgid "CiVariable|Error occurred while saving variables" -msgstr "" +msgstr "Помилка при збереженні змінних" msgid "CiVariable|New environment" msgstr "Ðове Ñередовище" @@ -1924,10 +2114,10 @@ msgid "ClassificationLabelUnavailable|is unavailable: %{reason}" msgstr "не доÑтупно: %{reason}" msgid "Clear" -msgstr "" +msgstr "ОчиÑтити" msgid "Clear input" -msgstr "" +msgstr "ОчиÑтити ввід" msgid "Clear search" msgstr "ОчиÑтити пошук" @@ -1963,22 +2153,25 @@ msgid "Client authentication key" msgstr "Ключ автентифікації клієнта" msgid "Client authentication key password" -msgstr "Пароль ключа аутентифікації клієнта" +msgstr "Пароль ключа автентифікації клієнта" msgid "Clients" msgstr "Клієнти" msgid "Clone" -msgstr "" +msgstr "Клонувати" msgid "Clone repository" msgstr "Клонувати репозиторій" msgid "Clone with %{http_label}" +msgstr "Клонувати з %{http_label}" + +msgid "Clone with KRB5" msgstr "" msgid "Clone with SSH" -msgstr "" +msgstr "Клонувати з SSH" msgid "Close" msgstr "Закрити" @@ -1987,22 +2180,19 @@ msgid "Close epic" msgstr "Закрити епік" msgid "Close milestone" -msgstr "" +msgstr "Закрити етап" msgid "Closed" msgstr "Закрито" -msgid "Closed (moved)" -msgstr "" - msgid "Closed issues" msgstr "Закриті задачі" msgid "ClusterIntegration| %{custom_domain_start}More information%{custom_domain_end}." -msgstr "" +msgstr "%{custom_domain_start}Детальніше%{custom_domain_end}." msgid "ClusterIntegration| can be used instead of a custom domain." -msgstr "" +msgstr "може викориÑтовуватиÑÑ Ð·Ð°Ð¼Ñ–ÑÑ‚ÑŒ влаÑного домену." msgid "ClusterIntegration| is the default environment scope for this cluster. This means that all jobs, regardless of their environment, will use this cluster. %{environment_scope_start}More information%{environment_scope_end}" msgstr "" @@ -2010,9 +2200,6 @@ msgstr "" msgid "ClusterIntegration|%{appList} was successfully installed on your Kubernetes cluster" msgstr "%{appList} були уÑпішно вÑтановлені на ваш Kubernetes-клаÑтер" -msgid "ClusterIntegration|%{boldNotice} This will add some extra resources like a load balancer, which may incur additional costs depending on the hosting provider your Kubernetes cluster is installed on. If you are using Google Kubernetes Engine, you can %{pricingLink}." -msgstr "%{boldNotice} Це додаÑÑ‚ÑŒ додаткові реÑурÑи, такі Ñк баланÑувальник навантаженнÑ, Ñкий може збільшити витрати в залежноÑÑ‚Ñ– від провайдера хоÑтингу, на Ñкому вÑтановлено клаÑтер Kubernetes. Якщо ви викориÑтовуєте Google Kubernetes Engine, ви можете %{pricingLink}." - msgid "ClusterIntegration|%{title} upgraded successfully." msgstr "" @@ -2034,20 +2221,17 @@ msgstr "Ð”Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ñ–Ð½Ñ‚ÐµÐ³Ñ€Ð°Ñ†Ñ–Ñ— до вашої групи наРmsgid "ClusterIntegration|Advanced options on this Kubernetes cluster's integration" msgstr "Детальні Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñ–Ð½Ñ‚ÐµÐ³Ñ€Ð°Ñ†Ñ–Ñ— із цим Kubernetes-клаÑтером" -msgid "ClusterIntegration|After installing Ingress, you will need to point your wildcard DNS at the generated external IP address in order to view your app after it is deployed. %{ingressHelpLink}" -msgstr "ПіÑÐ»Ñ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ingress, вам необхідно направити Ñвій DNS на згенеровану зовнішню IP-адреÑу, щоб переглÑнути ваш заÑтоÑунок піÑÐ»Ñ Ð¹Ð¾Ð³Ð¾ розгортаннÑ. %{ingressHelpLink}" - msgid "ClusterIntegration|Alternatively" msgstr "" -msgid "ClusterIntegration|An error occured while trying to fetch project zones: %{error}" -msgstr "Помилка при отриманні зон проекту: %{error}" - msgid "ClusterIntegration|An error occurred when trying to contact the Google Cloud API. Please try again later." msgstr "Помилка під Ñ‡Ð°Ñ Ð·'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð· Google Cloud API. Будь лаÑка, Ñпробуйте знову пізніше." +msgid "ClusterIntegration|An error occurred while trying to fetch project zones: %{error}" +msgstr "Помилка при отриманні зон проекту: %{error}" + msgid "ClusterIntegration|An error occurred while trying to fetch your projects: %{error}" -msgstr "" +msgstr "Помилка при отриманні ваших проектів: %{error}" msgid "ClusterIntegration|An error occurred while trying to fetch zone machine types: %{error}" msgstr "" @@ -2062,13 +2246,13 @@ msgid "ClusterIntegration|Are you sure you want to remove this Kubernetes cluste msgstr "Ви впевнені, що хочете видалити інтеграцію із цим Kubernetes-клаÑтером? Це не призведе до Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ñамого клаÑтера." msgid "ClusterIntegration|Base domain" -msgstr "" +msgstr "ОÑновний домен" msgid "ClusterIntegration|CA Certificate" msgstr "Сертифікат центру Ñертифікації" msgid "ClusterIntegration|Cert-Manager" -msgstr "" +msgstr "Cert-Manager" msgid "ClusterIntegration|Cert-Manager is a native Kubernetes certificate management controller that helps with issuing certificates. Installing Cert-Manager on your cluster will issue a certificate by %{letsEncrypt} and ensure that certificates are valid and up-to-date." msgstr "" @@ -2082,6 +2266,9 @@ msgstr "Виберіть, Ñкі заÑтоÑунки необхідно вÑÑ‚Ð msgid "ClusterIntegration|Choose which of your environments will use this cluster." msgstr "Виберіть, Ñке із ваших Ñередовищ буде викориÑтовувати цей клаÑтер." +msgid "ClusterIntegration|Cluster health" +msgstr "" + msgid "ClusterIntegration|Clusters are utilized by selecting the nearest ancestor with a matching environment scope. For example, project clusters will override group clusters." msgstr "" @@ -2091,13 +2278,13 @@ msgstr "Скопіювати API URL" msgid "ClusterIntegration|Copy CA Certificate" msgstr "Скопіювати Ñертифікат центру Ñертифікації" -msgid "ClusterIntegration|Copy Ingress IP Address to clipboard" -msgstr "Копіювати IP-адреÑу Ingress в буфер обміну" +msgid "ClusterIntegration|Copy Ingress Endpoint to clipboard" +msgstr "" msgid "ClusterIntegration|Copy Jupyter Hostname to clipboard" msgstr "Скопіювати Ñ–Ð¼â€™Ñ Ñ…Ð¾Ñта Jupyter в буфер обміну" -msgid "ClusterIntegration|Copy Knative IP Address to clipboard" +msgid "ClusterIntegration|Copy Knative Endpoint to clipboard" msgstr "" msgid "ClusterIntegration|Copy Kubernetes cluster name" @@ -2178,14 +2365,14 @@ msgstr "Приховати" msgid "ClusterIntegration|If you are setting up multiple clusters and are using Auto DevOps, %{help_link_start}read this first%{help_link_end}." msgstr "Якщо ви налаштовуєте декілька клаÑтерів Ñ– викориÑтовуєте Auto DevOps, %{help_link_start}прочитайте Ð´Ð»Ñ Ð¿Ð¾Ñ‡Ð°Ñ‚ÐºÑƒ це%{help_link_end}." -msgid "ClusterIntegration|In order to show the health of the cluster, we'll need to provision your cluster with Prometheus to collect the required data." -msgstr "Ð”Ð»Ñ Ñ‚Ð¾Ð³Ð¾, щоб показати працездатніÑÑ‚ÑŒ клаÑтера, нам потрібно буде забезпечити ваш клаÑтер з Prometheus Ð´Ð»Ñ Ð·Ð±Ð¾Ñ€Ñƒ необхідних даних." +msgid "ClusterIntegration|In order to view the health of your cluster, you must first install Prometheus below." +msgstr "" msgid "ClusterIntegration|Ingress" msgstr "Ingress" -msgid "ClusterIntegration|Ingress IP Address" -msgstr "Ingress IP-адреÑа" +msgid "ClusterIntegration|Ingress Endpoint" +msgstr "" msgid "ClusterIntegration|Ingress gives you a way to route requests to services based on the request host or path, centralizing a number of services into a single entrypoint." msgstr "Ingress дозволÑÑ” вам маршрутизувати запити до Ñлужб на оÑнові запитаного хоÑта або шлÑху, об'єднуючи Ñ€Ñд ÑервіÑів в одну точку входу." @@ -2193,15 +2380,18 @@ msgstr "Ingress дозволÑÑ” вам маршрутизувати запитРmsgid "ClusterIntegration|Install" msgstr "Ð’Ñтановити" -msgid "ClusterIntegration|Install Prometheus" -msgstr "Ð’Ñтановити Prometheus" - msgid "ClusterIntegration|Installed" msgstr "Ð’Ñтановлений" msgid "ClusterIntegration|Installing" msgstr "Ð’ÑтановленнÑ" +msgid "ClusterIntegration|Installing Ingress may incur additional costs. Learn more about %{pricingLink}." +msgstr "" + +msgid "ClusterIntegration|Installing Knative may incur additional costs. Learn more about %{pricingLink}." +msgstr "" + msgid "ClusterIntegration|Integrate Kubernetes cluster automation" msgstr "Ð†Ð½Ñ‚ÐµÐ³Ñ€Ð°Ñ†Ñ–Ñ ÐºÐ»Ð°Ñтерної автоматизації Kubernetes" @@ -2209,7 +2399,7 @@ msgid "ClusterIntegration|Integration status" msgstr "Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ñ–Ð½Ñ‚ÐµÐ³Ñ€Ð°Ñ†Ñ–Ñ—" msgid "ClusterIntegration|Issuer Email" -msgstr "" +msgstr "Електронна пошта емітента" msgid "ClusterIntegration|Issuers represent a certificate authority. You must provide an email address for your Issuer. " msgstr "" @@ -2229,7 +2419,7 @@ msgstr "Knative" msgid "ClusterIntegration|Knative Domain Name:" msgstr "Доменне ім'Ñ Knative:" -msgid "ClusterIntegration|Knative IP Address:" +msgid "ClusterIntegration|Knative Endpoint:" msgstr "" msgid "ClusterIntegration|Knative extends Kubernetes to provide a set of middleware components that are essential to build modern, source-centric, and container-based applications that can run anywhere: on premises, in the cloud, or even in a third-party data center." @@ -2241,9 +2431,6 @@ msgstr "Kubernetes-клаÑтер" msgid "ClusterIntegration|Kubernetes cluster details" msgstr "Параметри Kubernetes-клаÑтера" -msgid "ClusterIntegration|Kubernetes cluster health" -msgstr "Стан Kubernetes-клаÑтера" - msgid "ClusterIntegration|Kubernetes cluster is being created on Google Kubernetes Engine..." msgstr "Kubernetes-клаÑтер ÑтворюєтьÑÑ Ð½Ð° Google Kubernetes Engine..." @@ -2272,7 +2459,7 @@ msgid "ClusterIntegration|Learn more about group Kubernetes clusters" msgstr "ДізнайтеÑÑ Ð±Ñ–Ð»ÑŒÑˆÐµ про групові клаÑтери Kubernetes" msgid "ClusterIntegration|Let's Encrypt" -msgstr "" +msgstr "Let's Encrypt" msgid "ClusterIntegration|Machine type" msgstr "Тип машини" @@ -2286,9 +2473,6 @@ msgstr "УправліннÑ" msgid "ClusterIntegration|Manage your Kubernetes cluster by visiting %{link_gke}" msgstr "Керуйте вашим Kubernetes-клаÑтером за допомогою %{link_gke}" -msgid "ClusterIntegration|More information" -msgstr "Додаткова інформаціÑ" - msgid "ClusterIntegration|No machine types matched your search" msgstr "Жоден тип машин не відповідає вашому пошуку" @@ -2301,9 +2485,6 @@ msgstr "Жоден проект не відповідає вашому пошуРmsgid "ClusterIntegration|No zones matched your search" msgstr "Жодна зона не відповідає вашому пошуку" -msgid "ClusterIntegration|Note:" -msgstr "Примітка:" - msgid "ClusterIntegration|Number of nodes" msgstr "КількіÑÑ‚ÑŒ вузлів" @@ -2313,8 +2494,8 @@ msgstr "Введіть інформацію про доÑтуп до Ñвого msgid "ClusterIntegration|Please make sure that your Google account meets the following requirements:" msgstr "Будь-лаÑка впевнітьÑÑ, що ваш обліковий Ð·Ð°Ð¿Ð¸Ñ Google задовольнÑÑ” наÑтупним вимогам:" -msgid "ClusterIntegration|Point a wildcard DNS to this generated IP address in order to access your application after it has been deployed." -msgstr "Ðаправте ваш DNS на цю згенеровану IP-адреÑу, щоб отримати доÑтуп до вашого додатку, піÑÐ»Ñ Ð¹Ð¾Ð³Ð¾ розгортаннÑ." +msgid "ClusterIntegration|Point a wildcard DNS to this generated endpoint in order to access your application after it has been deployed." +msgstr "" msgid "ClusterIntegration|Project cluster" msgstr "КлаÑтер проекту" @@ -2352,7 +2533,7 @@ msgstr "При бажанні ви можете замінити це на Ð²Ð°Ñ msgid "ClusterIntegration|Request to begin installing failed" msgstr "Запит про початок вÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½Ðµ виконано" -msgid "ClusterIntegration|Retry upgrade" +msgid "ClusterIntegration|Retry update" msgstr "" msgid "ClusterIntegration|Save changes" @@ -2397,9 +2578,6 @@ msgstr "Показати" msgid "ClusterIntegration|Something went wrong on our end." msgstr "ЩоÑÑŒ пішло не так з нашого боку." -msgid "ClusterIntegration|Something went wrong when upgrading %{title}. Please check the logs and try again." -msgstr "" - msgid "ClusterIntegration|Something went wrong while creating your Kubernetes cluster on Google Kubernetes Engine" msgstr "Помилка при Ñтворенні вашого Kubernetes-клаÑтера на Google Kubernetes Engine" @@ -2407,10 +2585,10 @@ msgid "ClusterIntegration|Something went wrong while installing %{title}" msgstr "Під Ñ‡Ð°Ñ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ %{title} ÑталаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°" msgid "ClusterIntegration|Specifying a domain will allow you to use Auto Review Apps and Auto Deploy stages for %{auto_devops_start}Auto DevOps%{auto_devops_end}. The domain should have a wildcard DNS configured matching the domain." -msgstr "" +msgstr "Ð—Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð´Ð¾Ð¼ÐµÐ½Ñƒ дозволить вам викориÑтовувати фази Auto Review Apps та Auto Deploy Ð´Ð»Ñ %{auto_devops_start}Auto DevOps%{auto_devops_end}. Домен повинен мати шаблон DNS, що задовільнÑÑ” цей домен." -msgid "ClusterIntegration|The IP address is in the process of being assigned. Please check your Kubernetes cluster or Quotas on Google Kubernetes Engine if it takes a long time." -msgstr "ВідбуваєтьÑÑ Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ IP-адреÑи. Будь лаÑка, перевірте квоти вашого Kubernetes клаÑтера на Google Kubernetes Engine, Ñкщо це займає багато чаÑу." +msgid "ClusterIntegration|The endpoint is in the process of being assigned. Please check your Kubernetes cluster or Quotas on Google Kubernetes Engine if it takes a long time." +msgstr "" msgid "ClusterIntegration|This account must have permissions to create a Kubernetes cluster in the %{link_to_container_project} specified below" msgstr "Цей обліковий Ð·Ð°Ð¿Ð¸Ñ Ð¿Ð¾Ð²Ð¸Ð½ÐµÐ½ мати наÑтупні права Ð´Ð»Ñ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Kubernetes-клаÑтера в %{link_to_container_project}" @@ -2418,12 +2596,21 @@ msgstr "Цей обліковий Ð·Ð°Ð¿Ð¸Ñ Ð¿Ð¾Ð²Ð¸Ð½ÐµÐ½ мати наÑтуРmsgid "ClusterIntegration|This option will allow you to install applications on RBAC clusters." msgstr "Цей параметр дозволить вам вÑтановлювати заÑтоÑунки на клаÑтери RBAC." +msgid "ClusterIntegration|To access your application after deployment, point a wildcard DNS to the Knative Endpoint." +msgstr "" + msgid "ClusterIntegration|Toggle Kubernetes cluster" msgstr "Увімкнути/вимкнути Kubernetes-клаÑтер" msgid "ClusterIntegration|Token" msgstr "Токен" +msgid "ClusterIntegration|Update failed. Please check the logs and try again." +msgstr "" + +msgid "ClusterIntegration|Updating" +msgstr "" + msgid "ClusterIntegration|Upgrade" msgstr "" @@ -2460,9 +2647,6 @@ msgstr "Зона" msgid "ClusterIntegration|access to Google Kubernetes Engine" msgstr "доÑтуп до Google Kubernetes Engine" -msgid "ClusterIntegration|check the pricing here" -msgstr "переглÑнути ціни тут" - msgid "ClusterIntegration|documentation" msgstr "документації" @@ -2472,6 +2656,9 @@ msgstr "Ñторінка допомоги" msgid "ClusterIntegration|meets the requirements" msgstr "задовольнÑÑ” вимогам" +msgid "ClusterIntegration|pricing" +msgstr "" + msgid "ClusterIntegration|properly configured" msgstr "правильно налаштований" @@ -2479,31 +2666,43 @@ msgid "ClusterIntegration|sign up" msgstr "реєÑтрації" msgid "Code" +msgstr "Код" + +msgid "Code Owners" +msgstr "ВлаÑники коду" + +msgid "Code owner approval is required" msgstr "" msgid "Code owners" msgstr "ВлаÑники коду" +msgid "CodeOwner|Pattern" +msgstr "" + msgid "Cohorts" msgstr "Когорти" msgid "Collapse" msgstr "Згорнути" +msgid "Collapse approvers" +msgstr "Згорнути ÑпиÑок затверджуючих оÑіб" + msgid "Collapse sidebar" msgstr "Згорнути панель" msgid "Command line instructions" -msgstr "" +msgstr "ІнÑтрукції Ð´Ð»Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð³Ð¾ Ñ€Ñдка" msgid "Comment" msgstr "Коментар" msgid "Comment & close %{noteable_name}" -msgstr "" +msgstr "Коментувати та закрити %{noteable_name}" msgid "Comment & reopen %{noteable_name}" -msgstr "" +msgstr "Коментувати та повторно відкрити %{noteable_name}" msgid "Comment & resolve discussion" msgstr "Залишити коментар Ñ– завершити обговореннÑ" @@ -2525,19 +2724,19 @@ msgstr[2] "Комітів" msgstr[3] "Комітів" msgid "Commit %{commit_id}" -msgstr "" +msgstr "Коміт %{commit_id}" msgid "Commit Message" -msgstr "Коміт-повідомелннÑ" +msgstr "ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ ÐºÐ¾Ð¼Ñ–Ñ‚Ñƒ" msgid "Commit deleted" -msgstr "" +msgstr "Коміт видалено" msgid "Commit duration in minutes for last 30 commits" msgstr "ТриваліÑÑ‚ÑŒ оÑтанніх 30 комітів у хвилинах" msgid "Commit message" -msgstr "Коміт-повідомленнÑ" +msgstr "ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ ÐºÐ¾Ð¼Ñ–Ñ‚Ñƒ" msgid "Commit statistics for %{ref} %{start_time} - %{end_time}" msgstr "СтатиÑтика комітів Ð´Ð»Ñ %{ref} %{start_time} - %{end_time}" @@ -2597,7 +2796,7 @@ msgid "Compare Revisions" msgstr "ПорівнÑÐ½Ð½Ñ Ñ€ÐµÐ´Ð°ÐºÑ†Ñ–Ð¹" msgid "Compare changes" -msgstr "" +msgstr "ПорівнÑти зміни" msgid "Compare changes with the last commit" msgstr "ПорівнÑти зміни з оÑтаннім комітом" @@ -2627,7 +2826,7 @@ msgid "Confidentiality" msgstr "КонфіденційніÑÑ‚ÑŒ" msgid "Configure GitLab runners to start using the Web Terminal. %{helpStart}Learn more.%{helpEnd}" -msgstr "" +msgstr "Ðалаштувати runner'ів GitLab Ð´Ð»Ñ Ð¿Ð¾Ñ‡Ð°Ñ‚ÐºÑƒ викориÑÑ‚Ð°Ð½Ð½Ñ Ð’ÐµÐ±-терміналу. %{helpStart}Докладніше.%{helpEnd}" msgid "Configure Gitaly timeouts." msgstr "Ðалаштувати таймаути Gitaly." @@ -2636,7 +2835,7 @@ msgid "Configure Tracing" msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð’Ñ–Ð´ÑтеженнÑ" msgid "Configure a <code>.gitlab-webide.yml</code> file in the <code>.gitlab</code> directory to start using the Web Terminal. %{helpStart}Learn more.%{helpEnd}" -msgstr "" +msgstr "Ðалаштуйте файл <code>.gitlab-webide.yml</code> у директорії <code>.gitlab</code>, щоб почати викориÑтовувати Веб-термінал. %{helpStart}Докладніше.%{helpEnd}" msgid "Configure automatic git checks and housekeeping on repositories." msgstr "Ðалаштувати автоматичні перевірки git Ñ– Ð¾Ñ‡Ð¸Ñ‰ÐµÐ½Ð½Ñ Ð² репозиторіÑÑ…." @@ -2672,7 +2871,7 @@ msgid "Connecting..." msgstr "З'єднаннÑ..." msgid "Contact sales to upgrade" -msgstr "" +msgstr "ЗвернітьÑÑ Ð´Ð¾ відділу продажів Ð´Ð»Ñ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ" msgid "Container Registry" msgstr "РеєÑÑ‚Ñ€ Контейнерів" @@ -2723,7 +2922,7 @@ msgid "ContainerRegistry|You can also use a %{deploy_token} for read-only access msgstr "Ви також можете викориÑтовувати %{deploy_token} Ð´Ð»Ñ Ð´Ð¾Ñтупу тільки Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ð´Ð¾ образів у реєÑтрі." msgid "Contents of .gitlab-ci.yml" -msgstr "" +msgstr "ВміÑÑ‚ .gitlab-ci.yml" msgid "Continue" msgstr "Продовжити" @@ -2741,7 +2940,7 @@ msgid "Contribution" msgstr "ВнеÑок" msgid "Contribution Charts" -msgstr "" +msgstr "СтатиÑтика внеÑків" msgid "Contributions for <strong>%{calendar_date}</strong>" msgstr "ВнеÑки за <strong>%{calendar_date}</strong>" @@ -2767,23 +2966,14 @@ msgstr "Будь лаÑка, зачекайте, Ñ†Ñ Ñторінка автоРmsgid "Control the display of third party offers." msgstr "Керувати відображеннÑм Ñторонніх пропозицій." -msgid "Control the maximum concurrency of LFS/attachment backfill for this secondary node" -msgstr "Задати макÑимальну кількіÑÑ‚ÑŒ потоків Ð´Ð»Ñ Ñ„Ð¾Ð½Ð¾Ð²Ð¾Ð³Ð¾ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ LFS/вкладень Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ вторинного вузла" - msgid "Control the maximum concurrency of repository backfill for this secondary node" msgstr "Задати макÑимальну кількіÑÑ‚ÑŒ потоків Ð´Ð»Ñ Ñ„Ð¾Ð½Ð¾Ð²Ð¾Ð³Ð¾ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ñ–Ñ—Ð² Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ вторинного вузла" -msgid "Control the maximum concurrency of verification operations for this Geo node" -msgstr "Ð’Ñтановіть макÑимальну кількіÑÑ‚ÑŒ паралельних операцій перевірки Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ Geo-вузла" - -msgid "Control the minimum interval in days that a repository should be reverified for this primary node" -msgstr "" - msgid "ConvDev Index" msgstr "Ð†Ð½Ð´ÐµÐºÑ ConvDev" msgid "Copy %{http_label} clone URL" -msgstr "" +msgstr "Скопіювати URL Ð´Ð»Ñ ÐºÐ»Ð¾Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ñ‡ÐµÑ€ÐµÐ· %{http_label}" msgid "Copy %{protocol} clone URL" msgstr "Скопіювати URL Ð´Ð»Ñ ÐºÐ»Ð¾Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ñ‡ÐµÑ€ÐµÐ· %{protocol}" @@ -2791,11 +2981,14 @@ msgstr "Скопіювати URL Ð´Ð»Ñ ÐºÐ»Ð¾Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ñ‡ÐµÑ€ÐµÐ· %{protoc msgid "Copy ID to clipboard" msgstr "Скопіювати ID в буфер обміну" +msgid "Copy KRB5 clone URL" +msgstr "" + msgid "Copy SSH clone URL" msgstr "Скопіювати URL Ð´Ð»Ñ ÐºÐ»Ð¾Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ñ‡ÐµÑ€ÐµÐ· SSH" msgid "Copy SSH public key" -msgstr "" +msgstr "Скопіювати публічний ключ SSH" msgid "Copy SSH public key to clipboard" msgstr "Скопіюйте відкритий SSH-ключ в буфер обміну" @@ -2843,7 +3036,7 @@ msgid "Create New Directory" msgstr "Створити новий каталог" msgid "Create New Domain" -msgstr "" +msgstr "Створити новий домен" msgid "Create a new branch" msgstr "Створити нову гілку" @@ -2855,7 +3048,7 @@ msgid "Create a new issue" msgstr "Створити нову задачу" msgid "Create a new repository" -msgstr "" +msgstr "Створити новий репозиторій" msgid "Create a personal access token on your account to pull or push via %{protocol}." msgstr "Створіть токен доÑтупу Ð´Ð»Ñ Ð²Ð°ÑˆÐ¾Ð³Ð¾ аккаунта, щоб відправлÑти та отримувати через %{protocol}." @@ -2884,9 +3077,6 @@ msgstr "Створити групу" msgid "Create group label" msgstr "Створити мітку групи" -msgid "Create issue" -msgstr "Створити задачу" - msgid "Create lists from labels. Issues with that label appear in that list." msgstr "Створити ÑпиÑок на оÑнові міток. Ð’ ньому будуть задачі з такими мітками." @@ -2897,7 +3087,7 @@ msgid "Create merge request and branch" msgstr "Створити запит на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ñ‚Ð° гілку" msgid "Create milestone" -msgstr "" +msgstr "Створити етап" msgid "Create new branch" msgstr "Створити нову гілку" @@ -2956,6 +3146,9 @@ msgstr "СинтакÑÐ¸Ñ Cron" msgid "Current Branch" msgstr "Поточна гілка" +msgid "Current Project" +msgstr "Поточний проект" + msgid "Current node" msgstr "Поточний вузол" @@ -2981,7 +3174,7 @@ msgid "Custom project templates" msgstr "ВлаÑні шаблони проектів" msgid "Custom project templates have not been set up for groups that you are a member of. They are enabled from a group’s settings page. Contact your group’s Owner or Maintainer to setup custom project templates." -msgstr "" +msgstr "ВлаÑні шаблони проектів не налаштовані Ð´Ð»Ñ Ð³Ñ€ÑƒÐ¿, до Ñких ви входите. Вони активуютьÑÑ Ð½Ð° Ñторінці налаштувань групи. ЗвернітьÑÑ Ð´Ð¾ влаÑника або керівника вашої групи Ð´Ð»Ñ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ð»Ð°Ñних шаблонів проектів." msgid "Customize colors" msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ¾Ð»ÑŒÐ¾Ñ€Ñ–Ð²" @@ -2993,9 +3186,9 @@ msgid "Customize how Google Code email addresses and usernames are imported into msgstr "Ðалаштуйте, Ñк адреÑи електронної пошти та імена кориÑтувачів Google Code імпортуютьÑÑ Ð² GitLab. Ðа наÑтупному кроці ви зможете вибрати проекти, Ñкі потрібно імпортувати." msgid "Customize language and region related settings." -msgstr "" +msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¼Ð¾Ð²Ð¸ Ñ– параметрів, пов'Ñзаних із регіоном." -msgid "Customize your merge request approval settings." +msgid "Customize your issue restrictions." msgstr "" msgid "Customize your pipeline configuration, view your pipeline status and coverage report." @@ -3029,7 +3222,7 @@ msgid "CycleAnalyticsStage|Test" msgstr "ТеÑтуваннÑ" msgid "DNS" -msgstr "" +msgstr "DNS" msgid "Dashboard" msgstr "Панель керуваннÑ" @@ -3041,7 +3234,7 @@ msgid "DashboardProjects|Personal" msgstr "ОÑобиÑÑ‚Ñ–" msgid "Data is still calculating..." -msgstr "" +msgstr "Дані вÑе ще обчиÑлюютьÑÑ..." msgid "Date picker" msgstr "Вибір дати" @@ -3056,7 +3249,7 @@ msgid "December" msgstr "грудень" msgid "Decline" -msgstr "" +msgstr "Відхилити" msgid "Decline and sign out" msgstr "Відхити та вийти" @@ -3068,10 +3261,10 @@ msgid "Default classification label" msgstr "Мітка клаÑифікації за замовчуваннÑм" msgid "Default first day of the week" -msgstr "" +msgstr "Перший день Ñ‚Ð¸Ð¶Ð½Ñ Ð·Ð° замовчуваннÑм" msgid "Default first day of the week in calendars and date pickers." -msgstr "" +msgstr "Перший день Ñ‚Ð¸Ð¶Ð½Ñ Ð·Ð° замовчуваннÑм в календарÑÑ… та при виборі дати." msgid "Default: Directly import the Google Code email address or username" msgstr "За замовчуваннÑм: безпоÑередньо імпортувати адреÑу електронної пошти або ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача Google Code" @@ -3083,7 +3276,7 @@ msgid "Define a custom pattern with cron syntax" msgstr "Визначте влаÑний шаблон за допомогою ÑинтакÑиÑу cron" msgid "Define environments in the deploy stage(s) in <code>.gitlab-ci.yml</code> to track deployments here." -msgstr "" +msgstr "Визначте Ñередовища на Ñтадії Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ Ñƒ <code>.gitlab-ci.yml</code> щоб відÑтежувати Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ Ñ‚ÑƒÑ‚." msgid "DelayedJobs|Are you sure you want to run %{jobName} immediately? Otherwise this job will run automatically after it's timer finishes." msgstr "Ви впевнені, що ви хочете запуÑтити %{jobName} відразу? Ð’ іншому випадку це Ð·Ð°Ð²Ð´Ð°Ð½Ð½Ñ Ð±ÑƒÐ´Ðµ виконано автоматично по завершенню таймера." @@ -3116,10 +3309,10 @@ msgid "Delete list" msgstr "Видалити ÑпиÑок" msgid "Delete source branch" -msgstr "" +msgstr "Видалити гілку-джерело" msgid "Delete this attachment" -msgstr "" +msgstr "Видалити це вкладеннÑ" msgid "Deleted" msgstr "Видалено" @@ -3258,7 +3451,7 @@ msgid "DeployTokens|Your new project deploy token has been created." msgstr "Створено ваш новий токен Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ." msgid "Deployed" -msgstr "" +msgstr "Розгорнуто" msgid "Deployed to" msgstr "Розгорнуто на" @@ -3281,6 +3474,9 @@ msgstr "Шаблони опиÑу дозволÑÑŽÑ‚ÑŒ визначити кон msgid "Description:" msgstr "ОпиÑ:" +msgid "Designs" +msgstr "" + msgid "Destroy" msgstr "Знищити" @@ -3288,7 +3484,7 @@ msgid "Details" msgstr "Деталі" msgid "Details (default)" -msgstr "" +msgstr "Деталі (за замовчуваннÑм)" msgid "Detect host keys" msgstr "ВиÑÐ²Ð»ÐµÐ½Ð½Ñ ÐºÐ»ÑŽÑ‡Ñ–Ð² хоÑта" @@ -3321,10 +3517,10 @@ msgid "Disable group Runners" msgstr "Вимкнути групові Runner'и" msgid "Disable shared Runners" -msgstr "" +msgstr "Вимкнути загальні Runner'и" msgid "Disabled" -msgstr "" +msgstr "Вимкнено" msgid "Discard" msgstr "Відхилити" @@ -3348,22 +3544,25 @@ msgid "Discard review" msgstr "Відхилити перевірку" msgid "Discover GitLab Geo" -msgstr "" +msgstr "Відкрийте GitLab Geo" msgid "Discover projects, groups and snippets. Share your projects with others" msgstr "Відкрийте Ð´Ð»Ñ Ñебе групи, проекти та фрагменти коду. ПоділітьÑÑ Ñвоїми проектами з іншими" msgid "Discuss a specific suggestion or question" -msgstr "" +msgstr "Обговорити конкретну пропозицію чи питаннÑ" msgid "Discuss a specific suggestion or question that needs to be resolved" -msgstr "" +msgstr "Обговорити конкретну пропозицію або питаннÑ, що необхідно вирішити" + +msgid "Discussion" +msgstr "ОбговореннÑ" msgid "Dismiss" msgstr "Відхилити" msgid "Dismiss ConvDev introduction" -msgstr "" +msgstr "Відхилити вÑтуп до ConvDev" msgid "Dismiss Cycle Analytics introduction box" msgstr "Відхилити блок вÑтупу до Ðналитики Циклу" @@ -3393,7 +3592,7 @@ msgid "Download" msgstr "Завантажити" msgid "Download artifacts" -msgstr "" +msgstr "Завантажити артефакти" msgid "Download asset" msgstr "" @@ -3441,13 +3640,16 @@ msgid "Edit" msgstr "Редагувати" msgid "Edit %{name}" -msgstr "" +msgstr "Редагувати %{name}" + +msgid "Edit Deploy Key" +msgstr "Редагувати ключ Ð´Ð»Ñ Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ" msgid "Edit Label" msgstr "Редагувати мітку" msgid "Edit Milestone" -msgstr "" +msgstr "Редагувати етап" msgid "Edit Pipeline Schedule %{id}" msgstr "Редагувати Розклад Конвеєра %{id}" @@ -3459,10 +3661,13 @@ msgid "Edit application" msgstr "Редагувати заÑтоÑунок" msgid "Edit comment" -msgstr "" +msgstr "Редагувати коментар" msgid "Edit environment" -msgstr "" +msgstr "Редагувати Ñередовище" + +msgid "Edit file" +msgstr "Редагувати файл" msgid "Edit files in the editor and commit changes here" msgstr "Редагуйте файли в редакторі Ñ– закомітьте зміни тут" @@ -3474,6 +3679,9 @@ msgid "Edit identity for %{user_name}" msgstr "Редагувати ідентифікацію Ð´Ð»Ñ %{user_name}" msgid "Edit issues" +msgstr "Редагувати задачі" + +msgid "Edit public deploy key" msgstr "" msgid "Elasticsearch" @@ -3494,9 +3702,12 @@ msgstr "ÐдреÑи електронної пошти" msgid "Embed" msgstr "Вбудувати" -msgid "Empty file" +msgid "Emojis|Something went wrong while loading emojis." msgstr "" +msgid "Empty file" +msgstr "Порожній файл" + msgid "Enable" msgstr "Увімкнути" @@ -3522,7 +3733,7 @@ msgid "Enable classification control using an external service" msgstr "Увімкнути контроль за клаÑифікацією за допомогою зовнішньої Ñлужби" msgid "Enable error tracking" -msgstr "" +msgstr "Увімкнути відÑÑ‚ÐµÐ¶ÐµÐ½Ð½Ñ Ð¿Ð¾Ð¼Ð¸Ð»Ð¾Ðº" msgid "Enable for this project" msgstr "Увімкнути Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ проекту" @@ -3530,6 +3741,9 @@ msgstr "Увімкнути Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ проекту" msgid "Enable group Runners" msgstr "Увімкнути групові Runner'и" +msgid "Enable header and footer in emails" +msgstr "" + msgid "Enable or disable the Pseudonymizer data collection." msgstr "Увімкнути чи вимкнути збір даних Ð´Ð»Ñ Pseudonymizer." @@ -3540,16 +3754,16 @@ msgid "Enable reCAPTCHA or Akismet and set IP limits." msgstr "Увімкнути reCAPTCHA або Akismet та вÑтановити Ð¾Ð±Ð¼ÐµÐ¶ÐµÐ½Ð½Ñ Ð¿Ð¾ IP." msgid "Enable self approval of merge requests" -msgstr "" +msgstr "Дозволити ÑамоÑтійне Ð·Ð°Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñ‚Ñ–Ð² на злиттÑ" msgid "Enable shared Runners" -msgstr "" +msgstr "Увімкнути загальні Runner'и" msgid "Enable the Performance Bar for a given group." msgstr "Увімкнути панель продуктивноÑÑ‚Ñ– Ð´Ð»Ñ Ð´Ð°Ð½Ð¾Ñ— групи." msgid "Enable two-factor authentication" -msgstr "" +msgstr "Увімкнути двофакторну автентифікацію" msgid "Enable usage ping" msgstr "Увімкнути викориÑÑ‚Ð°Ð½Ð½Ñ ping" @@ -3566,6 +3780,9 @@ msgstr "ЗавершуєтьÑÑ Ð¾ (за Грінвічем)" msgid "Enforce SSO-only authentication for this group" msgstr "" +msgid "Enforce users to have dedicated group managed accounts for this group" +msgstr "" + msgid "Enforced SSO" msgstr "" @@ -3584,26 +3801,23 @@ msgstr "Введіть Ð¾Ð¿Ð¸Ñ Ð·Ð°Ð¿Ð¸Ñ‚Ñƒ на злиттÑ" msgid "Enter the merge request title" msgstr "Введіть назву запиту на злиттÑ" -msgid "Enter your Sentry API URL" -msgstr "" - msgid "Environment variables" -msgstr "" +msgstr "Змінні Ñередовища" msgid "Environment variables are applied to environments via the runner. They can be protected by only exposing them to protected branches or tags. You can use environment variables for passwords, secret keys, or whatever you want." msgstr "" msgid "Environment variables are configured by your administrator to be %{link_start}protected%{link_end} by default" -msgstr "" +msgstr "Змінні Ñередовища налаштовані адмініÑтратором бути %{link_start}захищеними%{link_end} за замовчуваннÑм" msgid "Environment:" -msgstr "" +msgstr "Середовище:" msgid "Environments" msgstr "Середовища" msgid "Environments allow you to track deployments of your application %{link_to_read_more}." -msgstr "" +msgstr "Середовища дозволÑÑŽÑ‚ÑŒ відÑтежувати Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ Ð²Ð°ÑˆÐ¾Ð³Ð¾ заÑтоÑунку %{link_to_read_more}." msgid "Environments|An error occurred while fetching the environments." msgstr "Виникла помилка при завантаженні Ñередовищ." @@ -3611,6 +3825,12 @@ msgstr "Виникла помилка при завантаженні Ñеред msgid "Environments|An error occurred while making the request." msgstr "Під Ñ‡Ð°Ñ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ Ð·Ð°Ð¿Ð¸Ñ‚Ñƒ ÑталаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°." +msgid "Environments|An error occurred while re-deploying the environment, please try again" +msgstr "" + +msgid "Environments|An error occurred while rolling back the environment, please try again" +msgstr "" + msgid "Environments|An error occurred while stopping the environment, please try again" msgstr "Виникла помилка під Ñ‡Ð°Ñ Ð·ÑƒÐ¿Ð¸Ð½ÐºÐ¸ Ñередовища, будь лаÑка, Ñпробуйте ще раз" @@ -3662,15 +3882,33 @@ msgstr "Відкрити працююче Ñередовище" msgid "Environments|Pod logs from" msgstr "Журнал Pod’а" +msgid "Environments|Re-deploy" +msgstr "Повторно розгорнути" + +msgid "Environments|Re-deploy environment %{environment_name}?" +msgstr "" + +msgid "Environments|Re-deploy environment %{name}?" +msgstr "" + msgid "Environments|Re-deploy to environment" msgstr "Повторно розгорнути в Ñередовищі" msgid "Environments|Read more about environments" msgstr "ДізнайтеÑÑ Ð±Ñ–Ð»ÑŒÑˆÐµ про Ñередовища" +msgid "Environments|Rollback" +msgstr "" + msgid "Environments|Rollback environment" msgstr "Відкотити Ñередовище" +msgid "Environments|Rollback environment %{environment_name}?" +msgstr "" + +msgid "Environments|Rollback environment %{name}?" +msgstr "" + msgid "Environments|Show all" msgstr "Показати вÑÑ–" @@ -3681,6 +3919,18 @@ msgid "Environments|Stop environment" msgstr "Зупинити Ñередовище" msgid "Environments|Stopping" +msgstr "Зупинка" + +msgid "Environments|This action will relaunch the job for commit %{commit_id}, putting the environment in a previous version. Are you sure you want to continue?" +msgstr "" + +msgid "Environments|This action will relaunch the job for commit %{linkStart}%{commitId}%{linkEnd}, putting the environment in a previous version. Are you sure you want to continue?" +msgstr "" + +msgid "Environments|This action will run the job defined by %{name} for commit %{linkStart}%{commitId}%{linkEnd} putting the environment in a previous version. You can revert it by re-deploying the latest version of your application. Are you sure you want to continue?" +msgstr "" + +msgid "Environments|This action will run the job defined by staging for commit %{commit_id}, putting the environment in a previous version. You can revert it by re-deploying the latest version of your application. Are you sure you want to continue?" msgstr "" msgid "Environments|Updated" @@ -3705,7 +3955,7 @@ msgid "Epics let you manage your portfolio of projects more efficiently and with msgstr "Епіки дозволÑÑŽÑ‚ÑŒ керувати вашим портфелем проектів ефективніше та з меншими зуÑиллÑми" msgid "Epics|An error occurred while saving the %{epicDateType} date" -msgstr "" +msgstr "СталаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° при збереженні дати %{epicDateType}" msgid "Epics|How can I solve this?" msgstr "Як Ñ Ð¼Ð¾Ð¶Ñƒ це вирішити?" @@ -3732,13 +3982,16 @@ msgid "Error Reporting and Logging" msgstr "Звіти про помилки та логуваннÑ" msgid "Error Tracking" -msgstr "" +msgstr "ВідÑÑ‚ÐµÐ¶ÐµÐ½Ð½Ñ Ð¿Ð¾Ð¼Ð¸Ð»Ð¾Ðº" + +msgid "Error creating a new path" +msgstr "Помилка при Ñтворенні нового шлÑху" msgid "Error creating epic" msgstr "Помилка при Ñтворенні епіку" msgid "Error deleting %{issuableType}" -msgstr "" +msgstr "Помилка при видаленні %{issuableType}" msgid "Error fetching contributors data." msgstr "Помилка Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… учаÑників." @@ -3783,29 +4036,56 @@ msgid "Error occurred when toggling the notification subscription" msgstr "СталаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° під Ñ‡Ð°Ñ Ð¿Ñ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð¿Ñ–Ð´Ð¿Ð¸Ñки на ÑповіщеннÑ" msgid "Error rendering markdown preview" -msgstr "" +msgstr "Помилка при попередньому переглÑді markdown" msgid "Error saving label update." msgstr "Помилка при збереженні мітки." msgid "Error updating %{issuableType}" -msgstr "" +msgstr "Помилка при оновленні %{issuableType}" msgid "Error updating status for all todos." -msgstr "Помилка Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ÑтатуÑу Ð´Ð»Ñ Ð²ÑÑ–Ñ… задач." +msgstr "Помилка Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ÑтатуÑу Ð´Ð»Ñ Ð²ÑÑ–Ñ… нагадувань." msgid "Error updating todo status." -msgstr "Помилка при оновленні ÑтатуÑу задачі." +msgstr "Помилка при оновленні ÑтатуÑу нагадуваннÑ." msgid "Error while loading the merge request. Please try again." msgstr "Помилка при завантаженні запита на злиттÑ. Будь лаÑка, Ñпробуйте знову." msgid "Error:" +msgstr "Помилка:" + +msgid "ErrorTracking|Active" msgstr "" -msgid "Errors" +msgid "ErrorTracking|After adding your Auth Token, use the 'Connect' button to load projects" msgstr "" +msgid "ErrorTracking|Auth Token" +msgstr "" + +msgid "ErrorTracking|Click 'Connect' to re-establish the connection to Sentry and activate the dropdown." +msgstr "" + +msgid "ErrorTracking|Connection has failed. Re-check Auth Token and try again." +msgstr "" + +msgid "ErrorTracking|Find your hostname in your Sentry account settings page" +msgstr "" + +msgid "ErrorTracking|No projects available" +msgstr "" + +msgid "ErrorTracking|Select project" +msgstr "" + +msgid "ErrorTracking|To enable project selection, enter a valid Auth Token" +msgstr "" + +msgid "Errors" +msgstr "Помилки" + msgid "Estimated" msgstr "За оцінками" @@ -3828,10 +4108,10 @@ msgid "EventFilterBy|Filter by team" msgstr "Фільтрувати по команді" msgid "Events" -msgstr "" +msgstr "Події" msgid "Every %{action} attempt has failed: %{job_error_message}. Please try again." -msgstr "" +msgstr "УÑÑ– Ñпроби %{action} закінчилиÑÑ Ð½ÐµÐ²Ð´Ð°Ñ‡ÐµÑŽ: %{job_error_message}. Будь лаÑка, Ñпробуйте знову." msgid "Every day (at 4:00am)" msgstr "Кожен день (в 4:00 ранку)" @@ -3843,37 +4123,37 @@ msgid "Every week (Sundays at 4:00am)" msgstr "Ð©Ð¾Ñ‚Ð¸Ð¶Ð½Ñ (в неділю о 4:00 ранку)" msgid "Everyone" -msgstr "" +msgstr "Будь-хто" msgid "Everyone can contribute" msgstr "Кожен може зробити Ñвій внеÑок" msgid "Everything you need to create a GitLab Pages site using GitBook." -msgstr "" +msgstr "Ð’Ñе, що потрібно Ð´Ð»Ñ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñайту на GitLab Pages за допомогою GitBook." msgid "Everything you need to create a GitLab Pages site using Hexo." -msgstr "" +msgstr "Ð’Ñе, що потрібно Ð´Ð»Ñ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñайту на GitLab Pages за допомогою Hexo." msgid "Everything you need to create a GitLab Pages site using Hugo." -msgstr "" +msgstr "Ð’Ñе, що потрібно Ð´Ð»Ñ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñайту на GitLab Pages за допомогою Hugo." msgid "Everything you need to create a GitLab Pages site using Jekyll." -msgstr "" +msgstr "Ð’Ñе, що потрібно Ð´Ð»Ñ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñайту на GitLab Pages за допомогою Jekyll." msgid "Everything you need to create a GitLab Pages site using plain HTML." -msgstr "" +msgstr "Ð’Ñе, що потрібно Ð´Ð»Ñ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñайту на GitLab Pages за допомогою проÑтого HTML." msgid "Except policy:" msgstr "" msgid "Existing Git repository" -msgstr "" +msgstr "ІÑнуючий репозиторій Git" msgid "Existing folder" -msgstr "" +msgstr "ІÑнуюча папка" msgid "Existing members and groups" -msgstr "" +msgstr "ІÑнуючі учаÑники та групи" msgid "Expand" msgstr "Розгорнути" @@ -3881,6 +4161,9 @@ msgstr "Розгорнути" msgid "Expand all" msgstr "Розгорнути вÑе" +msgid "Expand approvers" +msgstr "Розгорнути ÑпиÑок затверджуючих оÑіб" + msgid "Expand sidebar" msgstr "Розгорніть бічну панель" @@ -3915,22 +4198,22 @@ msgid "Explore public groups" msgstr "ПереглÑнути публічні групи" msgid "Export as CSV" -msgstr "" +msgstr "ЕкÑпортувати Ñк CSV" msgid "Export issues" -msgstr "" +msgstr "ЕкÑпортувати задачі" msgid "External Classification Policy Authorization" msgstr "Ð—Ð¾Ð²Ð½Ñ–ÑˆÐ½Ñ ÐšÐ»Ð°ÑÐ¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ ÐŸÐ¾Ð»Ñ–Ñ‚Ð¸ÐºÐ¸ Ðвторизації" msgid "External URL" -msgstr "" +msgstr "Зовнішній URL" msgid "External Wiki" -msgstr "" +msgstr "Ð—Ð¾Ð²Ð½Ñ–ÑˆÐ½Ñ Ð²Ñ–ÐºÑ–" msgid "External authentication" -msgstr "Ð—Ð¾Ð²Ð½Ñ–ÑˆÐ½Ñ Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ" +msgstr "Ð—Ð¾Ð²Ð½Ñ–ÑˆÐ½Ñ Ð°Ð²Ñ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ" msgid "External authorization denied access to this project" msgstr "Ð—Ð¾Ð²Ð½Ñ–ÑˆÐ½Ñ Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ñ–Ñ Ð·Ð°Ð±Ð¾Ñ€Ð¾Ð½Ð¸Ð»Ð° доÑтуп до цього проекту" @@ -3968,7 +4251,7 @@ msgstr "Ðе вдалоÑÑ Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ð½ÑƒÑ‚Ð¸ до" msgid "Failed to load emoji list." msgstr "Ðе вдалоÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ ÑпиÑок Ñмайликів." -msgid "Failed to load errors from Sentry" +msgid "Failed to load errors from Sentry. Error message: %{errorMessage}" msgstr "" msgid "Failed to remove issue from board, please try again." @@ -4005,10 +4288,10 @@ msgid "Feature Flags" msgstr "Перемикачі функцій" msgid "FeatureFlags|* (All Environments)" -msgstr "" +msgstr "* (УÑÑ– Ñередовища)" msgid "FeatureFlags|* (All environments)" -msgstr "" +msgstr "* (вÑÑ– Ñередовища)" msgid "FeatureFlags|API URL" msgstr "URL-адреÑа API" @@ -4026,49 +4309,46 @@ msgid "FeatureFlags|Create feature flag" msgstr "Створити перемикач функції" msgid "FeatureFlags|Delete %{name}?" -msgstr "" +msgstr "Видалити %{name}?" msgid "FeatureFlags|Delete feature flag" -msgstr "" +msgstr "Вимкнути перемикач функції" msgid "FeatureFlags|Description" msgstr "ОпиÑ" -msgid "FeatureFlags|Edit %{feature_flag_name}" -msgstr "Редагувати %{feature_flag_name}" - msgid "FeatureFlags|Edit Feature Flag" msgstr "Редагувати перемикач функції" msgid "FeatureFlags|Environment Spec" -msgstr "" +msgstr "Ð¡Ð¿ÐµÑ†Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ Ñередовища" msgid "FeatureFlags|Environment Specs" -msgstr "" +msgstr "Специфікації Ñередовищ" msgid "FeatureFlags|Feature Flag" msgstr "Перемикач функції" msgid "FeatureFlags|Feature Flag behavior is built up by creating a set of rules to define the status of target environments. A default wildcare rule %{codeStart}*%{codeEnd} for %{boldStart}All Environments%{boldEnd} is set, and you are able to add as many rules as you need by choosing environment specs below. You can toggle the behavior for each of your rules to set them %{boldStart}Active%{boldEnd} or %{boldStart}Inactive%{boldEnd}." -msgstr "" +msgstr "Поведінка перемикачів функцій ÑтворюєтьÑÑ ÑˆÐ»Ñхом ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð½Ð°Ð±Ð¾Ñ€Ñƒ правил Ð´Ð»Ñ Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñтану цільових Ñередовищ. Правило за замовчуваннÑм %{codeStart}*%{codeEnd} Ð´Ð»Ñ %{boldStart}Ð’ÑÑ–Ñ… Ñередовищ%{boldEnd} вже налаштовано, Ñ– ви можете додати Ñтільки правил, Ñкільки вам потрібно, шлÑхом Ð·Ð°Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ñпецифікацій Ñередовищ нижче. Ви можете перемикати Ñтан Ð´Ð»Ñ ÐºÐ¾Ð¶Ð½Ð¾Ð³Ð¾ з ваших правил, щоб зробити Ñ—Ñ… %{boldStart}Ðктивними%{boldEnd} або %{boldStart}Ðеактивними%{boldEnd}." msgid "FeatureFlags|Feature Flags" -msgstr "" +msgstr "Перемикачі функцій" msgid "FeatureFlags|Feature Flags allow you to configure your code into different flavors by dynamically toggling certain functionality." -msgstr "" +msgstr "Перемикачі функцій дозволÑÑŽÑ‚ÑŒ налаштовувати ваш код по-різному за допомогою динамічного ÑƒÐ²Ñ–Ð¼ÐºÐ½ÐµÐ½Ð½Ñ Ñ‡Ð¸ Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ð½Ñ Ð¿ÐµÐ²Ð½Ð¾Ñ— функціональноÑÑ‚Ñ–." msgid "FeatureFlags|Feature flag %{name} will be removed. Are you sure?" -msgstr "" +msgstr "Перемикач функції %{name} буде видалено. Ви впевнені?" msgid "FeatureFlags|Get started with Feature Flags" -msgstr "" +msgstr "Розпочати роботу з перемикачами функцій" msgid "FeatureFlags|Inactive" msgstr "Ðеактивний" msgid "FeatureFlags|Inactive flag for %{scope}" -msgstr "" +msgstr "Ðеактивний перемикач функції Ð´Ð»Ñ %{scope}" msgid "FeatureFlags|Install a %{docs_link_start}compatible client library%{docs_link_end} and specify the API URL, application name, and instance ID during the configuration setup." msgstr "Ð’Ñтановіть %{docs_link_start}ÑуміÑну клієнтÑьку бібліотеку%{docs_link_end} Ñ– вкажіть URL адреÑу API, назву заÑтоÑунку та ідентифікатор інÑтанÑа під Ñ‡Ð°Ñ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ." @@ -4077,10 +4357,10 @@ msgid "FeatureFlags|Instance ID" msgstr "Ідентифікатор ІнÑтанÑу" msgid "FeatureFlags|Loading Feature Flags" -msgstr "" +msgstr "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð¿ÐµÑ€ÐµÐ¼Ð¸ÐºÐ°Ñ‡Ñ–Ð² функцій" msgid "FeatureFlags|More Information" -msgstr "" +msgstr "Більше інформації" msgid "FeatureFlags|More information" msgstr "Більше інформації" @@ -4094,26 +4374,23 @@ msgstr "Ðовий" msgid "FeatureFlags|New Feature Flag" msgstr "Ðовий перемикач функції" -msgid "FeatureFlags|Save changes" -msgstr "Зберегти зміни" - msgid "FeatureFlags|Status" msgstr "СтатуÑ" msgid "FeatureFlags|Target environments" -msgstr "" +msgstr "Цільові Ñередовища" msgid "FeatureFlags|There are no active Feature Flags" -msgstr "" +msgstr "Ðемає активних перемикачів функцій" msgid "FeatureFlags|There are no inactive Feature Flags" -msgstr "" +msgstr "Ðемає неактивних перемикачів функцій" msgid "FeatureFlags|There was an error fetching the feature flags." -msgstr "" +msgstr "Помилка при отриманні перемикачів функцій." msgid "FeatureFlags|Try again in a few moments or contact your support team." -msgstr "" +msgstr "Повторіть Ñпробу через деÑкий Ñ‡Ð°Ñ Ð°Ð±Ð¾ звернітьÑÑ Ð´Ð¾ вашої Ñлужби підтримки." msgid "Feb" msgstr "лют." @@ -4126,31 +4403,31 @@ msgstr "ÐŸÐ¾Ð»Ñ Ð½Ð° цій Ñторінці зараз недоÑтупні д msgid "File" msgid_plural "Files" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "Файл" +msgstr[1] "Файли" +msgstr[2] "Файлів" +msgstr[3] "Файлів" msgid "File added" -msgstr "" +msgstr "Файл додано" msgid "File browser" -msgstr "" +msgstr "Файловий менеджер" msgid "File deleted" -msgstr "" +msgstr "Файл видалено" msgid "File mode changed from %{a_mode} to %{b_mode}" msgstr "" msgid "File moved" -msgstr "" +msgstr "Файл переміщено" msgid "File templates" msgstr "Шаблони файлів" msgid "File upload error." -msgstr "" +msgstr "Помилка Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ." msgid "Files" msgstr "Файли" @@ -4168,31 +4445,28 @@ msgid "Filter by %{issuable_type} that are currently opened." msgstr "Фільтрувати відкриті за %{issuable_type}." msgid "Filter by commit message" -msgstr "Фільтрувати за коміт-повідомленнÑм" +msgstr "Фільтрувати за повідомленнÑм Ð´Ð»Ñ ÐºÐ¾Ð¼Ñ–Ñ‚Ñƒ" msgid "Filter by milestone name" -msgstr "" +msgstr "Фільтрувати за назвою етапу" msgid "Filter by two-factor authentication" -msgstr "" +msgstr "Фільтрувати за двофакторною автентифікацією" msgid "Filter results by group" -msgstr "" +msgstr "Фільтрувати результати за групою" msgid "Filter results by project" -msgstr "" +msgstr "Фільтрувати результати за проектом" msgid "Filter..." msgstr "Фільтр..." -msgid "Find and manage Auth Tokens in your Sentry account settings page." -msgstr "" - msgid "Find by path" msgstr "Пошук по шлÑху" msgid "Find existing members by name" -msgstr "" +msgstr "Знайти Ñ–Ñнуючих учаÑників за ім'Ñм" msgid "Find file" msgstr "Знайти файл" @@ -4203,11 +4477,14 @@ msgstr "Знайдіть завантажений ZIP-файл Ñ– розпаку msgid "Find the newly extracted <code>Takeout/Google Code Project Hosting/GoogleCodeProjectHosting.json</code> file." msgstr "Знайдіть щойно розпакований <code>Takeout/Google Code Project Hosting/GoogleCodeProjectHosting.json</code> файл." +msgid "Fingerprint" +msgstr "" + msgid "Fingerprints" msgstr "Відбитки пальців" msgid "Finish editing this message first!" -msgstr "" +msgstr "Спочатку завершіть Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ Ñ†ÑŒÐ¾Ð³Ð¾ повідомленнÑ!" msgid "Finish review" msgstr "Завершити перевірку" @@ -4216,7 +4493,7 @@ msgid "Finished" msgstr "Завершено" msgid "First day of the week" -msgstr "" +msgstr "Перший день тижнÑ" msgid "FirstPushedBy|First" msgstr "Перший" @@ -4264,7 +4541,7 @@ msgid "For internal projects, any logged in user can view pipelines and access j msgstr "Ð”Ð»Ñ Ð²Ð½ÑƒÑ‚Ñ€Ñ–ÑˆÐ½Ñ–Ñ… проектів будь-Ñкий зареєÑтрований кориÑтувач може переглÑдати конвеєри та отримати доÑтуп до інформації про роботу (логи та артефакти)" msgid "For more info, read the documentation." -msgstr "" +msgstr "Ð”Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð´Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð¾Ñ— інформації читайте документацію." msgid "For more information, go to the " msgstr "Ð”Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð´Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð¾Ñ— інформації, відвідайте " @@ -4291,7 +4568,7 @@ msgid "Forking in progress" msgstr "ВідбуваєтьÑÑ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ„Ð¾Ñ€ÐºÑƒ" msgid "Forks" -msgstr "" +msgstr "Форки" msgid "Format" msgstr "Формат" @@ -4302,8 +4579,8 @@ msgstr "Знайдено помилки у вашому .gitlab-ci.yml:" msgid "Free Trial of GitLab.com Gold" msgstr "Безкоштовна пробна верÑÑ–Ñ GitLab.com Gold" -msgid "From %{provider_title}" -msgstr "З %{provider_title}" +msgid "From %{providerTitle}" +msgstr "" msgid "From Bitbucket" msgstr "З Bitbucket" @@ -4332,12 +4609,21 @@ msgstr "З етапів:" msgid "From the Kubernetes cluster details view, install Runner from the applications list" msgstr "Із Ñторінки деталей Kubernetes-клаÑтера, вÑтановіть runner зі ÑпиÑку заÑтоÑунків" +msgid "GPG Key ID:" +msgstr "" + msgid "GPG Keys" msgstr "GPG ключі" +msgid "GPG signature (loading...)" +msgstr "" + msgid "General" msgstr "Загальні" +msgid "General Settings" +msgstr "" + msgid "General pipelines" msgstr "Загальні конвеєри" @@ -4345,7 +4631,7 @@ msgid "Generate a default set of labels" msgstr "Створити Ñтандартний набір міток" msgid "Generate key" -msgstr "" +msgstr "Згенерувати ключ" msgid "Geo" msgstr "Geo" @@ -4362,6 +4648,9 @@ msgstr "Вузол не працює або зламаний." msgid "GeoNodeSyncStatus|Node is slow, overloaded, or it just recovered after an outage." msgstr "Вузол працює повільно, перевантажений або тільки що відновивÑÑ Ð¿Ñ–ÑÐ»Ñ Ð·Ð±Ð¾ÑŽ." +msgid "GeoNodes|Alternate URL" +msgstr "" + msgid "GeoNodes|Checksummed" msgstr "Із контрольною Ñумою" @@ -4426,7 +4715,7 @@ msgid "GeoNodes|New node" msgstr "Ðовий вузол" msgid "GeoNodes|Node Authentication was successfully repaired." -msgstr "Ðутентифікацію вузла уÑпішно полагоджено." +msgstr "Ðвтентифікацію вузла уÑпішно полагоджено." msgid "GeoNodes|Node was successfully removed." msgstr "Вузол уÑпішно видалено." @@ -4438,10 +4727,10 @@ msgid "GeoNodes|Out of sync" msgstr "РозÑинхронізовані" msgid "GeoNodes|Removing a primary node stops the sync process for all nodes. Syncing cannot be resumed without losing some data on all secondaries. In this case we would recommend setting up all nodes from scratch. Are you sure?" -msgstr "" +msgstr "Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð¾Ñновного вузла зупинÑÑ” Ð¿Ñ€Ð¾Ñ†ÐµÑ Ñинхронізації Ð´Ð»Ñ Ð²ÑÑ–Ñ… вузлів. Синхронізацію неможливо буде відновити без втрати деÑких даних на вÑÑ–Ñ… вторинних вузлах. У цьому випадку рекомендовано налаштувати вÑÑ– вузли з нулÑ. Ви впевнені?" msgid "GeoNodes|Removing a secondary node stops the sync process. It is not currently possible to add back the same node without losing some data. We only recommend setting up a new secondary node in this case. Are you sure?" -msgstr "" +msgstr "Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð²Ñ‚Ð¾Ñ€Ð¸Ð½Ð½Ð¾Ð³Ð¾ вузла зупинÑÑ” Ð¿Ñ€Ð¾Ñ†ÐµÑ Ñинхронізації. Ðаразі неможливо додати назад той Ñамий вузол без втрати деÑких даних. У цьому випадку рекомендовано Ñтворити новий вторинний вузол. Ви впевнені?" msgid "GeoNodes|Replication slot WAL" msgstr "Слот реплікації WAL" @@ -4516,7 +4805,7 @@ msgid "GeoNodes|Wikis verified with their counterparts on the Primary node" msgstr "Вікі перевірено із їхніми копіÑми на первинному вузлі" msgid "GeoNodes|With %{geo} you can install a special read-only and replicated instance anywhere. Before you add nodes, follow the %{instructions} in the exact order they appear." -msgstr "" +msgstr "З %{geo} ви можете вÑтановити будь-де Ñпеціальній реплікований інÑÑ‚Ð°Ð½Ñ Ð»Ð¸ÑˆÐµ Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ. Перед тим, Ñк додавати вузли, дотримайтеÑÑ %{instructions} в точному порÑдку." msgid "GeoNodes|You have configured Geo nodes using an insecure HTTP connection. We recommend the use of HTTPS." msgstr "Ви налаштували Geo-вузли через незахищене HTTP-з’єднаннÑ. Ми рекомендуємо викориÑтовувати HTTPS." @@ -4542,9 +4831,24 @@ msgstr "Ð’ÑÑ– проекти плануютьÑÑ Ð´Ð»Ñ Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð½Ð¾Ñ— пРmsgid "Geo|All projects are being scheduled for re-sync" msgstr "Ð’ÑÑ– проекти плануютьÑÑ Ð´Ð»Ñ Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð½Ð¾Ñ— Ñинхронізації" +msgid "Geo|Alternate URL" +msgstr "" + msgid "Geo|Batch operations" msgstr "Групові операції" +msgid "Geo|Choose which groups you wish to synchronize to this secondary node." +msgstr "" + +msgid "Geo|Control the maximum concurrency of LFS/attachment backfill for this secondary node" +msgstr "" + +msgid "Geo|Control the maximum concurrency of verification operations for this Geo node" +msgstr "" + +msgid "Geo|Control the minimum interval in days that a repository should be reverified for this primary node" +msgstr "" + msgid "Geo|Could not remove tracking entry for an existing project." msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ð·Ð°Ð¿Ð¸Ñ Ð²Ñ–Ð´ÑÑ‚ÐµÐ¶ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ñ–Ñнуючого проекту." @@ -4564,7 +4868,7 @@ msgid "Geo|In sync" msgstr "Синхронізовано" msgid "Geo|Last repository check run" -msgstr "" +msgstr "ОÑÑ‚Ð°Ð½Ð½Ñ Ð·Ð°Ð¿ÑƒÑк перевірки репозиторію" msgid "Geo|Last successful sync" msgstr "ОÑÑ‚Ð°Ð½Ð½Ñ ÑƒÑпішна ÑинхронізаціÑ" @@ -4603,7 +4907,7 @@ msgid "Geo|Projects in certain storage shards" msgstr "Проекти в певних Ñегментах Ñховищ" msgid "Geo|Re-verification interval" -msgstr "" +msgstr "Інтервал повторної перевірки" msgid "Geo|Recheck" msgstr "Повторна перевірка" @@ -4632,6 +4936,9 @@ msgstr "КількіÑÑ‚ÑŒ Ñпроб" msgid "Geo|Select groups to replicate." msgstr "Виберіть групи Ð´Ð»Ñ Ñ€ÐµÐ¿Ð»Ñ–ÐºÐ°Ñ†Ñ–Ñ—." +msgid "Geo|Selective synchronization" +msgstr "" + msgid "Geo|Shards to synchronize" msgstr "Сегменти Ð´Ð»Ñ Ñинхронізації" @@ -4644,12 +4951,21 @@ msgstr "Синхронізовано" msgid "Geo|Synchronization failed - %{error}" msgstr "Ð¡Ð¸Ð½Ñ…Ñ€Ð¾Ð½Ñ–Ð·Ð°Ñ†Ñ–Ñ Ð½ÐµÐ²Ð´Ð°Ð»Ð°: %{error}" +msgid "Geo|This is a primary node" +msgstr "" + +msgid "Geo|To support OAuth logins to this node at a different domain than URL" +msgstr "" + msgid "Geo|Tracking entry for project (%{project_id}) was successfully removed." msgstr "Ð—Ð°Ð¿Ð¸Ñ Ð²Ñ–Ð´ÑÑ‚ÐµÐ¶ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ (%{project_id}) уÑпішно видалено." msgid "Geo|Tracking entry will be removed. Are you sure?" msgstr "Буде видалено Ð·Ð°Ð¿Ð¸Ñ Ð¿Ñ€Ð¾ відÑтеженнÑ. Ви впевнені?" +msgid "Geo|URL" +msgstr "" + msgid "Geo|Unknown state" msgstr "Ðевідомий Ñтан" @@ -4669,7 +4985,7 @@ msgid "Geo|You are on a secondary, <b>read-only</b> Geo node. You may be able to msgstr "Ви знаходитеÑÑŒ на вторинному <b>лише Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ</b> Geo-вузлі. Ви зможете вноÑити лише обмежену кількіÑÑ‚ÑŒ змін та виконувати обмежений набір операцій з цієї Ñторінки." msgid "Geo|You need a different license to use Geo replication" -msgstr "Вам потрібна інша Ð»Ñ–Ñ†ÐµÐ½Ð·Ñ–Ñ Ð½Ð° викориÑÑ‚Ð°Ð½Ð½Ñ Ð³ÐµÐ¾Ð³Ñ€Ð°Ñ„Ñ–Ñ‡Ð½Ð¾Ñ— реплікації" +msgstr "Вам потрібна інша Ð»Ñ–Ñ†ÐµÐ½Ð·Ñ–Ñ Ð½Ð° викориÑÑ‚Ð°Ð½Ð½Ñ Geo реплікації" msgid "Geo|misconfigured" msgstr "неправильно налаштований" @@ -4684,16 +5000,16 @@ msgid "Get a free instance review" msgstr "Отримайте безкоштовну оцінку інÑтанÑа" msgid "Get started with error tracking" -msgstr "" +msgstr "Розпочати роботу з відÑтеженнÑм помилок" msgid "Getting started with releases" -msgstr "" +msgstr "Розпочати роботу з релізами" msgid "Git" msgstr "Git" msgid "Git global setup" -msgstr "" +msgstr "Глобальні Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Git" msgid "Git repository URL" msgstr "URL Git-репозиторіÑ" @@ -4762,20 +5078,29 @@ msgid "Gitea Import" msgstr "Імпорт з Gitea" msgid "Given access %{time_ago}" -msgstr "" +msgstr "Ðадано доÑтуп %{time_ago}" msgid "Go Back" msgstr "ПовернутиÑÑ" +msgid "Go Micro is a framework for micro service development." +msgstr "" + msgid "Go back" msgstr "ПовернутиÑÑ" +msgid "Go full screen" +msgstr "Ðа повний екран" + msgid "Go to" msgstr "Перейти до" msgid "Go to %{link_to_google_takeout}." msgstr "Перейти до %{link_to_google_takeout}." +msgid "Go to project" +msgstr "Перейти до проекту" + msgid "Google Code import" msgstr "Імпорт з Google Code" @@ -4783,13 +5108,13 @@ msgid "Google Takeout" msgstr "Google Takeout" msgid "Google authentication is not %{link_to_documentation}. Ask your GitLab administrator if you want to use this service." -msgstr "ÐÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ Google не %{link_to_documentation}. ПопроÑÑ–Ñ‚ÑŒ Ñвого адмініÑтратора GitLab, Ñкщо ви хочете ÑкориÑтатиÑÑ Ñ†Ð¸Ð¼ ÑервіÑом." +msgstr "ÐÐ²Ñ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ Google не %{link_to_documentation}. ПопроÑÑ–Ñ‚ÑŒ Ñвого адмініÑтратора GitLab, Ñкщо ви хочете ÑкориÑтатиÑÑ Ñ†Ð¸Ð¼ ÑервіÑом." msgid "Got it!" msgstr "Зрозуміло!" msgid "Grant access" -msgstr "" +msgstr "Ðадати доÑтуп" msgid "Graph" msgstr "Графік" @@ -4806,6 +5131,9 @@ msgstr "Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ð³Ñ€ÑƒÐ¿Ð¸ Git LFS:" msgid "Group ID" msgstr "Ідентифікатор групи" +msgid "Group ID: %{group_id}" +msgstr "" + msgid "Group Runners" msgstr "Групові Runner'и" @@ -4833,14 +5161,17 @@ msgstr "Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ групу:" msgid "Group maintainers can register group runners in the %{link}" msgstr "Керівники групи можуть зареєÑтрувати групові runner'и через %{link}" +msgid "Group managed accounts" +msgstr "" + msgid "Group name" msgstr "Ðазва групи" msgid "Group overview content" -msgstr "" +msgstr "ВміÑÑ‚ оглÑдової Ñторінки групи" msgid "Group:" -msgstr "" +msgstr "Група:" msgid "Group: %{group_name}" msgstr "Група: %{group_name}" @@ -4858,33 +5189,48 @@ msgid "GroupRoadmap|The roadmap shows the progress of your epics along a timelin msgstr "План-графік епіків відображає Ñтан ваших епіків у чаÑÑ–" msgid "GroupRoadmap|To view the roadmap, add a start or due date to one of your epics in this group or its subgroups; from %{startDate} to %{endDate}." -msgstr "" +msgstr "Ð”Ð»Ñ Ð¿ÐµÑ€ÐµÐ³Ð»Ñду плану-графіку, додайте дату початку чи Ð·Ð°ÐºÑ–Ð½Ñ‡ÐµÐ½Ð½Ñ Ð´Ð¾ одного з ваших епіків в цій групі або Ñ—Ñ— підгрупах; від %{startDate} до %{endDate}." msgid "GroupRoadmap|To widen your search, change or remove filters; from %{startDate} to %{endDate}." -msgstr "" +msgstr "Щоб розширити пошук, змініть або видаліть фільтри; від %{startDate} до %{endDate}." msgid "GroupRoadmap|Until %{dateWord}" msgstr "До %{dateWord}" +msgid "GroupSettings|Auto DevOps pipeline was updated for the group" +msgstr "" + +msgid "GroupSettings|Auto DevOps will automatically build, test and deploy your application based on a predefined Continuous Integration and Delivery configuration. %{auto_devops_start}Learn more about Auto DevOps%{auto_devops_end}" +msgstr "" + msgid "GroupSettings|Badges" msgstr "Значки" msgid "GroupSettings|Custom project templates" -msgstr "" +msgstr "ВлаÑні шаблони проектів" msgid "GroupSettings|Customize your group badges." msgstr "Ðалаштувати значки групи." +msgid "GroupSettings|Default to Auto DevOps pipeline for all projects within this group" +msgstr "" + msgid "GroupSettings|Learn more about badges." msgstr "ДізнайтеÑÑ Ð±Ñ–Ð»ÑŒÑˆÐµ про значки." msgid "GroupSettings|Learn more about group-level project templates." -msgstr "" +msgstr "Докладніше про шаблони проектів на рівні групи." msgid "GroupSettings|Prevent sharing a project within %{group} with other groups" msgstr "Заборонити Ñпільний доÑтуп до проекту в рамках %{group} з іншими групами" msgid "GroupSettings|Select a sub-group as the custom project template source for this group." +msgstr "Виберіть підгрупу Ñк джерело влаÑних шаблонів проектів Ð´Ð»Ñ Ñ†Ñ–Ñ”Ñ— групи." + +msgid "GroupSettings|The Auto DevOps pipeline will run if no alternative CI configuration file is found." +msgstr "" + +msgid "GroupSettings|There was a problem updating Auto DevOps pipeline: %{error_messages}." msgstr "" msgid "GroupSettings|This setting is applied on %{ancestor_group} and has been overridden on this subgroup." @@ -4912,7 +5258,7 @@ msgid "Groups can also be nested by creating %{subgroup_docs_link_start}subgroup msgstr "Групи також можуть бути вкладеними при викориÑтанні %{subgroup_docs_link_start}підгруп%{subgroup_docs_link_end}." msgid "Groups with access to <strong>%{project_name}</strong>" -msgstr "" +msgstr "Групи з доÑтупом до <strong>%{project_name}</strong>" msgid "GroupsDropdown|Frequently visited" msgstr "ЧаÑто відвідувані" @@ -5014,7 +5360,7 @@ msgid "Here is the public SSH key that needs to be added to the remote server. F msgstr "Це відкритий (публічний) SSH ключ, Ñкий потрібно додати на віддалений Ñервер. Ð”Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð´Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð¾Ñ— інформації, звернітьÑÑ Ð´Ð¾ документації." msgid "Hide file browser" -msgstr "" +msgstr "Сховати файловий менеджер" msgid "Hide host keys manual input" msgstr "Сховати ввід ключів хоÑта" @@ -5030,7 +5376,7 @@ msgstr[2] "Сховати значень" msgstr[3] "Сховати значень" msgid "Hide values" -msgstr "" +msgstr "Сховати значеннÑ" msgid "History" msgstr "ІÑторіÑ" @@ -5038,9 +5384,12 @@ msgstr "ІÑторіÑ" msgid "Housekeeping successfully started" msgstr "ÐžÑ‡Ð¸Ñ‰ÐµÐ½Ð½Ñ ÑƒÑпішно розпочато" -msgid "However, you are already a member of this %{member_source}. Sign in using a different account to accept the invitation." +msgid "Housekeeping, export, path, transfer, remove, archive." msgstr "" +msgid "However, you are already a member of this %{member_source}. Sign in using a different account to accept the invitation." +msgstr "Проте ви вже Ñ” учаÑником цього %{member_source}. Увійдіть, викориÑтовуючи інший обліковий запиÑ, щоб прийнÑти запрошеннÑ." + msgid "I accept the %{terms_link}" msgstr "Я приймаю %{terms_link}" @@ -5120,7 +5469,7 @@ msgid "If you already have files you can push them using the %{link_to_cli} belo msgstr "Якщо у Ð²Ð°Ñ ÑƒÐ¶Ðµ Ñ” файли, ви можете відправити Ñ—Ñ… за допомогою %{link_to_cli} нижче." msgid "If your HTTP repository is not publicly accessible, add authentication information to the URL: <code>https://username:password@gitlab.company.com/group/project.git</code>." -msgstr "Якщо ваш HTTP-репозиторій не Ñ” публічним, додайте дані Ð´Ð»Ñ Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ— до URL: <code>https://username:password@gitlab.company.com/group/project.git</code>." +msgstr "Якщо ваш HTTP-репозиторій не Ñ” публічним, додайте дані Ð´Ð»Ñ Ð°Ð²Ñ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ— до URL: <code>https://username:password@gitlab.company.com/group/project.git</code>." msgid "ImageDiffViewer|2-up" msgstr "2 поруч" @@ -5132,13 +5481,13 @@ msgid "ImageDiffViewer|Swipe" msgstr "Ðакладені (проведеннÑ)" msgid "Impersonation has been disabled" -msgstr "" +msgstr "УоÑÐ¾Ð±Ð»ÐµÐ½Ð½Ñ Ð±ÑƒÐ»Ð¾ вимкнено" msgid "Import" msgstr "Імпорт" msgid "Import CSV" -msgstr "" +msgstr "Імпортувати CSV" msgid "Import Projects from Gitea" msgstr "Імпортувати проекти з Gitea" @@ -5159,13 +5508,13 @@ msgid "Import in progress" msgstr "Імпорт триває" msgid "Import issues" -msgstr "" +msgstr "Імпорт задач" msgid "Import members" -msgstr "" +msgstr "Імпортувати учаÑників" msgid "Import members from another project" -msgstr "" +msgstr "Імпортувати учаÑників з іншого проекту" msgid "Import multiple repositories by uploading a manifest file." msgstr "Імпортувати кілька репозиторіїв, надіÑлавши файл маніфеÑту." @@ -5174,7 +5523,7 @@ msgid "Import project" msgstr "Імпорт проекту" msgid "Import project members" -msgstr "" +msgstr "Імпортувати учаÑників проекту" msgid "Import projects from Bitbucket" msgstr "Імпортувати проекти з Bitbucket" @@ -5203,9 +5552,24 @@ msgstr "Імпорт репозиторію" msgid "Import timed out. Import took longer than %{import_jobs_expiration} seconds" msgstr "" +msgid "Import/Export illustration" +msgstr "" + msgid "ImportButtons|Connect repositories from" msgstr "Підключити репозиторії із" +msgid "ImportProjects|Importing the project failed" +msgstr "" + +msgid "ImportProjects|Requesting your %{provider} repositories failed" +msgstr "" + +msgid "ImportProjects|Select the projects you want to import" +msgstr "" + +msgid "ImportProjects|Updating the imported projects failed" +msgstr "" + msgid "Improve Issue boards with GitLab Enterprise Edition." msgstr "Покращити дошки обговорень за допомогою верÑÑ–Ñ— GitLab Enterprise Edition." @@ -5228,19 +5592,19 @@ msgid "Include a Terms of Service agreement and Privacy Policy that all users mu msgstr "Включити угоду про Ð½Ð°Ð´Ð°Ð½Ð½Ñ Ð¿Ð¾Ñлуг та правила конфіденційноÑÑ‚Ñ–, Ñкі повинні прийнÑти вÑÑ– кориÑтувачі." msgid "Include merge request description" -msgstr "" +msgstr "Додайте Ð¾Ð¿Ð¸Ñ Ð·Ð°Ð¿Ð¸Ñ‚Ñƒ на злиттÑ" msgid "Include the username in the URL if required: <code>https://username@gitlab.company.com/group/project.git</code>." msgstr "Якщо необхідно додайте ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача в URL: <code>https: //username@gitlab.company.com/group/project.git</code>." msgid "Includes an MVC structure to help you get started." -msgstr "" +msgstr "Включає Ñтруктуру MVC, щоб допомогти вам розпочати роботу." msgid "Includes an MVC structure, Gemfile, Rakefile, along with many others, to help you get started." -msgstr "" +msgstr "Включає Ñтруктуру MVC, Gemfile, Rakefile, а також багато іншого, щоб допомогти вам розпочати роботу." msgid "Includes an MVC structure, mvnw and pom.xml to help you get started." -msgstr "" +msgstr "Включає Ñтруктуру MVC, mvnw Ñ– pom.xml, щоб допомогти вам розпочати роботу." msgid "Incompatible Project" msgstr "ÐеÑуміÑний проект" @@ -5257,7 +5621,16 @@ msgstr "Введіть ключі хоÑта вручну" msgid "Input your repository URL" msgstr "Введіть ваш URL репозиторію" +msgid "Insert a quote" +msgstr "Ð’Ñтавити цитату" + +msgid "Insert code" +msgstr "Ð’Ñтавити код" + msgid "Insert suggestion" +msgstr "Додати пропозицію" + +msgid "Insights" msgstr "" msgid "Install GitLab Runner" @@ -5292,7 +5665,7 @@ msgid "Interested parties can even contribute by pushing commits if they want to msgstr "Зацікавлені Ñторони за бажаннÑм можуть навіть робити внеÑки шлÑхом Ð²Ñ–Ð´Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð½Ñ ÐºÐ¾Ð¼Ñ–Ñ‚Ñ–Ð²." msgid "Internal" -msgstr "" +msgstr "Внутрішній" msgid "Internal - The group and any internal projects can be viewed by any logged in user." msgstr "Ð’Ð½ÑƒÑ‚Ñ€Ñ–ÑˆÐ½Ñ â€” будь-Ñкий автентифікований кориÑтувач має доÑтуп до цієї групи та уÑÑ–Ñ… Ñ—Ñ— внутрішніх проектів." @@ -5312,8 +5685,11 @@ msgstr "ПредÑтавлÑємо аналітику циклу" msgid "Introducing Your Conversational Development Index" msgstr "" +msgid "Invalid input, please avoid emojis" +msgstr "Ðекорректний ввід, будь лаÑка, уникайте Ñмайликів" + msgid "Invitation" -msgstr "" +msgstr "ЗапрошеннÑ" msgid "Invite" msgstr "ЗапрошеннÑ" @@ -5322,7 +5698,7 @@ msgid "Invite group" msgstr "" msgid "Invite member" -msgstr "" +msgstr "ЗапроÑити учаÑника" msgid "Invoke Count" msgstr "" @@ -5330,6 +5706,9 @@ msgstr "" msgid "Invoke Time" msgstr "" +msgid "IssuableStatus|Closed (%{moved_link_start}moved%{moved_link_end})" +msgstr "" + msgid "Issue" msgstr "Задача" @@ -5342,6 +5721,9 @@ msgstr "Режим фокуÑÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ð´Ð¾ÑˆÐºÐ¸ задач" msgid "Issue events" msgstr "Задачі" +msgid "Issue settings" +msgstr "" + msgid "IssueBoards|Board" msgstr "Дошка" @@ -5349,19 +5731,19 @@ msgid "IssueBoards|Boards" msgstr "Дошки" msgid "IssueBoards|Create new board" -msgstr "" +msgstr "Створити нову дошку" msgid "IssueBoards|Delete board" -msgstr "" +msgstr "Видалити дошку" msgid "IssueBoards|No matching boards found" -msgstr "" +msgstr "Ðе знайдено відповідних дошок" msgid "IssueBoards|Some of your boards are hidden, activate a license to see them again." -msgstr "" +msgstr "ДеÑкі з ваших дошок Ñ” прихованими, активуйте ліцензію, щоб побачити Ñ—Ñ… знову." msgid "IssueBoards|Switch board" -msgstr "" +msgstr "Перемкнути дошку" msgid "Issues" msgstr "Задачі" @@ -5372,8 +5754,8 @@ msgstr "Задачі можуть бути помилками, нагадуваРmsgid "Issues closed" msgstr "Задачі закриті" -msgid "Issues, merge requests, pushes and comments." -msgstr "Задачі, запити на злиттÑ, Ð²Ñ–Ð´Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð½Ñ ÐºÐ¾Ð´Ñƒ Ñ– коментарі." +msgid "Issues, merge requests, pushes, and comments." +msgstr "" msgid "IssuesAnalytics|After you begin creating issues for your projects, we can start tracking and displaying metrics for them" msgstr "ПіÑÐ»Ñ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð·Ð°Ð´Ð°Ñ‡ Ð´Ð»Ñ Ð²Ð°ÑˆÐ¸Ñ… проектів, ми зможемо почати відÑтежувати Ñ– відображати метрики Ð´Ð»Ñ Ð½Ð¸Ñ…" @@ -5400,7 +5782,7 @@ msgid "It must have a header row and at least two columns: the first column is t msgstr "" msgid "It's you" -msgstr "" +msgstr "Це ви" msgid "Jaeger URL" msgstr "URL-адреÑа Jaeger" @@ -5421,10 +5803,10 @@ msgid "Job has been erased" msgstr "Ð—Ð°Ð²Ð´Ð°Ð½Ð½Ñ Ð±ÑƒÐ»Ð¾ Ñтерте" msgid "Job is stuck. Check runners." -msgstr "" +msgstr "Ð—Ð°Ð²Ð´Ð°Ð½Ð½Ñ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¾Ð²Ð°Ð½Ðµ. Перевірте runner'и." msgid "Job was retried" -msgstr "" +msgstr "Ð—Ð°Ð²Ð´Ð°Ð½Ð½Ñ Ð±ÑƒÐ»Ð¾ перезапущене" msgid "Jobs" msgstr "ЗавданнÑ" @@ -5466,10 +5848,10 @@ msgid "Job|The artifacts were removed" msgstr "Ðртефакти були видалені" msgid "Job|The artifacts will be removed" -msgstr "" +msgstr "Ðртефакти будуть видалені" msgid "Job|This job is stuck because the project doesn't have any runners online assigned to it." -msgstr "" +msgstr "Це Ð·Ð°Ð²Ð´Ð°Ð½Ð½Ñ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¾Ð²Ð°Ð½Ðµ, тому що цей проект не має жодних runner'ів призначених Ð´Ð»Ñ Ð½ÑŒÐ¾Ð³Ð¾." msgid "Jul" msgstr "лип." @@ -5484,7 +5866,7 @@ msgid "June" msgstr "червень" msgid "Key (PEM)" -msgstr "" +msgstr "Ключ (PEM)" msgid "Kubernetes" msgstr "Kubernetes" @@ -5493,7 +5875,7 @@ msgid "Kubernetes Cluster" msgstr "КлаÑтер Kubernetes" msgid "Kubernetes Clusters" -msgstr "" +msgstr "КлаÑтери Kubernetes" msgid "Kubernetes cluster creation time exceeds timeout; %{timeout}" msgstr "ÐŸÐµÑ€ÐµÐ²Ð¸Ñ‰ÐµÐ½Ð½Ñ Ð»Ñ–Ð¼Ñ–Ñ‚Ñƒ чаÑу при Ñтворенні Kubernetes-клаÑтера; %{timeout}" @@ -5561,6 +5943,9 @@ msgstr "ПеренеÑти мітку" msgid "Labels|Promoting %{labelTitle} will make it available for all projects inside %{groupName}. Existing project labels with the same title will be merged. This action cannot be reversed." msgstr "ПеренеÑÐµÐ½Ð½Ñ %{labelTitle} на рівень групи зробить Ñ—Ñ— доÑтупною Ð´Ð»Ñ Ð²ÑÑ–Ñ… проектів в групі %{groupName}. ІÑнуючі проектні мітки із такими ж іменами будуть об'єднані. Дана Ð´Ñ–Ñ Ð½Ðµ може бути ÑкаÑована." +msgid "Language" +msgstr "Мова" + msgid "Large File Storage" msgstr "Сховище великих файлів (LFS)" @@ -5575,7 +5960,7 @@ msgid "Last Pipeline" msgstr "ОÑтанній Конвеєр" msgid "Last activity" -msgstr "" +msgstr "ОÑÑ‚Ð°Ð½Ð½Ñ Ð°ÐºÑ‚Ð¸Ð²Ð½Ñ–ÑÑ‚ÑŒ" msgid "Last commit" msgstr "ОÑтанній коміт" @@ -5611,7 +5996,7 @@ msgid "Latest changes" msgstr "ОÑтанні зміни" msgid "Latest pipeline for this branch" -msgstr "" +msgstr "ОÑтанній конвеєр Ð´Ð»Ñ Ñ†Ñ–Ñ”Ñ— гілки" msgid "Lead" msgstr "" @@ -5626,26 +6011,32 @@ msgid "Learn more about %{issue_boards_url}, to keep track of issues in multiple msgstr "ДізнайтеÑÑ Ð±Ñ–Ð»ÑŒÑˆÐµ про %{issue_boards_url}, щоб Ñтежити за задачами в кількох ÑпиÑках, викориÑтовуючи мітки, виконавців та етапи. Якщо вам чогоÑÑŒ не виÑтачає в дошках обговорень задач, Ñтворіть задачу на %{gitlab_issues_url}." msgid "Learn more about Auto DevOps" -msgstr "" +msgstr "ДізнайтеÑÑ Ð±Ñ–Ð»ÑŒÑˆÐµ про Auto DevOps" msgid "Learn more about Kubernetes" msgstr "ДізнайтеÑÑ Ð±Ñ–Ð»ÑŒÑˆÐµ про Kubernetes" msgid "Learn more about Web Terminal" +msgstr "ДізнатиÑÑ Ð±Ñ–Ð»ÑŒÑˆÐµ про Веб-термінал" + +msgid "Learn more about approvals." msgstr "" msgid "Learn more about custom project templates" -msgstr "" +msgstr "Докладніше про влаÑні шаблони проектів" msgid "Learn more about group-level project templates" -msgstr "" +msgstr "Докладніше про шаблони проектів на рівні групи" msgid "Learn more about incoming email addresses" -msgstr "" +msgstr "Докладніше про вхідні адреÑи електронної пошти" msgid "Learn more about protected branches" msgstr "ДізнайтеÑÑ Ð±Ñ–Ð»ÑŒÑˆÐµ про захищені гілки" +msgid "Learn more about signing commits" +msgstr "" + msgid "Learn more in the" msgstr "ДізнайтеÑÑŒ більше" @@ -5783,10 +6174,10 @@ msgid "Loading..." msgstr "ЗавантаженнÑ..." msgid "Loading…" -msgstr "" +msgstr "ЗавантаженнÑ…" msgid "Localization" -msgstr "" +msgstr "Регіональні налаштуваннÑ" msgid "Lock" msgstr "Блокувати" @@ -5821,6 +6212,21 @@ msgstr "Вхід за допомогою Ñмарт-картки" msgid "Logs" msgstr "Логи" +msgid "MRApprovals|Approved by" +msgstr "" + +msgid "MRApprovals|Approvers" +msgstr "Затверджуючі оÑоби" + +msgid "MRApprovals|Pending approvals" +msgstr "" + +msgid "MRDiff|Show changes only" +msgstr "" + +msgid "MRDiff|Show full file" +msgstr "" + msgid "Make everyone on your team more productive regardless of their location. GitLab Geo creates read-only mirrors of your GitLab instance so you can reduce the time it takes to clone and fetch large repos." msgstr "Зробіть кожного учаÑника команди більш продуктивним незалежно від його міÑцезнаходженнÑ. GitLab Geo Ñтворює копії \"тільки Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ\" вашого GitLab Ñервера, щоб Ñкоротити Ñ‡Ð°Ñ Ð´Ð»Ñ ÐºÐ»Ð¾Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ñ– Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ ÐºÐ¾Ð´Ñƒ з великих репозиторіїв." @@ -5855,7 +6261,7 @@ msgid "Manage project labels" msgstr "ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¼Ñ–Ñ‚ÐºÐ°Ð¼Ð¸ проекту" msgid "Manage two-factor authentication" -msgstr "" +msgstr "ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð²Ð¾Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð½Ð¾ÑŽ автентифікацією" msgid "Manage your group’s membership while adding another level of security with SAML." msgstr "Керуйте членÑтвом у вашій групі додаючи ще один рівень безпеки із SAML." @@ -5866,6 +6272,9 @@ msgstr "МаніфеÑÑ‚" msgid "Manifest file import" msgstr "Імпортувати файл маніфеÑту" +msgid "Manual job" +msgstr "" + msgid "Map a FogBugz account ID to a GitLab user" msgstr "Зв’Ñзати обліковий Ð·Ð°Ð¿Ð¸Ñ FogBugz з кориÑтувачем GitLab" @@ -5888,41 +6297,11 @@ msgid "Mark todo as done" msgstr "Відмітити Ð·Ð°Ð²Ð´Ð°Ð½Ð½Ñ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð¸Ð¼" msgid "Markdown" -msgstr "" +msgstr "Markdown" msgid "Markdown enabled" msgstr "Markdown увімкнено" -msgid "MarkdownToolbar|Add a bullet list" -msgstr "Додати ненумерований ÑпиÑок" - -msgid "MarkdownToolbar|Add a link" -msgstr "Додати поÑиланнÑ" - -msgid "MarkdownToolbar|Add a numbered list" -msgstr "Додати нумерований ÑпиÑок" - -msgid "MarkdownToolbar|Add a table" -msgstr "Додати таблицю" - -msgid "MarkdownToolbar|Add a task list" -msgstr "Додати ÑпиÑок завдань" - -msgid "MarkdownToolbar|Add bold text" -msgstr "Додати жирний текÑÑ‚" - -msgid "MarkdownToolbar|Add italic text" -msgstr "Додати курÑивний текÑÑ‚" - -msgid "MarkdownToolbar|Go full screen" -msgstr "Повний екран" - -msgid "MarkdownToolbar|Insert a quote" -msgstr "Ð’Ñтавити цитату" - -msgid "MarkdownToolbar|Insert code" -msgstr "Ð’Ñтавити код" - msgid "Maven Metadata" msgstr "Maven-метадані" @@ -5948,10 +6327,10 @@ msgid "Members" msgstr "КориÑтувачі" msgid "Members can be added by project <i>Maintainers</i> or <i>Owners</i>" -msgstr "" +msgstr "УчаÑники можуть будуть додані <i>Керівниками</i> або <i>ВлаÑниками</i> проекту" msgid "Members of <strong>%{project_name}</strong>" -msgstr "" +msgstr "УчаÑники <strong>%{project_name}</strong>" msgid "Members will be forwarded here when signing in to your group. Get this from your identity provider, where it can also be called \"SSO Service Location\", \"SAML Token Issuance Endpoint\", or \"SAML 2.0/W-Federation URL\"." msgstr "УчаÑники будуть перенаправлені Ñюди, коли будуть заходити до вашої групи. Отримайте його від Ñвого провайдера ідентифікації, де вона також може називатиÑÑ \"SSO Service Location\", \"SAML Token Issuance Endpoint\", або \"SAML 2.0/W-Federation URL\"." @@ -5966,15 +6345,18 @@ msgid "Merge Requests created" msgstr "Запит на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð±ÑƒÐ»Ð¾ Ñтворено" msgid "Merge commit message" -msgstr "" +msgstr "ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð»Ñ ÐºÐ¾Ð¼Ñ–Ñ‚Ñƒ-злиттÑ" msgid "Merge events" msgstr "Події злиттÑ" msgid "Merge immediately" -msgstr "" +msgstr "Злити негайно" msgid "Merge in progress" +msgstr "Ð—Ð»Ð¸Ñ‚Ñ‚Ñ Ð² процеÑÑ–" + +msgid "Merge pipelines will try to validate the post-merge result prior to merging" msgstr "" msgid "Merge request" @@ -5990,31 +6372,31 @@ msgid "Merge requests are a place to propose changes you've made to a project an msgstr "Запит на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ â€” це ÑпоÑіб запропонувати Ñвої зміни до проекту Ñ– обговорити Ñ—Ñ… із іншими" msgid "Merge when pipeline succeeds" -msgstr "" +msgstr "Злити, коли конвеєр уÑпішно завершитьÑÑ" msgid "MergeRequests|Add a reply" -msgstr "" +msgstr "Додати відповідь" msgid "MergeRequests|An error occurred while saving the draft comment." msgstr "Виникла помилка під Ñ‡Ð°Ñ Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð½Ñ Ñ‡ÐµÑ€Ð½ÐµÑ‚ÐºÐ¸ коментарÑ." msgid "MergeRequests|Discussion stays resolved" -msgstr "" +msgstr "ÐžÐ±Ð³Ð¾Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð·Ð°Ð»Ð¸ÑˆÐ°Ñ”Ñ‚ÑŒÑÑ Ð²Ð¸Ñ€Ñ–ÑˆÐµÐ½Ð¸Ð¼" msgid "MergeRequests|Discussion stays unresolved" -msgstr "" +msgstr "ÐžÐ±Ð³Ð¾Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð·Ð°Ð»Ð¸ÑˆÐ°Ñ”Ñ‚ÑŒÑÑ Ð½ÐµÐ²Ð¸Ñ€Ñ–ÑˆÐµÐ½Ð¸Ð¼" msgid "MergeRequests|Discussion will be resolved" -msgstr "" +msgstr "ÐžÐ±Ð³Ð¾Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð±ÑƒÐ´Ðµ вирішеним" msgid "MergeRequests|Discussion will be unresolved" -msgstr "" +msgstr "ÐžÐ±Ð³Ð¾Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð±ÑƒÐ´Ðµ невирішеним" msgid "MergeRequests|Jump to next unresolved discussion" -msgstr "" +msgstr "Перейти до наÑтупного невирішеного обговореннÑ" msgid "MergeRequests|Reply..." -msgstr "" +msgstr "ВідповіÑти..." msgid "MergeRequests|Resolve this discussion in a new issue" msgstr "Вирішити це Ð¾Ð±Ð³Ð¾Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð² новій задачі" @@ -6032,26 +6414,29 @@ msgid "MergeRequests|View replaced file @ %{commitId}" msgstr "ПереглÑнути замінений файл Ñтаном на %{commitId}" msgid "MergeRequests|commented on commit %{commitLink}" -msgstr "" +msgstr "прокоментував (-ла) коміт %{commitLink}" msgid "MergeRequests|started a discussion" -msgstr "" +msgstr "розпочав (-ла) обговореннÑ" msgid "MergeRequests|started a discussion on %{linkStart}an old version of the diff%{linkEnd}" -msgstr "" +msgstr "розпочав (-ла) Ð¾Ð±Ð³Ð¾Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ %{linkStart}Ñтарої верÑÑ–Ñ— порівнÑÐ½Ð½Ñ (diff)%{linkEnd}" msgid "MergeRequests|started a discussion on %{linkStart}the diff%{linkEnd}" -msgstr "" +msgstr "розпочав (-ла) Ð¾Ð±Ð³Ð¾Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ %{linkStart}порівнÑÐ½Ð½Ñ (diff)%{linkEnd}" msgid "MergeRequests|started a discussion on an outdated change in commit %{linkStart}%{commitId}%{linkEnd}" -msgstr "" +msgstr "розпочав (-ла) Ð¾Ð±Ð³Ð¾Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð·Ð°Ñтарілих змін в коміті %{linkStart}%{commitId}%{linkEnd}" msgid "MergeRequests|started a discussion on commit %{linkStart}%{commitId}%{linkEnd}" -msgstr "" +msgstr "розпочав (-ла) коміту %{linkStart}%{commitId}%{linkEnd}" msgid "MergeRequest| %{paragraphStart}changed the description %{descriptionChangedTimes} times %{timeDifferenceMinutes}%{paragraphEnd}" msgstr "%{paragraphStart} Ð¾Ð¿Ð¸Ñ Ð·Ð¼Ñ–Ð½ÐµÐ½Ð¾ %{descriptionChangedTimes} раз(а,ів) %{timeDifferenceMinutes}%{paragraphEnd}" +msgid "MergeRequest|Error loading full diff. Please try again." +msgstr "" + msgid "MergeRequest|Filter files" msgstr "Фільтр файлів" @@ -6059,7 +6444,7 @@ msgid "MergeRequest|No files found" msgstr "Файлів не знайдено" msgid "MergeRequest|Search files" -msgstr "" +msgstr "Пошук файлів" msgid "Merged" msgstr "Злито" @@ -6080,7 +6465,7 @@ msgid "Metrics and profiling" msgstr "Метрики та профілюваннÑ" msgid "Metrics for environment" -msgstr "" +msgstr "Метрики Ð´Ð»Ñ Ñередовища" msgid "Metrics|Check out the CI/CD documentation on deploying to an environment" msgstr "Перевірте документацію CI/CD щодо Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ Ð² Ñередовищі" @@ -6089,10 +6474,10 @@ msgid "Metrics|Create metric" msgstr "Створити метрику" msgid "Metrics|Delete metric" -msgstr "" +msgstr "Видалити метрику" msgid "Metrics|Delete metric?" -msgstr "" +msgstr "Видалити метрику?" msgid "Metrics|Edit metric" msgstr "Редагувати метрику" @@ -6104,7 +6489,7 @@ msgid "Metrics|For grouping similar metrics" msgstr "Ð”Ð»Ñ Ð³Ñ€ÑƒÐ¿ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾Ð´Ñ–Ð±Ð½Ð¸Ñ… метрик" msgid "Metrics|Label of the y-axis (usually the unit). The x-axis always represents time." -msgstr "" +msgstr "Мітка оÑÑ– - y (зазвичай Ð¾Ð´Ð¸Ð½Ð¸Ñ†Ñ Ð²Ð¸Ð¼Ñ–Ñ€ÑŽÐ²Ð°Ð½Ð½Ñ). ОÑÑ– - x завжди позначає чаÑ." msgid "Metrics|Learn about environments" msgstr "ДізнайтеÑÑ Ð±Ñ–Ð»ÑŒÑˆÐµ про Ñередовища" @@ -6122,14 +6507,11 @@ msgid "Metrics|No deployed environments" msgstr "Ðемає розгорнутих Ñередовищ" msgid "Metrics|PromQL query is valid" -msgstr "" +msgstr "Запит PromQL Ñ” дійÑним" msgid "Metrics|Prometheus Query Documentation" msgstr "Ð”Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ñ–Ñ Ð¿Ð¾ запитам Prometheus" -msgid "Metrics|System" -msgstr "СиÑтема" - msgid "Metrics|There was an error fetching the environments data, please try again" msgstr "ТрапилаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° під Ñ‡Ð°Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ— про Ñередовища. Будь лаÑка, Ñпробуйте ще раз" @@ -6140,7 +6522,7 @@ msgid "Metrics|There was an error getting environments information." msgstr "ТрапилаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° під Ñ‡Ð°Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ— про Ñередовища." msgid "Metrics|There was an error trying to validate your query" -msgstr "" +msgstr "Помилка при перевірці вашого запиту" msgid "Metrics|There was an error while retrieving metrics" msgstr "ТрапилаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° під Ñ‡Ð°Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð¼ÐµÑ‚Ñ€Ð¸Ðº" @@ -6164,7 +6546,7 @@ msgid "Metrics|Y-axis label" msgstr "Ðазва оÑÑ– Y" msgid "Metrics|You're about to permanently delete this metric. This cannot be undone." -msgstr "" +msgstr "Ви збираєтеÑÑ Ð¾Ñтаточно видалити цю метрику. Це не можна відмінити." msgid "Metrics|e.g. Throughput" msgstr "напр. пропуÑкна здатніÑÑ‚ÑŒ" @@ -6241,17 +6623,20 @@ msgstr "СкаÑувати" msgid "Modal|Close" msgstr "Закрити" +msgid "Modify commit message" +msgstr "Змінити Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð»Ñ ÐºÐ¾Ð¼Ñ–Ñ‚Ñ–Ð²" + msgid "Modify commit messages" -msgstr "" +msgstr "Змінити Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð»Ñ ÐºÐ¾Ð¼Ñ–Ñ‚Ñ–Ð²" msgid "Modify merge commit" -msgstr "" +msgstr "Змінити коміт-злиттÑ" msgid "Monday" -msgstr "" +msgstr "Понеділок" msgid "Monitor your errors by integrating with Sentry" -msgstr "" +msgstr "Моніторинг ваших помилок шлÑхом інтеграції із Sentry" msgid "Monitoring" msgstr "Моніторинг" @@ -6274,6 +6659,9 @@ msgstr "Детальніше" msgid "More information is available|here" msgstr "тут" +msgid "More than %{number_commits_distance} commits different with %{default_branch}" +msgstr "" + msgid "Most stars" msgstr "Ðайбільше в обраних" @@ -6298,6 +6686,9 @@ msgstr "Ðазвіть ваш індивідуальний ключ за допРmsgid "Name:" msgstr "Ім’Ñ:" +msgid "Naming, tags, avatar" +msgstr "" + msgid "Naming, visibility" msgstr "ÐайменуваннÑ, видиміÑÑ‚ÑŒ" @@ -6314,7 +6705,7 @@ msgid "Nav|Sign out and sign in with a different account" msgstr "Вийти Ñ– зайти під іншим обліковим запиÑом" msgid "Need help?" -msgstr "" +msgstr "Потрібна допомога?" msgid "Network" msgstr "Мережа" @@ -6329,7 +6720,7 @@ msgid "New Application" msgstr "Ðовий додаток" msgid "New Environment" -msgstr "" +msgstr "Ðове Ñередовище" msgid "New Group" msgstr "Ðова група" @@ -6348,9 +6739,12 @@ msgid "New Label" msgstr "Ðова мітка" msgid "New Milestone" -msgstr "" +msgstr "Ðовий етап" msgid "New Pages Domain" +msgstr "Ðовий домен Pages" + +msgid "New Password" msgstr "" msgid "New Pipeline Schedule" @@ -6359,20 +6753,20 @@ msgstr "Ðовий розклад Конвеєра" msgid "New Snippet" msgstr "Ðовий Ñніпет" -msgid "New Snippets" -msgstr "Ðові Ñніпети" - msgid "New branch" msgstr "Ðова гілка" msgid "New branch unavailable" msgstr "Ðова гілка недоÑтупна" +msgid "New deploy key" +msgstr "" + msgid "New directory" msgstr "Ðовий каталог" msgid "New environment" -msgstr "" +msgstr "Ðове Ñередовище" msgid "New epic" msgstr "Ðовий епік" @@ -6396,7 +6790,7 @@ msgid "New merge request" msgstr "Ðовий запит на злиттÑ" msgid "New milestone" -msgstr "" +msgstr "Ðовий етап" msgid "New pipelines will cancel older, pending pipelines on the same branch" msgstr "Ðові конвеєри ÑкаÑують Ñтарі, що очікують на тій же гілці" @@ -6422,12 +6816,18 @@ msgstr "Ðовий..." msgid "No" msgstr "ÐÑ–" +msgid "No %{providerTitle} repositories available to import" +msgstr "Ðемає репозиторіїв %{providerTitle} Ð´Ð»Ñ Ñ–Ð¼Ð¿Ð¾Ñ€Ñ‚Ñƒ" + msgid "No Label" msgstr "Без Мітки" -msgid "No activities found" +msgid "No Tag" msgstr "" +msgid "No activities found" +msgstr "Ðе знайднено активноÑтей" + msgid "No assignee" msgstr "Ðемає виконавцÑ" @@ -6438,7 +6838,7 @@ msgid "No changes" msgstr "Ðемає змін" msgid "No changes between %{ref_start}%{source_branch}%{ref_end} and %{ref_start}%{target_branch}%{ref_end}" -msgstr "" +msgstr "Ðемає змін між %{ref_start}%{source_branch}%{ref_end} та %{ref_start}%{target_branch}%{ref_end}" msgid "No connection could be made to a Gitaly Server, please check your logs!" msgstr "Ðеможливо з'єднатиÑÑŒ із Ñервером Gitaly, будь лаÑка, перевірте логи!" @@ -6452,13 +6852,16 @@ msgstr "ВнеÑки не знайдено" msgid "No credit card required." msgstr "Ðе потрібна кредитна картка." -msgid "No details available" +msgid "No designs found." msgstr "" +msgid "No details available" +msgstr "Ðемає деталей Ð´Ð»Ñ Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ" + msgid "No due date" msgstr "Ðемає" -msgid "No errors to display" +msgid "No errors to display." msgstr "" msgid "No estimate or time spent" @@ -6468,7 +6871,7 @@ msgid "No file chosen" msgstr "Файл не вибрано" msgid "No file selected" -msgstr "" +msgstr "Файл не вибраний" msgid "No files found." msgstr "Ðе знайдено жодного файлу." @@ -6483,7 +6886,7 @@ msgid "No license. All rights reserved" msgstr "Ðемає ліцензії. Ð’ÑÑ– права захищені" msgid "No matching results" -msgstr "" +msgstr "Ðемає відповідних результатів" msgid "No merge requests for the selected time period." msgstr "Ðемає запитів на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð·Ð° вибраний період чаÑу." @@ -6495,13 +6898,13 @@ msgid "No messages were logged" msgstr "Ðемає повідомлень у журналі" msgid "No milestones to show" -msgstr "" +msgstr "Ðемає етапів Ð´Ð»Ñ Ð¿Ð¾ÐºÐ°Ð·Ñƒ" msgid "No other labels with such name or description" msgstr "Ðемає інших міток з таким іменем або опиÑом" msgid "No preview for this file type" -msgstr "" +msgstr "Попереднього переглÑду Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ типу файлів немає" msgid "No prioritised labels with such name or description" msgstr "Ðемає пріоритетних міток з таким іменем або опиÑом" @@ -6522,7 +6925,7 @@ msgid "No schedules" msgstr "Ðемає розкладів" msgid "No start date" -msgstr "" +msgstr "Ðемає дати початку" msgid "No, directly import the existing email addresses and usernames." msgstr "ÐÑ–, безпоÑередньо імпортувати Ñ–Ñнуючі адреÑи електронної пошти та імена кориÑтувачів." @@ -6554,11 +6957,14 @@ msgstr "ÐедоÑтатньо даних" msgid "Not now" msgstr "Пізніше" +msgid "Not started" +msgstr "" + msgid "Note that the master branch is automatically protected. %{link_to_protected_branches}" msgstr "Майте на увазі, що гілка master захищена автоматично. %{link_to_protected_branches}" msgid "Note that this invitation was sent to %{mail_to_invite_email}, but you are signed in as %{link_to_current_user} with email %{mail_to_current_user}." -msgstr "" +msgstr "Зауважте, що це Ð·Ð°Ð¿Ñ€Ð¾ÑˆÐµÐ½Ð½Ñ Ð±ÑƒÐ»Ð¾ надіÑлано на %{mail_to_invite_email}, але ви увійшли Ñк %{link_to_current_user} з електронною поштою %{mail_to_current_user}." msgid "Note: As an administrator you may like to configure %{github_integration_link}, which will allow login via GitHub and allow connecting repositories without generating a Personal Access Token." msgstr "Примітка: Ñк адмініÑтратор ви можете налаштувати %{github_integration_link}, що дозволить входити через GitHub Ñ– підключати репозиторії без ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð¾ÑобиÑтого токену доÑтупу." @@ -6591,10 +6997,10 @@ msgid "Notification events" msgstr "ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ події" msgid "Notification setting" -msgstr "" +msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñповіщень" msgid "Notification setting - %{notification_title}" -msgstr "" +msgstr "Параметр ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ - %{notification_title}" msgid "NotificationEvent|Close issue" msgstr "Задача закрита" @@ -6703,13 +7109,13 @@ msgid "Only policy:" msgstr "" msgid "Only proceed if you trust %{idp_url} to control your GitLab account sign in." -msgstr "" +msgstr "Продовжуйте тільки Ñкщо ви довірÑєте %{idp_url} контроль над входом до вашого облікового запиÑу GitLab." msgid "Only project members can comment." msgstr "Тільки учаÑники проекту можуть залишати коментарі." msgid "Only project members will be imported. Group members will be skipped." -msgstr "" +msgstr "Лише учаÑника проекту будуть імпортовані. УчаÑники групи будуть пропущені." msgid "Oops, are you sure?" msgstr "Ой, а ви впевнені?" @@ -6718,13 +7124,13 @@ msgid "Open" msgstr "Відкриті" msgid "Open Documentation" -msgstr "" +msgstr "Відкрити документацію" msgid "Open comment type dropdown" -msgstr "" +msgstr "Випадаючий ÑпиÑок типу коментарів" msgid "Open errors" -msgstr "" +msgstr "Відкрити помилки" msgid "Open in Xcode" msgstr "Відкрити в Xcode" @@ -6759,6 +7165,9 @@ msgstr "Операції" msgid "Operations Dashboard" msgstr "Панель ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ñ–Ñми" +msgid "Operations Settings" +msgstr "" + msgid "OperationsDashboard|Add a project to the dashboard" msgstr "Додайте проект до панелі керуваннÑ" @@ -6766,6 +7175,9 @@ msgid "OperationsDashboard|The operations dashboard provides a summary of each p msgstr "Панель ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ñ–Ñми міÑтить інформацію про Ñтан кожного з проектів разом зі Ñтаном його конвеєрів та попереджень." msgid "OperationsDashboard|Unable to add %{invalidProjects}. The Operations Dashboard is available for public projects, and private projects in groups with a Gold plan." +msgstr "Ðеможливо додати %{invalidProjects}. Панель ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ñ–Ñми доÑтупна Ð´Ð»Ñ Ð¿ÑƒÐ±Ð»Ñ–Ñ‡Ð½Ð¸Ñ… та приватних проектів в групах із тарифним планом Gold." + +msgid "Optional" msgstr "" msgid "Optionally, you can %{link_to_customize} how FogBugz email addresses and usernames are imported into GitLab." @@ -6814,10 +7226,10 @@ msgid "Pages" msgstr "Сторінки" msgid "Pages Domain" -msgstr "" +msgstr "Домен Pages" msgid "Pages Domains" -msgstr "" +msgstr "Домени Pages" msgid "Pagination|Last »" msgstr "ОÑÑ‚Ð°Ð½Ð½Ñ Â»" @@ -6832,10 +7244,7 @@ msgid "Pagination|« First" msgstr "« Перша" msgid "Parameter" -msgstr "" - -msgid "Parent epic" -msgstr "" +msgstr "Параметр" msgid "Part of merge request changes" msgstr "ЧаÑтина змін у запиті на злиттÑ" @@ -6844,13 +7253,16 @@ msgid "Password" msgstr "Пароль" msgid "Past due" +msgstr "ПроÑтрочені" + +msgid "Paste a machine public key here. Read more about how to generate it %{link_start}here%{link_end}" msgstr "" msgid "Paste epic link" -msgstr "" +msgstr "Ð’Ñтавити поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð° епік" msgid "Paste issue link" -msgstr "" +msgstr "Ð’Ñтавити поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð° задачу" msgid "Paste your public SSH key, which is usually contained in the file '~/.ssh/id_rsa.pub' and begins with 'ssh-rsa'. Don't use your private SSH key." msgstr "Ð’Ñтавте Ñвій відкритий ключ SSH, Ñкий зазвичай знаходитьÑÑ Ñƒ файлі '~/.ssh/id_rsa.pub' Ñ– починаєтьÑÑ Ð· 'ssh-rsa'. Ðе викориÑтовуйте Ñвій приватний ключ SSH." @@ -6889,17 +7301,14 @@ msgid "Personal Access Token" msgstr "Токену перÑонального доÑтупу" msgid "Personal project creation is not allowed. Please contact your administrator with questions" -msgstr "" +msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð¿ÐµÑ€Ñональних проектів не дозволено. Будь лаÑка, звернітьÑÑ Ð´Ð¾ Ñвого адмініÑтратор із питаннÑми" msgid "Pick a name" -msgstr "" +msgstr "Виберіть ім'Ñ" msgid "Pipeline" msgstr "Конвеєр" -msgid "Pipeline Health" -msgstr "Стан Конвеєра" - msgid "Pipeline Schedule" msgstr "Розклад Конвеєра" @@ -6960,11 +7369,17 @@ msgstr "Змінні" msgid "PipelineSheduleIntervalPattern|Custom" msgstr "Спеціальні" +msgid "PipelineStatusTooltip|Commit: %{ci_status}" +msgstr "Коміт: %{ci_status}" + +msgid "PipelineStatusTooltip|Pipeline: %{ci_status}" +msgstr "Конвеєр: %{ci_status}" + msgid "Pipelines" msgstr "Конвеєри" msgid "Pipelines charts" -msgstr "Чарти Конвеєрів" +msgstr "СтатиÑтика конвеєрів" msgid "Pipelines for last month" msgstr "Конвеєри за оÑтанній міÑÑць" @@ -6975,6 +7390,9 @@ msgstr "Конвеєри за оÑтанній тиждень" msgid "Pipelines for last year" msgstr "Конвеєри за оÑтанній рік" +msgid "Pipelines need to be configured to enable this feature." +msgstr "" + msgid "Pipelines|Build with confidence" msgstr "Виконуйте збірки із впевненіÑÑ‚ÑŽ" @@ -7081,7 +7499,7 @@ msgid "Play" msgstr "Відтворити" msgid "Please %{link_to_register} or %{link_to_sign_in} to comment" -msgstr "" +msgstr "Будь лаÑка, %{link_to_register} або %{link_to_sign_in} щоб прокоментувати" msgid "Please accept the Terms of Service before continuing." msgstr "Будь лаÑка, Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð²Ð¶ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¸Ð¹Ð¼Ñ–Ñ‚ÑŒ умови Ð½Ð°Ð´Ð°Ð½Ð½Ñ Ð¿Ð¾Ñлуг." @@ -7095,9 +7513,21 @@ msgstr "Будь лаÑка Ñконвертуйте Ñ—Ñ… в %{link_to_git} Ñ– Ð msgid "Please convert them to Git on Google Code, and go through the %{link_to_import_flow} again." msgstr "Будь лаÑка Ñконвертуйте Ñ—Ñ… в Git на Google Code, Ñ– виконайте знову %{link_to_import_flow}." +msgid "Please create a username with only alphanumeric characters." +msgstr "" + msgid "Please enable and migrate to hashed storage to avoid security issues and ensure data integrity. %{migrate_link}" msgstr "" +msgid "Please enter a non-negative number" +msgstr "" + +msgid "Please enter a number greater than %{number} (from the project settings)" +msgstr "" + +msgid "Please enter a valid number" +msgstr "" + msgid "Please fill in a descriptive name for your group." msgstr "Введіть опиÑове ім'Ñ Ð³Ñ€ÑƒÐ¿Ð¸." @@ -7107,9 +7537,18 @@ msgstr "" msgid "Please note that this application is not provided by GitLab and you should verify its authenticity before allowing access." msgstr "Зверніть увагу, що Ñ†Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° не Ñ” чаÑтиною GitLab, Ñ– ви повинні впевнитиÑÑ Ñƒ Ñ—Ñ— безпеці, перш ніж надавати доÑтуп." +msgid "Please provide a name" +msgstr "" + +msgid "Please select and add a member" +msgstr "" + msgid "Please select at least one filter to see results" msgstr "Будь лаÑка виберіть хоча б один фільтр, щоб побачити результати" +msgid "Please set a new password before proceeding." +msgstr "Будь лаÑка, вÑтановіть пароль перед продовженнÑм." + msgid "Please solve the reCAPTCHA" msgstr "Будь лаÑка, пройдіть reCAPTCHA" @@ -7117,7 +7556,7 @@ msgid "Please try again" msgstr "Будь лаÑка, Ñпробуйте ще раз" msgid "Please upgrade PostgreSQL to version 9.6 or greater. The status of the replication cannot be determined reliably with the current version." -msgstr "" +msgstr "Будь лаÑка, оновіть PostgreSQL до верÑÑ–Ñ— 9.6 або вище. Стан реплікації не може бути доÑтовірно визначений у поточній верÑÑ–Ñ—." msgid "Please use this form to report users to GitLab who create spam issues, comments or behave inappropriately." msgstr "Будь лаÑка, викориÑтовуйте цю форму, щоб повідомлÑти GitLab про кориÑтувачів, Ñкі Ñтворюють задачі Ñ– коментарі зі Ñпамом, або поводÑÑ‚ÑŒÑÑ Ð½ÐµÐ²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ð½Ð¾." @@ -7134,6 +7573,9 @@ msgstr "ÐалаштуваннÑ" msgid "Preferences|Navigation theme" msgstr "Тема навігації" +msgid "Preferences|This feature is experimental and translations are not complete yet" +msgstr "Ð¦Ñ Ñ„ÑƒÐ½ÐºÑ†Ñ–Ñ Ñ” екÑпериментальною Ñ– переклади ще не завершені" + msgid "Press Enter or click to search" msgstr "Ð”Ð»Ñ Ð¿Ð¾ÑˆÑƒÐºÑƒ натиÑніть Enter або клікніть" @@ -7162,7 +7604,7 @@ msgid "Prioritized label" msgstr "Пріоритетні мітки" msgid "Private" -msgstr "" +msgstr "Приватний" msgid "Private - Project access must be granted explicitly to each user." msgstr "Приватний — доÑтуп до проекту повинен надаватиÑÑ ÐºÐ¾Ð¶Ð½Ð¾Ð¼Ñƒ кориÑтувачеві." @@ -7186,13 +7628,13 @@ msgid "Profiles| You are going to change the username %{currentUsernameBold} to msgstr "Ви збираєтеÑÑ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача %{currentUsernameBold} на %{newUsernameBold}. Профіль та проекти будуть перенаправлÑтиÑÑ Ð½Ð° проÑÑ‚Ñ–Ñ€ імен %{newUsername}, але таке Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð½Ñ Ð·Ð°ÐºÑ–Ð½Ñ‡Ð¸Ñ‚ÑŒÑÑ, коли проÑÑ‚Ñ–Ñ€ імен %{currentUsername} буде зареєÑтровано на іншого кориÑтувача або групу. Будь лаÑка, оновіть віддалені адреÑи в репозиторіÑÑ… Git Ñкомога швидше." msgid "Profiles|@username" -msgstr "" +msgstr "@ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача" msgid "Profiles|Account scheduled for removal." msgstr "Обліковий Ð·Ð°Ð¿Ð¸Ñ Ð·Ð°Ð¿Ð»Ð°Ð½Ð¾Ð²Ð°Ð½Ð¸Ð¹ Ð´Ð»Ñ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ." msgid "Profiles|Activate signin with one of the following services" -msgstr "" +msgstr "Ðктивуйте вхід за допомогою однієї з наÑтупних Ñлужб" msgid "Profiles|Active" msgstr "" @@ -7213,28 +7655,28 @@ msgid "Profiles|Change username" msgstr "Змінити ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача" msgid "Profiles|Changing your username can have unintended side effects." -msgstr "" +msgstr "Зміна імені кориÑтувача може мати небажані побічні ефекти." msgid "Profiles|Choose file..." msgstr "Вибрати файл..." msgid "Profiles|Choose to show contributions of private projects on your public profile without any project, repository or organization information" -msgstr "" +msgstr "Виберіть Ð´Ð»Ñ Ð¿Ð¾ÐºÐ°Ð·Ñƒ внеÑків до приватних репозиторіїв у вашому публічному профілі без інформації про проекти, репозиторії або організації" msgid "Profiles|City, country" -msgstr "" +msgstr "МіÑто, країна" msgid "Profiles|Clear status" msgstr "ОчиÑтити ÑтатуÑ" msgid "Profiles|Click on icon to activate signin with one of the following services" -msgstr "" +msgstr "Клікніть на іконку, щоб активувати вхід за допомогою одного із наÑтупних ÑервіÑів" msgid "Profiles|Connect" -msgstr "" +msgstr "Приєднати" msgid "Profiles|Connected Accounts" -msgstr "" +msgstr "Підключені облікові запиÑи" msgid "Profiles|Current path: %{path}" msgstr "Поточний шлÑÑ…: %{path}" @@ -7255,7 +7697,7 @@ msgid "Profiles|Deleting an account has the following effects:" msgstr "Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¾Ð³Ð¾ запиÑу неÑе наÑтупні наÑлідки:" msgid "Profiles|Disconnect" -msgstr "" +msgstr "Від'єднати" msgid "Profiles|Do not show on profile" msgstr "Ðе відображати у профілі" @@ -7267,10 +7709,10 @@ msgid "Profiles|Edit Profile" msgstr "Редагувати профіль" msgid "Profiles|Enter your name, so people you know can recognize you" -msgstr "" +msgstr "Введіть ваше ім'Ñ, щоб люди, Ñких ви знаєте, могли Ð²Ð°Ñ ÑƒÐ¿Ñ–Ð·Ð½Ð°Ñ‚Ð¸" msgid "Profiles|Increase your account's security by enabling Two-Factor Authentication (2FA)" -msgstr "" +msgstr "Підвищити рівень безпеки вашого облікового запиÑу за допомогою ÑƒÐ²Ñ–Ð¼ÐºÐ½ÐµÐ½Ð½Ñ Ð´Ð²Ð¾Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð½Ð¾Ñ— автентифікації (2FA)" msgid "Profiles|Invalid password" msgstr "Ðеправильний пароль" @@ -7309,13 +7751,13 @@ msgid "Profiles|Set new profile picture" msgstr "Ð’Ñтановити нове Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñ„Ñ–Ð»ÑŽ" msgid "Profiles|Social sign-in" -msgstr "" +msgstr "Вхід через Ñоціальні мережі" msgid "Profiles|Some options are unavailable for LDAP accounts" msgstr "ДеÑкі параметри недоÑтупні Ð´Ð»Ñ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¸Ñ… запиÑів LDAP" msgid "Profiles|Tell us about yourself in fewer than 250 characters" -msgstr "" +msgstr "Розкажіть про Ñебе в межах 250 Ñимволів" msgid "Profiles|The maximum file size allowed is 200KB." msgstr "МакÑимальний розмір файлу 200КБ." @@ -7324,7 +7766,7 @@ msgid "Profiles|This doesn't look like a public SSH key, are you sure you want t msgstr "Це не Ñхоже на публічниц ключ SSH. Ви впевнені, що хочете його додати?" msgid "Profiles|This email will be displayed on your public profile" -msgstr "" +msgstr "Ð¦Ñ ÐµÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð° адреÑа буде відображатиÑÑ Ñƒ вашому публічному профілі" msgid "Profiles|This email will be used for web based operations, such as edits and merges. %{learn_more}" msgstr "Ð¦Ñ Ð°Ð´Ñ€ÐµÑа електронної пошти буде викориÑтовуватиÑÑ Ð´Ð»Ñ Ð±Ñ€Ð°ÑƒÐ·ÐµÑ€Ð½Ð¸Ñ… операцій, таких Ñк Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ Ñ‚Ð° злиттÑ. %{learn_more}" @@ -7332,14 +7774,11 @@ msgstr "Ð¦Ñ Ð°Ð´Ñ€ÐµÑа електронної пошти буде викорРmsgid "Profiles|This emoji and message will appear on your profile and throughout the interface." msgstr "Цей Ñмайлик та Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð±ÑƒÐ´ÑƒÑ‚ÑŒ показані у вашому профілі та в інтерфейÑÑ–." -msgid "Profiles|This feature is experimental and translations are not complete yet" -msgstr "" - msgid "Profiles|This information will appear on your profile" -msgstr "" +msgstr "Ð¦Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð±ÑƒÐ´Ðµ відображатиÑÑ Ñƒ вашому профілі" msgid "Profiles|Two-Factor Authentication" -msgstr "" +msgstr "Двофакторна автентифікаціÑ" msgid "Profiles|Type your %{confirmationValue} to confirm:" msgstr "Введіть ваш %{confirmationValue} Ð´Ð»Ñ Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ:" @@ -7366,13 +7805,13 @@ msgid "Profiles|Username successfully changed" msgstr "Ð†Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача уÑпішно збережено" msgid "Profiles|Using emojis in names seems fun, but please try to set a status message instead" -msgstr "" +msgstr "ВикориÑÑ‚Ð°Ð½Ð½Ñ Ñмайликів в іменах виглÑдає дотепно, але, будь лаÑка, краще викориÑтовуйте Ñ—Ñ… в повідомленнÑÑ… про ÑтатуÑ" msgid "Profiles|What's your status?" msgstr "Який ваш ÑтатуÑ?" msgid "Profiles|Who you represent or work for" -msgstr "" +msgstr "Кого ви предÑтавлÑєте або на кого працюєте" msgid "Profiles|You can change your avatar here" msgstr "Тут ви можете змінити Ñвій аватар" @@ -7393,19 +7832,19 @@ msgid "Profiles|You must transfer ownership or delete these groups before you ca msgstr "Вам необхідно змінити влаÑника або видалити ці групи перед тим Ñк видалити ваш обліковий запиÑ." msgid "Profiles|Your LinkedIn profile name from linkedin.com/in/profilename" -msgstr "" +msgstr "Ваше ім'Ñ Ð¿Ñ€Ð¾Ñ„Ñ–Ð»ÑŽ LinkedIn з linkedin.com/in/profilename" msgid "Profiles|Your account is currently an owner in these groups:" msgstr "Ваш обліковий Ð·Ð°Ð¿Ð¸Ñ Ñ” влаÑником в цих групах:" msgid "Profiles|Your email address was automatically set based on your %{provider_label} account" -msgstr "" +msgstr "Ваша адреÑа електронної пошти була автоматично вÑтановлена на оÑнові вашого облікового запиÑу %{provider_label}" msgid "Profiles|Your location was automatically set based on your %{provider_label} account" -msgstr "" +msgstr "Ваше міÑÑ†ÐµÐ·Ð½Ð°Ñ…Ð¾Ð´Ð¶ÐµÐ½Ð½Ñ Ð±ÑƒÐ»Ð¾ автоматично вÑтановлено на оÑнові вашого облікового запиÑу %{provider_label}" msgid "Profiles|Your name was automatically set based on your %{provider_label} account, so people you know can recognize you" -msgstr "" +msgstr "Ваше Ñ–Ð¼â€™Ñ Ð±ÑƒÐ»Ð¾ автоматично вÑтановлено на оÑнові вашого облікового запиÑу %{provider_label} щоб люди могли Ð²Ð°Ñ Ð²Ð¿Ñ–Ð·Ð½Ð°Ñ‚Ð¸" msgid "Profiles|Your status" msgstr "Ваш ÑтатуÑ" @@ -7414,10 +7853,10 @@ msgid "Profiles|e.g. My MacBook key" msgstr "наприклад, мій ключ MacBook" msgid "Profiles|username" -msgstr "" +msgstr "ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача" msgid "Profiles|website.com" -msgstr "" +msgstr "Ñайт.укр" msgid "Profiles|your account" msgstr "ваш обліковий запиÑ" @@ -7434,6 +7873,9 @@ msgstr "ПрогреÑ" msgid "Project" msgstr "Проект" +msgid "Project \"%{name}\" is no longer available. Select another project to continue." +msgstr "Проект \"%{name}\" більше не доÑтупний. Щоб продовжити виберіть інший проект." + msgid "Project '%{project_name}' is in the process of being deleted." msgstr "Проект '%{project_name}' перебуває в процеÑÑ– видаленнÑ." @@ -7476,8 +7918,11 @@ msgstr "ЗакінчивÑÑ Ñ‚ÐµÑ€Ð¼Ñ–Ð½ дії поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð° проРmsgid "Project export started. A download link will be sent by email." msgstr "Розпочато екÑпорт проекту. ПоÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð´Ð»Ñ ÑÐºÐ°Ñ‡ÑƒÐ²Ð°Ð½Ð½Ñ Ð±ÑƒÐ´Ðµ надіÑлана електронною поштою." +msgid "Project has too many %{label_for_message} to search" +msgstr "Ð’ проекті занадто багато %{label_for_message} Ð´Ð»Ñ Ð¿Ð¾ÑˆÑƒÐºÑƒ" + msgid "Project members" -msgstr "" +msgstr "УчаÑники проекту" msgid "Project name" msgstr "Ðазва проекту" @@ -7486,7 +7931,7 @@ msgid "Project slug" msgstr "ШлÑÑ… проекту" msgid "Project:" -msgstr "" +msgstr "Проект:" msgid "ProjectActivityRSS|Subscribe" msgstr "ПідпиÑатиÑÑ" @@ -7575,12 +8020,18 @@ msgstr "КориÑтувачі можуть відправлÑти в цей рРmsgid "Projects" msgstr "Проекти" +msgid "Projects Successfully Retrieved" +msgstr "" + msgid "Projects shared with %{group_name}" msgstr "Спільні проекти з %{group_name}" msgid "Projects that belong to a group are prefixed with the group namespace. Existing projects may be moved into a group." msgstr "Проекти, що належать до групи, викориÑтовують Ñ—Ñ— ім'Ñ Ñк префікÑ. ІÑнуючі проекти можуть бути переміщені в групу." +msgid "Projects with write access" +msgstr "" + msgid "ProjectsDropdown|Frequently visited" msgstr "ЧаÑто відвідувані" @@ -7657,7 +8108,7 @@ msgid "PrometheusService|Custom metrics" msgstr "ВлаÑні метрики" msgid "PrometheusService|Enable Prometheus to define custom metrics, using either option above" -msgstr "" +msgstr "Увімкнути Prometheus Ð´Ð»Ñ Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð²Ð»Ð°Ñних метрик, викориÑтовуючи будь-Ñкий з варіантів вище" msgid "PrometheusService|Finding and configuring metrics..." msgstr "Пошук та Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¼ÐµÑ‚Ñ€Ð¸Ðº..." @@ -7789,7 +8240,7 @@ msgid "Pseudonymizer data collection" msgstr "Збір даних Pseudonymizer" msgid "Public" -msgstr "" +msgstr "Публічний" msgid "Public - The group and any public projects can be viewed without any authentication." msgstr "Публічна — група та вÑÑ– публічні проекти можуть переглÑдатиÑÑ Ð±ÐµÐ· автентифікації." @@ -7797,6 +8248,9 @@ msgstr "Публічна — група та вÑÑ– публічні Ð¿Ñ€Ð¾ÐµÐºÑ msgid "Public - The project can be accessed without any authentication." msgstr "Публічний — проект может переглÑдатиÑÑ Ð±ÐµÐ· автентифікації." +msgid "Public deploy keys (%{deploy_keys_count})" +msgstr "" + msgid "Public pipelines" msgstr "Публічні конвеєри" @@ -7831,19 +8285,19 @@ msgid "Quarters" msgstr "Квартали" msgid "Query" -msgstr "" +msgstr "Запит" msgid "Quick actions can be used in the issues description and comment boxes." msgstr "Швидкі дії можна викориÑтовувати в опиÑах задач Ñ– коментарÑÑ…." msgid "README" -msgstr "" +msgstr "ІнÑÑ‚Ñ€ÑƒÐºÑ†Ñ–Ñ (README)" msgid "Read more" msgstr "Докладніше" msgid "Read more about environments" -msgstr "" +msgstr "Читати більше про Ñередовища" msgid "Read more about project permissions <strong>%{link_to_help}</strong>" msgstr "ДізнайтеÑÑ Ð±Ñ–Ð»ÑŒÑˆÐµ про права доÑтупу в проекті <strong>%{link_to_help}</strong>" @@ -7852,6 +8306,12 @@ msgid "Real-time features" msgstr "Фунції реального чаÑу" msgid "Receive alerts from manually configured Prometheus servers." +msgstr "Отримувати Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð¶ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ налаштованого вручну Ñервера Prometheus." + +msgid "Recent" +msgstr "" + +msgid "Recent Project Activity" msgstr "" msgid "Recent searches" @@ -7883,7 +8343,7 @@ msgid "Register / Sign In" msgstr "ЗареєÑтруватиÑÑ / Увійти" msgid "Register U2F device" -msgstr "" +msgstr "ЗареєÑтрувати приÑтрій U2F" msgid "Register and see your runners for this group." msgstr "ЗареєÑтруйте Ñ– переглÑдайте ваші Runner’и Ð´Ð»Ñ Ñ†Ñ–Ñ”Ñ— групи." @@ -7916,7 +8376,7 @@ msgid "Related merge requests" msgstr "Пов'Ñзані запити на злиттÑ" msgid "Releases" -msgstr "" +msgstr "Релізи" msgid "Releases mark specific points in a project's development history, communicate information about the type of change, and deliver on prepared, often compiled, versions of the software to be reused elsewhere. Currently, releases can only be created through the API." msgstr "" @@ -7931,10 +8391,16 @@ msgid "Remove Runner" msgstr "Видалити Runner" msgid "Remove all approvals in a merge request when new commits are pushed to its source branch" -msgstr "" +msgstr "ВидалÑти вÑÑ– Ð·Ð°Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ñƒ запитах на злиттÑ, коли у гілці-джерелі з'ÑвлÑÑŽÑ‚ÑŒÑÑ Ð½Ð¾Ð²Ñ– коміти" msgid "Remove approver" -msgstr "" +msgstr "Видалити затверджуючу оÑобу" + +msgid "Remove approvers" +msgstr "Видалити затверджуючих оÑіб" + +msgid "Remove approvers?" +msgstr "Видалити затверджуючих оÑіб?" msgid "Remove avatar" msgstr "Видалити аватар" @@ -7967,13 +8433,13 @@ msgid "Reopen epic" msgstr "Повторне Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ ÐµÐ¿Ñ–ÐºÑƒ" msgid "Reopen milestone" -msgstr "" +msgstr "Повторне Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ ÐµÑ‚Ð°Ð¿Ñƒ" msgid "Repair authentication" -msgstr "Відновити аутентифікацію" +msgstr "Відновити автентифікацію" msgid "Reply to comment" -msgstr "" +msgstr "ВідповіÑти на коментар" msgid "Reply to this email directly or %{view_it_on_gitlab}." msgstr "ВідповіÑти на це електронне Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð±ÐµÐ·Ð¿Ð¾Ñередньо або %{view_it_on_gitlab}." @@ -8023,6 +8489,12 @@ msgstr "Результати Ð´Ð»Ñ Ñ‚ÐµÑтового звіту Ð¾Ð±Ñ€Ð¾Ð±Ð»Ñ msgid "Reports|Vulnerability" msgstr "ВразливіÑÑ‚ÑŒ" +msgid "Reports|issue" +msgstr "" + +msgid "Reports|merge request" +msgstr "" + msgid "Reports|no changed test results" msgstr "результати теÑтів не змінилиÑÑ" @@ -8036,10 +8508,10 @@ msgid "Repository URL" msgstr "URL репозиторіÑ" msgid "Repository cleanup" -msgstr "" +msgstr "ÐžÑ‡Ð¸Ñ‰ÐµÐ½Ð½Ñ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ñ–ÑŽ" msgid "Repository cleanup has started. You will receive an email once the cleanup operation is complete." -msgstr "" +msgstr "ОчиÑтку репозиторію розпочато. Ви отримаєте Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ð¾ електронній пошті піÑÐ»Ñ Ñ—Ñ— завершеннÑ." msgid "Repository has no locks." msgstr "Репозиторій не має блокувань." @@ -8071,11 +8543,28 @@ msgstr "Вимагати від вÑÑ–Ñ… кориÑтувачів цієї Ð³Ñ€Ñ msgid "Require all users to accept Terms of Service and Privacy Policy when they access GitLab." msgstr "Вимагати від уÑÑ–Ñ… кориÑтувачів приймати умови Ð½Ð°Ð´Ð°Ð½Ð½Ñ Ð¿Ð¾Ñлуг та політику конфіденційноÑÑ‚Ñ–, коли вони отримують доÑтуп до GitLab." -msgid "Resend invite" +msgid "Require approval from code owners" msgstr "" +msgid "Requires approval from %{names}." +msgid_plural "Requires %{count} more approvals from %{names}." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +msgid "Requires approval." +msgid_plural "Requires %d more approvals." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +msgid "Resend invite" +msgstr "Повторно надіÑлати запрошеннÑ" + msgid "Reset authorization key" -msgstr "" +msgstr "Скинути ключ авторизації" msgid "Reset authorization key?" msgstr "" @@ -8102,10 +8591,10 @@ msgid "Resolve discussion" msgstr "Завершити обговореннÑ" msgid "Resolved" -msgstr "" +msgstr "Вирішено" msgid "Response" -msgstr "" +msgstr "Відповідь" msgid "Response metrics (AWS ELB)" msgstr "Метрики відповідей (AWS ELB)" @@ -8117,7 +8606,7 @@ msgid "Response metrics (HA Proxy)" msgstr "Метрики відповідей (HA Proxy)" msgid "Response metrics (NGINX Ingress VTS)" -msgstr "" +msgstr "Метрики відповідей (NGINX Ingress VTS)" msgid "Response metrics (NGINX Ingress)" msgstr "Метрики відповідей (NGINX Ingress)" @@ -8126,7 +8615,7 @@ msgid "Response metrics (NGINX)" msgstr "Метрики відповідей (NGINX)" msgid "Restart Terminal" -msgstr "" +msgstr "ПерезапуÑтити термінал" msgid "Resume" msgstr "Продовжити" @@ -8148,7 +8637,7 @@ msgstr[2] "Показати значень" msgstr[3] "Показати значень" msgid "Reveal values" -msgstr "" +msgstr "Показати значеннÑ" msgid "Revert this commit" msgstr "Ðнулювати цей коміт" @@ -8178,7 +8667,7 @@ msgid "Run CI/CD pipelines for external repositories" msgstr "ЗапуÑтити CI/CD конвеєри Ð´Ð»Ñ Ð·Ð¾Ð²Ð½Ñ–ÑˆÐ½Ñ–Ñ… репозиторіїв" msgid "Run tests against your code live using the Web Terminal" -msgstr "" +msgstr "ПротеÑтувати ваш запущений код за допомогою Веб-терміналу" msgid "Run untagged jobs" msgstr "Виконати Ð·Ð°Ð²Ð´Ð°Ð½Ð½Ñ Ð±ÐµÐ· тегів" @@ -8208,7 +8697,7 @@ msgid "Runners API" msgstr "API Runner’ів" msgid "Runners activated for this project" -msgstr "" +msgstr "Runner'и активовані Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ проекту" msgid "Runners can be placed on separate users, servers, and even on your local machine." msgstr "Runner’и можуть розміщуватиÑÑ Ñƒ різних кориÑтувачів, на Ñерверах Ñ– навіть на вашій локальній машині." @@ -8231,6 +8720,9 @@ msgstr "Ви викориÑтали уÑÑ– виділенні хвилини дРmsgid "Running" msgstr "ВиконуєтьÑÑ" +msgid "Running…" +msgstr "" + msgid "SAML SSO" msgstr "Єдиний вхід SAML" @@ -8244,7 +8736,7 @@ msgid "SAML Single Sign On Settings" msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñ”Ð´Ð¸Ð½Ð¾Ð³Ð¾ входу SAML" msgid "SAML for %{group_name}" -msgstr "" +msgstr "SAML Ð´Ð»Ñ %{group_name}" msgid "SHA1 fingerprint of the SAML token signing certificate. Get this from your identity provider, where it can also be called \"Thumbprint\"." msgstr "Відбиток SHA1 Ñертифікату Ð´Ð»Ñ Ð¿Ñ–Ð´Ð¿Ð¸ÑÑƒÐ²Ð°Ð½Ð½Ñ Ñ‚Ð¾ÐºÐµÐ½Ñ–Ð² SAML. Отримайте його від провайдера ідентифікації, де він також може називатиÑÑ \"Thumbprint\"." @@ -8261,11 +8753,14 @@ msgstr "Відкритий SSH-ключ" msgid "SSL Verification" msgstr "Перевірка SSL" +msgid "Saturday" +msgstr "Субота" + msgid "Save" msgstr "Зберегти" msgid "Save Changes" -msgstr "" +msgstr "Зберегти зміни" msgid "Save application" msgstr "Зберегти заÑтоÑунок" @@ -8277,7 +8772,7 @@ msgid "Save changes before testing" msgstr "Зберегти зміни перед теÑтуваннÑм" msgid "Save comment" -msgstr "" +msgstr "Зберегти коментар" msgid "Save pipeline schedule" msgstr "Зберегти розклад конвеєра" @@ -8294,6 +8789,9 @@ msgstr "Заплановано" msgid "Schedules" msgstr "Розклади" +msgid "Scheduling" +msgstr "" + msgid "Scheduling Pipelines" msgstr "ÐŸÐ»Ð°Ð½ÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ¾Ð½Ð²ÐµÑ”Ñ€Ñ–Ð²" @@ -8316,7 +8814,7 @@ msgid "Search" msgstr "Пошук" msgid "Search an environment spec" -msgstr "" +msgstr "Пошук Ñпецифікації Ñередовища" msgid "Search branches" msgstr "Пошук у гілках" @@ -8331,7 +8829,7 @@ msgid "Search for projects, issues, etc." msgstr "Пошук в проектах, задачах Ñ– Ñ‚. д." msgid "Search groups" -msgstr "" +msgstr "Пошук в групах" msgid "Search merge requests" msgstr "Пошук у запитах на злиттÑ" @@ -8354,6 +8852,9 @@ msgstr "Пошук проектів" msgid "Search users" msgstr "Пошук кориÑтувачів" +msgid "Search users or groups" +msgstr "" + msgid "Search your projects" msgstr "Пошук у ваших проектах" @@ -8403,7 +8904,7 @@ msgid "Security Dashboard|Issue Created" msgstr "Створено задачу" msgid "Security Reports|At this time, the security dashboard only supports SAST and dependency scanning." -msgstr "" +msgstr "Ðа даний момент, панель безпеки підтримує тільки SAST та ÑÐºÐ°Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ñ€Ð°Ð·Ð»Ð¸Ð²Ð¾Ñтей." msgid "Security Reports|Create issue" msgstr "Створити задачу" @@ -8412,13 +8913,13 @@ msgid "Security Reports|Dismiss vulnerability" msgstr "Відхилити вразливіÑÑ‚ÑŒ" msgid "Security Reports|Learn more about setting up your dashboard" -msgstr "" +msgstr "ДізнайтеÑÑ Ð±Ñ–Ð»ÑŒÑˆÐµ про Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ð°ÑˆÐ¾Ñ— панелі" msgid "Security Reports|More info" msgstr "Детальніше" msgid "Security Reports|No Vulnerabilities" -msgstr "" +msgstr "Ðемає вразливоÑтей" msgid "Security Reports|Security dashboard documentation" msgstr "Ð”Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ñ–Ñ Ð´Ð¾ панелі безпеки" @@ -8426,6 +8927,9 @@ msgstr "Ð”Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ñ–Ñ Ð´Ð¾ панелі безпеки" msgid "Security Reports|There was an error creating the issue." msgstr "Помилка при Ñтворенні задачі." +msgid "Security Reports|There was an error creating the merge request." +msgstr "" + msgid "Security Reports|There was an error dismissing the vulnerability." msgstr "Помилка при відхиленні вразливоÑÑ‚Ñ–." @@ -8436,16 +8940,16 @@ msgid "Security Reports|There was an error reverting this dismissal." msgstr "Помилка при анулюванні цього відхиленнÑ." msgid "Security Reports|Undo dismiss" -msgstr "" +msgstr "Відмінити відхиленнÑ" msgid "Security Reports|We've found no vulnerabilities for your group" -msgstr "" +msgstr "Ми не виÑвили вразливоÑтей Ð´Ð»Ñ Ð²Ð°ÑˆÐ¾Ñ— групи" msgid "Security Reports|While it's rare to have no vulnerabilities for your group, it can happen. In any event, we ask that you please double check your settings to make sure you've set up your dashboard correctly." -msgstr "" +msgstr "Хоча й рідко, але можливо, що ваша група не має вразливоÑтей. Ð’ будь-Ñкому разі, ми проÑимо Ð²Ð°Ñ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€Ð¸Ñ‚Ð¸ ваші налаштуваннÑ, щоб впевнитиÑÑ, що ваша панель налаштована правильно." msgid "Security dashboard" -msgstr "" +msgstr "Панель безпеки" msgid "SecurityDashboard| The security dashboard displays the latest security report. Use it to find and fix vulnerabilities." msgstr "Ðа панелі безпеки відображаєтьÑÑ Ð¾Ñтанній звіт про безпеку. ВикориÑтовуйте його Ð´Ð»Ñ Ð¿Ð¾ÑˆÑƒÐºÑƒ та Ð²Ð¸Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð½Ñ Ð²Ñ€Ð°Ð·Ð»Ð¸Ð²Ð¾Ñтей." @@ -8457,7 +8961,7 @@ msgid "SecurityDashboard|Pipeline %{pipelineLink} triggered" msgstr "Конвеєр %{pipelineLink} запущено" msgid "See metrics" -msgstr "" +msgstr "ПереглÑнути метрики" msgid "See the affected projects in the GitLab admin panel" msgstr "" @@ -8474,6 +8978,12 @@ msgstr "Виберіть групу Ð´Ð»Ñ Ð·Ð°Ð¿Ñ€Ð¾ÑˆÐµÐ½Ð½Ñ" msgid "Select a namespace to fork the project" msgstr "Виберіть проÑÑ‚Ñ–Ñ€ імен Ð´Ð»Ñ Ñ„Ð¾Ñ€ÐºÑƒ проекту" +msgid "Select a project to read Insights configuration file" +msgstr "" + +msgid "Select a repository" +msgstr "" + msgid "Select a template repository" msgstr "Вибрати шаблон репозиторію" @@ -8490,7 +9000,7 @@ msgid "Select branch/tag" msgstr "Виберіть гілку або тег" msgid "Select members to invite" -msgstr "" +msgstr "Виберіть учаÑників Ð´Ð»Ñ Ð·Ð°Ð¿Ñ€Ð¾ÑˆÐµÐ½Ð½Ñ" msgid "Select project" msgstr "Вибрати проект" @@ -8519,20 +9029,17 @@ msgstr "Вкажіть групу, де розміщені влаÑні шабл msgid "Selecting a GitLab user will add a link to the GitLab user in the descriptions of issues and comments (e.g. \"By <a href=\"#\">@johnsmith</a>\"). It will also associate and/or assign these issues and comments with the selected user." msgstr "При виборі кориÑтувача Gitlab поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð° нього буде додане до опиÑу задачі та коментарів (напр. \"<a href=\"#\"> @johnsmith</a>\"). Також це призведе до аÑоціації та/або Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñ†Ð¸Ñ… задач та коментарів на вибраного кориÑтувача." -msgid "Selective synchronization" -msgstr "Вибіркова ÑинхронізаціÑ" - msgid "Send email" msgstr "ÐадіÑлати лиÑта" msgid "Send report" -msgstr "" +msgstr "ÐадіÑлати звіт" msgid "Send usage data" msgstr "Відправити дані про викориÑтаннÑ" msgid "Sentry API URL" -msgstr "" +msgstr "URL-адреÑа Sentry API" msgid "Sep" msgstr "вер." @@ -8544,46 +9051,46 @@ msgid "Server version" msgstr "ВерÑÑ–Ñ Ñервера" msgid "Serverless" -msgstr "" +msgstr "Serverless" msgid "ServerlessDetails|Kubernetes Pods" -msgstr "" +msgstr "Pod'и Kubernetes" msgid "ServerlessDetails|Number of Kubernetes pods in use over time based on necessity." -msgstr "" +msgstr "КількіÑÑ‚ÑŒ pod'ів Kubernetes у викориÑтанні на оÑнові необхідноÑÑ‚Ñ– протÑгом періоду чаÑу." msgid "ServerlessDetails|pod in use" -msgstr "" +msgstr "pod у викориÑтанні" msgid "ServerlessDetails|pods in use" -msgstr "" +msgstr "pod'и у викориÑтанні" msgid "ServerlessURL|Copy URL to clipboard" -msgstr "" +msgstr "Скопіювати URL-адреÑу в буфер обміну" msgid "Serverless| In order to start using functions as a service, you must first install Knative on your Kubernetes cluster." -msgstr "" +msgstr "Ð”Ð»Ñ Ñ‚Ð¾Ð³Ð¾, щоб почати викориÑтовувати функції Ñк ÑервіÑ, необхідно Ñпочатку вÑтановити Knative на ваш клаÑтер Kubernetes." msgid "Serverless|An error occurred while retrieving serverless components" -msgstr "" +msgstr "СталаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° при отриманні компонентів serverless" msgid "Serverless|Getting started with serverless" -msgstr "" +msgstr "Початок роботи із serverless" msgid "Serverless|If you believe none of these apply, please check back later as the function data may be in the process of becoming available." -msgstr "" +msgstr "Якщо ви вважаєте, що жодна з них не підходить, будь лаÑка перевірте пізніше, тому що дані про функції можуть бути в процеÑÑ– отриманнÑ." msgid "Serverless|Install Knative" -msgstr "" +msgstr "Ð’Ñтановити Knative" msgid "Serverless|Learn more about Serverless" -msgstr "" +msgstr "ДізнайтеÑÑ Ð±Ñ–Ð»ÑŒÑˆÐµ про Serverless" msgid "Serverless|No functions available" -msgstr "" +msgstr "Ðемає доÑтупних функцій" msgid "Serverless|There is currently no function data available from Knative. This could be for a variety of reasons including:" -msgstr "" +msgstr "Ðаразі немає даних про функції від Knative. Це може бути викликано різними причинами, зокрема:" msgid "Service Desk" msgstr "Service Desk" @@ -8597,6 +9104,9 @@ msgstr "URL ÑервіÑу" msgid "Session expiration, projects limit and attachment size." msgstr "Термін дії ÑеÑÑ–Ñ—, проектні ліміти та розміри вкладень." +msgid "Set a number of approvals required, the approvers and other approval settings." +msgstr "" + msgid "Set a password on your account to pull or push via %{protocol}." msgstr "Ð’Ñтановіть пароль Ð´Ð»Ñ Ñвого облікового запиÑу, щоб мати можливіÑÑ‚ÑŒ відправлÑти та отримувати через %{protocol}." @@ -8612,11 +9122,14 @@ msgstr "Ð’Ñтановити репозиторій шаблонів Ð´Ð»Ñ Ð²Ñ msgid "Set max session time for web terminal." msgstr "МакÑимальний термін дії ÑеÑÑ–Ñ— Ð´Ð»Ñ Ð²ÐµÐ±-терміналу." +msgid "Set new password" +msgstr "" + msgid "Set notification email for abuse reports." msgstr "Ðалаштувати ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¿Ð¾ електронній пошті Ð´Ð»Ñ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½ÑŒ про зловживаннÑ." msgid "Set number of approvers required before open merge requests can be merged" -msgstr "" +msgstr "Ð’Ñтановити необхідну кількіÑÑ‚ÑŒ затверджуючих оÑіб перед тим, Ñк відкритий запит на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð¼Ð¾Ð¶Ðµ бути злитий" msgid "Set requirements for a user to sign-in. Enable mandatory two-factor authentication." msgstr "Ð’Ñтановіть вимоги Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ñƒ кориÑтувачів. Увімкніть обов’Ñзкову двофакторну автентифікацію." @@ -8634,6 +9147,9 @@ msgid "Set up assertions/attributes/claims (email, first_name, last_name) and Na msgstr "Ðалаштуйте твердженнÑ/атрибути (email, ім'Ñ, прізвище) Ñ– NameID відповідно до %{docsLinkStart} документації %{icon}%{docsLinkEnd}" msgid "Set up new U2F device" +msgstr "Ðалаштувати новий приÑтрій U2F" + +msgid "Set up new password" msgstr "" msgid "Set up your project to automatically push and/or pull changes to/from another repository. Branches, tags, and commits will be synced automatically." @@ -8693,14 +9209,20 @@ msgstr "Обнулити викориÑтані хвилини в конвеєр msgid "Sherlock Transactions" msgstr "Sherlock транзакції" +msgid "Show all activity" +msgstr "" + msgid "Show command" msgstr "Показати команду" +msgid "Show comments only" +msgstr "" + msgid "Show complete raw log" msgstr "Показати повний неформатований журнал" msgid "Show file browser" -msgstr "" +msgstr "Показати файловий менеджер" msgid "Show latest version" msgstr "Показати оÑтанню верÑÑ–ÑŽ" @@ -8743,19 +9265,19 @@ msgid "Sign in / Register" msgstr "Увійти або зареєÑтруватиÑÑ" msgid "Sign in to \"%{group_name}\"" -msgstr "" +msgstr "Увійти до \"%{group_name}\"" msgid "Sign in using smart card" -msgstr "" +msgstr "Увійти за допомогою Ñмарт-карти" msgid "Sign in via 2FA code" -msgstr "" +msgstr "Увійти за допомогою коду двофакторної автентифікції" msgid "Sign in with Single Sign-On" msgstr "Увійти за допомогою єдиного входу" msgid "Sign in with smart card" -msgstr "" +msgstr "Увійти за допомогою Ñмарт-карти" msgid "Sign out" msgstr "Вийти" @@ -8767,7 +9289,7 @@ msgid "Sign-up restrictions" msgstr "ÐžÐ±Ð¼ÐµÐ¶ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ñ€ÐµÑ”Ñтрації" msgid "Similar issues" -msgstr "" +msgstr "Подібні задачі" msgid "Size" msgstr "Розмір" @@ -8791,17 +9313,35 @@ msgid "Smartcard authentication failed: client certificate header is missing." msgstr "Ðе вдалоÑÑ Ð°Ð²Ñ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÑƒÐ²Ð°Ñ‚Ð¸ Ñмарт-карту: відÑутній заголовок в Ñертифікаті клієнта." msgid "Snippet Contents" -msgstr "" +msgstr "ВміÑÑ‚ Ñніпета" msgid "Snippets" msgstr "Сніпети" -msgid "Someone edited this %{issueType} at the same time you did. The description has been updated and you will need to make your changes again." +msgid "SnippetsEmptyState|Explore public snippets" msgstr "" -msgid "Someone edited this merge request at the same time you did. Please refresh the page to see changes." +msgid "SnippetsEmptyState|New snippet" msgstr "" +msgid "SnippetsEmptyState|No snippets found" +msgstr "" + +msgid "SnippetsEmptyState|Snippets are small pieces of code or notes that you want to keep." +msgstr "" + +msgid "SnippetsEmptyState|There are no snippets to show." +msgstr "" + +msgid "SnippetsEmptyState|They can be either public or private." +msgstr "" + +msgid "Someone edited this %{issueType} at the same time you did. The description has been updated and you will need to make your changes again." +msgstr "ХтоÑÑŒ відредагував цю %{issueType} одночаÑно з вами. ÐžÐ¿Ð¸Ñ Ð±ÑƒÐ»Ð¾ оновлено, тому вам знову треба внеÑти Ñвої зміни." + +msgid "Someone edited this merge request at the same time you did. Please refresh the page to see changes." +msgstr "ХтоÑÑŒ відредагував цей запит на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð¾Ð´Ð½Ð¾Ñ‡Ð°Ñно з вами. Будь лаÑка, оновіть Ñторінку, щоб побачити зміни." + msgid "Something went wrong on our end" msgstr "ЩоÑÑŒ пішло не так з нашого боку" @@ -8812,7 +9352,7 @@ msgid "Something went wrong on our end. Please try again!" msgstr "ЩоÑÑŒ пішло не так на нашій Ñтороні. Будь-лаÑка, Ñпробуйте ще раз!" msgid "Something went wrong on our end. Please try again." -msgstr "" +msgstr "ЩоÑÑŒ пішло не так на нашій Ñтороні. Будь-лаÑка, Ñпробуйте ще раз." msgid "Something went wrong trying to change the confidentiality of this issue" msgstr "Помилка при зміні конфіденційноÑÑ‚Ñ– цієї задачі" @@ -8824,13 +9364,13 @@ msgid "Something went wrong when toggling the button" msgstr "Помилка при перемиканні кнопки" msgid "Something went wrong while applying the suggestion. Please try again." -msgstr "" +msgstr "Помилка при заÑтоÑуванні пропозиції. Будь лаÑка, Ñпробуйте знову." msgid "Something went wrong while closing the %{issuable}. Please try again later" msgstr "Помилка при закритті %{issuable}. Будь лаÑка, Ñпробуйте пізніше" msgid "Something went wrong while deleting the source branch. Please try again." -msgstr "" +msgstr "Помилка при видаленні гілки-джерела. Будь лаÑка, Ñпробуйте знову." msgid "Something went wrong while fetching %{listType} list" msgstr "Помилка при отриманні ÑпиÑку %{listType}" @@ -8851,7 +9391,7 @@ msgid "Something went wrong while fetching the registry list." msgstr "ЩоÑÑŒ пішло не так при отриманні ÑпиÑку із реєÑтру." msgid "Something went wrong while merging this merge request. Please try again." -msgstr "" +msgstr "Помилка при заÑтоÑуванні цього запиту на злиттÑ. Будь лаÑка, Ñпробуйте знову." msgid "Something went wrong while reopening the %{issuable}. Please try again later" msgstr "Помилка при повторному відкритті %{issuable}. Будь лаÑка, Ñпробуйте пізніше" @@ -8878,13 +9418,13 @@ msgid "Sorry, no projects matched your search" msgstr "Ðа жаль жоден проект не задовольнÑÑ” критеріÑм вашого пошуку" msgid "Sorry, your filter produced no results" -msgstr "" +msgstr "Ðа жаль, немає результатів, Ñкі відповідають фільтру" msgid "Sort by" msgstr "Сортувати за" msgid "Sort direction" -msgstr "" +msgstr "ПорÑдок ÑортуваннÑ" msgid "SortOptions|Access level, ascending" msgstr "Рівень доÑтупу, в порÑдку зроÑтаннÑ" @@ -8932,7 +9472,7 @@ msgid "SortOptions|Less weight" msgstr "Менша вага" msgid "SortOptions|Milestone due date" -msgstr "" +msgstr "Дата Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ ÐµÑ‚Ð°Ð¿Ñƒ" msgid "SortOptions|Milestone due later" msgstr "Етап запланований на пізніше" @@ -8965,7 +9505,7 @@ msgid "SortOptions|Oldest joined" msgstr "Приєднаний найраніше" msgid "SortOptions|Oldest last activity" -msgstr "" +msgstr "ÐайÑтаріша оÑÑ‚Ð°Ð½Ð½Ñ Ð°ÐºÑ‚Ð¸Ð²Ð½Ñ–ÑÑ‚ÑŒ" msgid "SortOptions|Oldest sign in" msgstr "Залогінений найраніше" @@ -8980,7 +9520,7 @@ msgid "SortOptions|Priority" msgstr "Пріоритет" msgid "SortOptions|Recent last activity" -msgstr "" +msgstr "Ðайновіша оÑÑ‚Ð°Ð½Ð½Ñ Ð°ÐºÑ‚Ð¸Ð²Ð½Ñ–ÑÑ‚ÑŒ" msgid "SortOptions|Recent sign in" msgstr "Ðещодавно зареєÑтровані" @@ -9010,7 +9550,7 @@ msgid "Source is not available" msgstr "Джерело недоÑтупне" msgid "Source project cannot be found." -msgstr "" +msgstr "Проект-джерело не знайдено." msgid "Spam Logs" msgstr "Спам-журнал" @@ -9028,7 +9568,7 @@ msgid "Specify the following URL during the Runner setup:" msgstr "Зазначте наÑтупний URL під Ñ‡Ð°Ñ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Runner-а:" msgid "Squash commit message" -msgstr "" +msgstr "ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð¾Ð±'єднаного (squash) коміту" msgid "Squash commits" msgstr "Виконати об'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ (squash) комітів" @@ -9066,12 +9606,18 @@ msgstr "ÐктивніÑÑ‚ÑŒ в обраних проектах" msgid "Starred projects" msgstr "Обрані проекти" -msgid "Stars" +msgid "StarredProjectsEmptyState|Visit a project page and press on a star icon. Then, you can find the project on this page." msgstr "" -msgid "Start Web Terminal" +msgid "StarredProjectsEmptyState|You don't have starred projects yet." msgstr "" +msgid "Stars" +msgstr "У обраному" + +msgid "Start Web Terminal" +msgstr "ЗапуÑтити Веб-Термінал" + msgid "Start a %{new_merge_request} with these changes" msgstr "Почати %{new_merge_request} з цими змінами" @@ -9082,19 +9628,19 @@ msgid "Start and due date" msgstr "Дата початку та завершеннÑ" msgid "Start cleanup" -msgstr "" +msgstr "Почати очищеннÑ" msgid "Start date" msgstr "Дата початку" msgid "Start discussion" -msgstr "" +msgstr "Розпочати диÑкуÑÑ–ÑŽ" msgid "Start discussion & close %{noteable_name}" -msgstr "" +msgstr "Розпочати Ð¾Ð±Ð³Ð¾Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ‚Ð° закрити %{noteable_name}" msgid "Start discussion & reopen %{noteable_name}" -msgstr "" +msgstr "Розпочати Ð¾Ð±Ð³Ð¾Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ– повторно відкрити %{noteable_name}" msgid "Start the Runner!" msgstr "ЗапуÑÑ‚Ñ–Ñ‚ÑŒ Runner!" @@ -9106,13 +9652,13 @@ msgid "Started" msgstr "Запущений" msgid "Started %{startsIn}" -msgstr "" +msgstr "Запущено %{startsIn}" msgid "Starting..." -msgstr "" +msgstr "ЗапуÑк..." msgid "Starts %{startsIn}" -msgstr "" +msgstr "Буде запущено %{startsIn}" msgid "Starts at (UTC)" msgstr "ПочинаєтьÑÑ Ð¾ (за Грінвічем)" @@ -9124,10 +9670,10 @@ msgid "Status" msgstr "СтатуÑ" msgid "Status:" -msgstr "" +msgstr "СтатуÑ:" msgid "Stop Terminal" -msgstr "" +msgstr "Зупинити термінал" msgid "Stop environment" msgstr "Зупинити Ñередовище" @@ -9145,7 +9691,7 @@ msgid "Stopping this environment is currently not possible as a deployment is in msgstr "Зупинка Ñередовища наразі неможлива, тому що відбуваєтьÑÑ Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ" msgid "Stopping..." -msgstr "" +msgstr "ЗупиненнÑ..." msgid "Storage" msgstr "Сховище" @@ -9163,7 +9709,7 @@ msgid "Submit as spam" msgstr "Позначити Ñк Ñпам" msgid "Submit feedback" -msgstr "" +msgstr "ÐадіÑлати відгук" msgid "Submit review" msgstr "ÐадіÑлати перевірку" @@ -9181,19 +9727,19 @@ msgid "Subscribe at project level" msgstr "ПідпиÑатиÑÑ Ð½Ð° рівні проекту" msgid "Subscribe to RSS feed" -msgstr "" +msgstr "ПідпиÑатиÑÑ Ð½Ð° RSS-канал" msgid "Subscribe to calendar" -msgstr "" +msgstr "ПідпиÑатиÑÑ Ð½Ð° календар" msgid "Subscribed" msgstr "Ви підпиÑані" msgid "SubscriptionTable|Billing" -msgstr "" +msgstr "Білінг" msgid "SubscriptionTable|Free" -msgstr "" +msgstr "Безкоштовно" msgid "SubscriptionTable|GitLab allows you to continue using your subscription even if you exceed the number of seats you purchased. You will be required to pay for these seats upon renewal." msgstr "" @@ -9208,7 +9754,7 @@ msgid "SubscriptionTable|Loading subscriptions" msgstr "" msgid "SubscriptionTable|Manage" -msgstr "" +msgstr "УправліннÑ" msgid "SubscriptionTable|Max seats used" msgstr "" @@ -9226,10 +9772,10 @@ msgid "SubscriptionTable|Seats owed" msgstr "" msgid "SubscriptionTable|Subscription end date" -msgstr "" +msgstr "Дата Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ Ð¿Ñ–Ð´Ð¿Ð¸Ñки" msgid "SubscriptionTable|Subscription start date" -msgstr "" +msgstr "Дата початку підпиÑки" msgid "SubscriptionTable|This is the last time the GitLab.com team was in contact with you to settle any outstanding balances." msgstr "" @@ -9244,28 +9790,28 @@ msgid "SubscriptionTable|This is the number of seats you will be required to pur msgstr "" msgid "SubscriptionTable|Trial" -msgstr "" +msgstr "Пробна верÑÑ–Ñ" msgid "SubscriptionTable|Trial end date" -msgstr "" +msgstr "Дата Ð·Ð°ÐºÑ–Ð½Ñ‡ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾Ð±Ð½Ð¾Ñ— верÑÑ–Ñ—" msgid "SubscriptionTable|Trial start date" -msgstr "" +msgstr "Дата початку пробної верÑÑ–Ñ—" msgid "SubscriptionTable|Upgrade" -msgstr "" +msgstr "Підвищити" msgid "SubscriptionTable|Usage" -msgstr "" +msgstr "ВикориÑтаннÑ" msgid "SubscriptionTable|Usage count is performed once a day at 12:00 PM." msgstr "" msgid "Suggested change" -msgstr "" +msgstr "Пропонована зміна" msgid "Sunday" -msgstr "" +msgstr "ÐеділÑ" msgid "Support for custom certificates is disabled. Ask your system's administrator to enable it." msgstr "" @@ -9276,6 +9822,9 @@ msgstr "Перейти в гілку/тег" msgid "Sync information" msgstr "Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ Ñинхронізацію" +msgid "System" +msgstr "" + msgid "System Hooks" msgstr "СиÑтемні гуки" @@ -9286,7 +9835,7 @@ msgid "System default (%{default})" msgstr "" msgid "System header and footer" -msgstr "" +msgstr "СиÑтемний заголовок та футер" msgid "System metrics (Custom)" msgstr "СиÑтемні метрики (ВлаÑні)" @@ -9295,10 +9844,10 @@ msgid "System metrics (Kubernetes)" msgstr "СиÑтемні метрики (Kubernetes)" msgid "Tag" -msgstr "" +msgstr "Тег" msgid "Tag list:" -msgstr "" +msgstr "СпиÑок тегів:" msgid "Tags" msgstr "Теги" @@ -9394,10 +9943,10 @@ msgid "Templates" msgstr "Шаблони" msgid "Terminal" -msgstr "" +msgstr "Термінал" msgid "Terminal for environment" -msgstr "" +msgstr "Термінал Ð´Ð»Ñ Ñередовища" msgid "Terms of Service Agreement and Privacy Policy" msgstr "Угода про Ð½Ð°Ð´Ð°Ð½Ð½Ñ Ð¿Ð¾Ñлуг Ñ– політика конфіденційноÑÑ‚Ñ–" @@ -9421,7 +9970,7 @@ msgid "The Advanced Global Search in GitLab is a powerful search service that sa msgstr "Розширений глобальний пошук в GitLab — це потужний інÑтрумент Ñкий заощаджує ваш чаÑ. ЗаміÑÑ‚ÑŒ Ð´ÑƒÐ±Ð»ÑŽÐ²Ð°Ð½Ð½Ñ ÐºÐ¾Ð´Ñƒ Ñ– витрати чаÑу, ви можете шукати код інших команд, Ñкий може допомогти у вашому проекті." msgid "The CSV export will be created in the background. Once finished, it will be sent to <strong>%{email}</strong> in an attachment." -msgstr "" +msgstr "ЕкÑпорт CSV буде Ñтворено у фоновому режимі. ПіÑÐ»Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ Ð¹Ð¾Ð³Ð¾ буде надіÑлано на <strong>%{email}</strong> у вкладенні." msgid "The Git LFS objects will <strong>not</strong> be synced." msgstr "Об'єкти Git LFS <strong>не</strong> будуть ÑинхронізуватиÑÑ." @@ -9435,6 +9984,9 @@ msgstr "Трекер задач — це міÑце, де можна додатРmsgid "The X509 Certificate to use when mutual TLS is required to communicate with the external authorization service. If left blank, the server certificate is still validated when accessing over HTTPS." msgstr "Сертифікат X509 викориÑтовуєтьÑÑ Ð´Ð»Ñ Ð²Ð·Ð°Ñ”Ð¼Ð½Ð¾Ñ— перевірки автентичноÑÑ‚Ñ– TLS Ñ– необхідний Ð´Ð»Ñ Ð·Ð²'Ñзку з зовнішньою Ñлужбою авторизації. Якщо залишити порожнім, Ñертифікат Ñервера буде перевірÑтиÑÑŒ при доÑтупі через HTTPS." +msgid "The branch for this project has no active pipeline configuration." +msgstr "" + msgid "The character highlighter helps you keep the subject line to %{titleLength} characters and wrap the body at %{bodyLength} so they are readable in git." msgstr "ПідÑвітка Ñимволів дозволÑÑ” обмежувати заголовок до %{titleLength} Ñимволів Ñ– обмежувати довжину Ñ€Ñдків тіла %{bodyLength} Ñимволами Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, щоб вони залишаютьÑÑ Ñ‡Ð¸Ñ‚Ð°Ð±ÐµÐ»ÑŒÐ½Ð¸Ð¼Ð¸ в git." @@ -9460,11 +10012,14 @@ msgid "The issue stage shows the time it takes from creating an issue to assigni msgstr "Ð¡Ñ‚Ð°Ð´Ñ–Ñ Ð—Ð°Ð´Ð°Ñ‡Ð° показує, Ñкільки чаÑу потрібно від ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð·Ð°Ð´Ð°Ñ‡Ñ– до Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ñ—Ñ— до ÑкогоÑÑŒ етапу, або Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð·Ð°Ð´Ð°Ñ‡Ñ– на дошку. Почніть Ñтворювати задачі, щоб переглÑдати дані Ð´Ð»Ñ Ñ†Ñ–Ñ”Ñ— Ñтадії." msgid "The maximum file size allowed is %{size}." -msgstr "" +msgstr "МакÑимальний розмір файлу — %{size}." msgid "The maximum file size allowed is 200KB." msgstr "МакÑимальний розмір файлу — 200 Кб." +msgid "The name %{entryName} is already taken in this directory." +msgstr "" + msgid "The passphrase required to decrypt the private key. This is optional and the value is encrypted at rest." msgstr "Пароль, Ñкий потрібен Ð´Ð»Ñ Ð´ÐµÑˆÐ¸Ñ„Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ð¾Ð³Ð¾ ключа. Він Ñ” необов’Ñзковим Ñ– зберігаєтьÑÑ Ñƒ зашифрованому виглÑді." @@ -9541,19 +10096,19 @@ msgid "The value lying at the midpoint of a series of observed values. E.g., bet msgstr "Середнє Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð² Ñ€Ñдку. Приклад: між 3, 5, 9, Ñередніми 5, між 3, 5, 7, 8, Ñередніми (5 + 7) / 2 = 6." msgid "There are no approvers" -msgstr "" +msgstr "Ðемає затверджуючих оÑіб" msgid "There are no archived projects yet" msgstr "Ðаразі немає жодного архівованого проекту" msgid "There are no closed issues" -msgstr "" +msgstr "Закритих задач немає" msgid "There are no closed merge requests" -msgstr "" +msgstr "Закритих запитів на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð½ÐµÐ¼Ð°Ñ”" msgid "There are no custom project templates set up for this GitLab instance. They are enabled from GitLab's Admin Area. Contact your GitLab instance administrator to setup custom project templates." -msgstr "" +msgstr "ВлаÑні шаблони проектів не налаштовані Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ Ñерверу GitLab. Вони активуютьÑÑ Ð½Ð° Ñторінці адмініÑÑ‚Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ GitLab. ЗвернітьÑÑ Ð´Ð¾ адмініÑтратора GitLab Ð´Ð»Ñ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ð»Ð°Ñних шаблонів проектів." msgid "There are no issues to show" msgstr "Ðемає задач Ð´Ð»Ñ Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ" @@ -9562,10 +10117,10 @@ msgid "There are no labels yet" msgstr "Тут ще немає міток" msgid "There are no open issues" -msgstr "" +msgstr "Відкритих задач немає" msgid "There are no open merge requests" -msgstr "" +msgstr "Відкритих запитів на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð½ÐµÐ¼Ð°Ñ”" msgid "There are no packages yet" msgstr "" @@ -9580,7 +10135,7 @@ msgid "There are no unstaged changes" msgstr "Ðемає неіндекÑованих змін" msgid "There was an error adding a todo." -msgstr "Помилка при додаванні задачі." +msgstr "Помилка при додаванні нагадуваннÑ." msgid "There was an error deleting the todo." msgstr "Помилка при видаленні задачі." @@ -9588,6 +10143,9 @@ msgstr "Помилка при видаленні задачі." msgid "There was an error loading users activity calendar." msgstr "Помилка при завантаженні ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ€Ñ Ð°ÐºÑ‚Ð¸Ð²Ð½Ð¾ÑÑ‚Ñ– кориÑтувачів." +msgid "There was an error saving your changes." +msgstr "" + msgid "There was an error saving your notification settings." msgstr "Помилка при збереженні ваших налаштувань Ñповіщень." @@ -9604,7 +10162,7 @@ msgid "There was an error when unsubscribing from this label." msgstr "Помилка при відпиÑці від цієї мітки." msgid "These existing issues have a similar title. It might be better to comment there instead of creating another similar issue." -msgstr "" +msgstr "Ці Ñ–Ñнуючі проблеми мають подібні заголовки. Можливо, краще додати коментар до однієї з них заміÑÑ‚ÑŒ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð½Ð¾Ð²Ð¾Ñ—." msgid "They can be managed using the %{link}." msgstr "Ðими можна керувати за допомогою %{link}." @@ -9613,10 +10171,10 @@ msgid "Third party offers" msgstr "Сторонні пропозиції" msgid "This %{issuable} is locked. Only <strong>project members</strong> can comment." -msgstr "" +msgstr "Ð¦Ñ %{issuable} заблокована. Лише <strong>учаÑники проекту</strong> можуть коментувати." msgid "This %{viewer} could not be displayed because %{reason}. You can %{options} instead." -msgstr "" +msgstr "Цей %{viewer} не може бути відображено через %{reason}. ЗаміÑÑ‚ÑŒ цього можна %{options}." msgid "This GitLab instance does not provide any shared Runners yet. Instance administrators can register shared Runners in the admin area." msgstr "Цей інÑÑ‚Ð°Ð½Ñ GitLab ще немає загальних Runner'ів. ÐдмініÑтратори можуть Ñ—Ñ… зареєÑтрувати у Ñпеціальному розділі конфігурації." @@ -9633,6 +10191,21 @@ msgstr "ВидиміÑÑ‚ÑŒ цієї дошки обмежена" msgid "This branch has changed since you started editing. Would you like to create a new branch?" msgstr "Ð¦Ñ Ð³Ñ–Ð»ÐºÐ° була змінена піÑÐ»Ñ Ñ‚Ð¾Ð³Ð¾ моменту, коли ви почали Ñ—Ñ— редагувати. Ви хотіли б Ñтворити нову?" +msgid "This commit is part of merge request %{link_to_merge_request}. Comments created here will be created in the context of that merge request." +msgstr "" + +msgid "This commit was signed with a <strong>verified</strong> signature and the committer email is verified to belong to the same user." +msgstr "" + +msgid "This commit was signed with a different user's verified signature." +msgstr "" + +msgid "This commit was signed with a verified signature, but the committer email is <strong>not verified</strong> to belong to the same user." +msgstr "" + +msgid "This commit was signed with an <strong>unverified</strong> signature." +msgstr "" + msgid "This container registry has been scheduled for deletion." msgstr "Заплановане Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ñ†ÑŒÐ¾Ð³Ð¾ реєÑтру контейнерів." @@ -9652,6 +10225,9 @@ msgid "This directory" msgstr "Цей каталог" msgid "This domain is not verified. You will need to verify ownership before access is enabled." +msgstr "Цей домен не підтверджено. Щоб увімкнути доÑтуп, потрібно підтвердити право влаÑноÑÑ‚Ñ–." + +msgid "This field is required." msgstr "" msgid "This group" @@ -9718,10 +10294,10 @@ msgid "This job is in pending state and is waiting to be picked by a runner" msgstr "Це Ð·Ð°Ð²Ð´Ð°Ð½Ð½Ñ Ð¿ÐµÑ€ÐµÐ±ÑƒÐ²Ð°Ñ” в Ñтані Ð¾Ñ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ñ– чекає на запуÑк Runner" msgid "This job is stuck because you don't have any active runners online with any of these tags assigned to them:" -msgstr "" +msgstr "Це Ð·Ð°Ð²Ð´Ð°Ð½Ð½Ñ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¾Ð²Ð°Ð½Ðµ, тому що немає жодних runner'ів з будь Ñким із цих тегів:" msgid "This job is stuck because you don't have any active runners that can run this job." -msgstr "" +msgstr "Це Ð·Ð°Ð²Ð´Ð°Ð½Ð½Ñ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¾Ð²Ð°Ð½Ðµ, тому що немає активних runner'ів, Ñкі могли б його виконати." msgid "This job is the most recent deployment to %{link}." msgstr "Це Ð·Ð°Ð²Ð´Ð°Ð½Ð½Ñ Ñ” оÑтаннім розгортаннÑм на %{link}." @@ -9730,7 +10306,7 @@ msgid "This job requires a manual action" msgstr "Ð—Ð°Ð²Ð´Ð°Ð½Ð½Ñ Ð²Ð¸Ð¼Ð°Ð³Ð°Ñ” ручних дій" msgid "This job will automatically run after its timer finishes. Often they are used for incremental roll-out deploys to production environments. When unscheduled it converts into a manual action." -msgstr "" +msgstr "Ð—Ð°Ð²Ð´Ð°Ð½Ð½Ñ Ð±ÑƒÐ´Ðµ запущено автоматично піÑÐ»Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ Ñ‚Ð°Ð¹Ð¼ÐµÑ€Ð°. Зазвичай вони викориÑтовуютьÑÑ Ð´Ð»Ñ Ñ–Ð½ÐºÑ€ÐµÐ¼ÐµÐ½Ñ‚Ð°Ð»ÑŒÐ½Ð¾Ð³Ð¾ Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ Ð² production Ñередовище. У разі ÑкаÑÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð°Ð²Ð´Ð°Ð½Ð½Ñ Ð²Ð¾Ð½Ð¾ перетворитьÑÑ Ð½Ð° ручну операцію." msgid "This means you can not push code until you create an empty repository or import existing one." msgstr "Це означає, що ви не можете відправлÑти код, поки не Ñтворите порожній репозиторій або не імпортуєте Ñ–Ñнуючий." @@ -9738,6 +10314,12 @@ msgstr "Це означає, що ви не можете відправлÑти msgid "This merge request is locked." msgstr "Цей запит на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¾Ð²Ð°Ð½Ð¾." +msgid "This merge request must be approved by members of these groups. You can override the project settings by setting your own list of approvers." +msgstr "Цей запит на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð¼Ð°Ñ” бути затверджений учаÑниками цих груп. Ви можете перевизначити проектні налаштуваннÑ, вÑтановивши ваш влаÑний ÑпиÑок затверджуючих оÑіб." + +msgid "This merge request must be approved by these users. You can override the project settings by setting your own list of approvers." +msgstr "Цей запит на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð¼Ð°Ñ” бути затверджений цими кориÑтувачами. Ви можете перевизначити проектні налаштуваннÑ, вÑтановивши ваш влаÑний ÑпиÑок затверджуючих оÑіб." + msgid "This option is disabled as you don't have write permissions for the current branch" msgstr "Цей параметр вимкнено, тому що у Ð²Ð°Ñ Ð½ÐµÐ¼Ð°Ñ” дозволу на Ð·Ð°Ð¿Ð¸Ñ Ñƒ поточну гілку" @@ -9751,13 +10333,13 @@ msgid "This page will be removed in a future release." msgstr "Цю Ñторінку буде видалено у майбутній верÑÑ–Ñ—." msgid "This pipeline is run in a merge request context" -msgstr "" +msgstr "Цей конвеєр виконуєтьÑÑ Ð² контекÑÑ‚Ñ– запиту злиттÑ" msgid "This pipeline makes use of a predefined CI/CD configuration enabled by %{strongStart}Auto DevOps.%{strongEnd}" -msgstr "" +msgstr "Цей конвеєр викориÑтовує попередньо визначену конфігурацію CI / CD, увімкнену за допомогою %{strongStart}Auto DevOps.%{strongEnd}" msgid "This pipeline makes use of a predefined CI/CD configuration enabled by <b>Auto DevOps.</b>" -msgstr "" +msgstr "Цей конвеєр викориÑтовує попередньо визначену конфігурацію CI / CD, увімкнену за допомогою <b>Auto DevOps</b>" msgid "This project" msgstr "Цей проект" @@ -9799,7 +10381,7 @@ msgid "This user will be the author of all events in the activity feed that are msgstr "Цей кориÑтувач буде автором вÑÑ–Ñ… подій в каналі активноÑÑ‚Ñ–, Ñкі Ñ” результатом оновленнÑ, наприклад ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð½Ð¾Ð²Ð¸Ñ… гілок або Ð²Ñ–Ð´Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð½Ñ Ð½Ð¾Ð²Ð¸Ñ… комітів до Ñ–Ñнуючих гілок. При Ñтворенні або перепризначенні ви зможете призначити лише Ñебе кориÑтувачем Ð´Ð»Ñ Ð²Ñ–Ð´Ð´Ð·ÐµÑ€ÐºÐ°Ð»ÐµÐ½Ð½Ñ." msgid "This will redirect you to an external sign in page." -msgstr "" +msgstr "Це перенаправить Ð²Ð°Ñ Ð½Ð° зовнішню Ñторінку входу." msgid "Those emails automatically become issues (with the comments becoming the email conversation) listed here." msgstr "Ці Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ ÐµÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ñ— пошти автоматично Ñтануть обговореннÑми задач, Ñкі відображатимутьÑÑ Ñ‚ÑƒÑ‚ (причому коментарі Ñтануть чаÑтиною перепиÑки)." @@ -9996,7 +10578,7 @@ msgid "Title" msgstr "Заголовок" msgid "Titles and Filenames" -msgstr "" +msgstr "Заголовки та імена файлів" msgid "To %{link_to_help} of your domain, add the above key to a TXT record within to your DNS configuration." msgstr "" @@ -10005,7 +10587,7 @@ msgid "To GitLab" msgstr "Ð’ GitLab" msgid "To access this domain create a new DNS record" -msgstr "" +msgstr "Щоб отримати доÑтуп до цього домену, Ñтворіть новий Ð·Ð°Ð¿Ð¸Ñ DNS" msgid "To add an SSH key you need to %{generate_link_start}generate one%{link_end} or use an %{existing_link_start}existing key%{link_end}." msgstr "Ð”Ð»Ñ Ñ‚Ð¾Ð³Ð¾, щоб додати ключ SSH вам необхідно %{generate_link_start}згенерувати його%{link_end} або викориÑтати %{existing_link_start}Ñ–Ñнуючий ключ%{link_end}." @@ -10056,7 +10638,7 @@ msgid "To keep this project going, create a new merge request" msgstr "" msgid "To link Sentry to GitLab, enter your Sentry URL and Auth Token." -msgstr "" +msgstr "Ð”Ð»Ñ Ñ–Ð½Ñ‚ÐµÐ³Ñ€Ð°Ñ†Ñ–Ñ— Sentry із Gitlab введіть URL-адреÑу Sentry та токен автентифікації." msgid "To move or copy an entire GitLab project from another GitLab installation to this one, navigate to the original project's settings page, generate an export file, and upload it here." msgstr "Щоб переміÑтити або Ñкопіювати веÑÑŒ проект GitLab з іншої інÑталÑції GitLab до цього, перейдіть на Ñторінку налаштувань оригіналу проекту, Ñтворіть файл екÑпорту та надішліть його Ñюди." @@ -10068,19 +10650,19 @@ msgid "To open Jaeger and easily view tracing from GitLab, link the %{link} page msgstr "" msgid "To preserve performance only <strong>%{display_size} of %{real_size}</strong> files are displayed." -msgstr "" +msgstr "Ð”Ð»Ñ Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð½Ñ ÑˆÐ²Ð¸Ð´ÐºÐ¾Ð´Ñ–Ñ— відображаютьÑÑ Ð»Ð¸ÑˆÐµ <strong>%{display_size} із %{real_size}</strong> файлів." msgid "To receive alerts from manually configured Prometheus services, add the following URL and Authorization key to your Prometheus webhook config file. Learn more about %{linkStart}configuring Prometheus%{linkEnd} to send alerts to GitLab." msgstr "" msgid "To set up SAML authentication for your group through an identity provider like Azure, Okta, Onelogin, Ping Identity, or your custom SAML 2.0 provider:" -msgstr "Щоб налаштувати аутентифікацію SAML Ð´Ð»Ñ Ð²Ð°ÑˆÐ¾Ñ— групи через провайдера ідентифікації такої Ñк Azure, Okta, Onelogin, Ping Identity або вашого влаÑного поÑтачальника SAML 2.0:" +msgstr "Щоб налаштувати автентифікацію SAML Ð´Ð»Ñ Ð²Ð°ÑˆÐ¾Ñ— групи через провайдера ідентифікації такої Ñк Azure, Okta, Onelogin, Ping Identity або вашого влаÑного поÑтачальника SAML 2.0:" msgid "To start serving your jobs you can add Runners to your group" msgstr "Ð”Ð»Ñ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ Ð²Ð°ÑˆÐ¸Ñ… завдань ви можете додати Runner’и до вашої групи" msgid "To start serving your jobs you can either add specific Runners to your project or use shared Runners" -msgstr "" +msgstr "Щоб почати ваші Ð·Ð°Ð²Ð´Ð°Ð½Ð½Ñ Ð²Ð¸ÐºÐ¾Ð½ÑƒÐ²Ð°Ð»Ð¸ÑÑ, ви можете або додати Ñпеціальні Runner’и до вашого проекту, або викориÑтовувати загальні" msgid "To this GitLab instance" msgstr "До цього інÑтанÑу GitLab" @@ -10092,7 +10674,7 @@ msgid "To view the roadmap, add a start or due date to one of your epics in this msgstr "Ð”Ð»Ñ Ð¿ÐµÑ€ÐµÐ³Ð»Ñду плану-графіку, додайте дату початку чи Ð·Ð°ÐºÑ–Ð½Ñ‡ÐµÐ½Ð½Ñ Ð´Ð¾ одного з ваших епіків в цій групі або Ñ—Ñ— підгрупах. При поміÑÑчному переглÑді показуютьÑÑ Ñ‚Ñ–Ð»ÑŒÐºÐ¸ епіки за попередній, поточний, та наÑтупні 5 міÑÑців." msgid "To widen your search, change or remove filters above" -msgstr "" +msgstr "Щоб розширити пошук, змініть або видаліть фільтри вище" msgid "To widen your search, change or remove filters." msgstr "Щоб розширити пошук, змініть або видаліть фільтри." @@ -10101,22 +10683,22 @@ msgid "Today" msgstr "Сьогодні" msgid "Todo" -msgstr "Задача" +msgstr "ÐагдуваннÑ" msgid "Todos" -msgstr "Задачі" +msgstr "ÐагадуваннÑ" msgid "Toggle Sidebar" msgstr "Перемикач бічної панелі" msgid "Toggle comments for this file" -msgstr "" +msgstr "Увімкнути або вимкнути коментарі Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ файлу" msgid "Toggle commit description" msgstr "Перемкнути Ð¾Ð¿Ð¸Ñ ÐºÐ¾Ð¼Ñ–Ñ‚Ñ–Ð²" msgid "Toggle commit list" -msgstr "" +msgstr "Відкрити або закрити ÑпиÑок комітів" msgid "Toggle discussion" msgstr "Перемикач диÑкуÑÑ–Ñ—" @@ -10182,9 +10764,12 @@ msgid "Trigger this manual action" msgstr "ЗапуÑтити цю ручну дію" msgid "Trigger token:" -msgstr "" +msgstr "Токен тригера:" msgid "Trigger variables:" +msgstr "Змінні тригера:" + +msgid "Triggerer" msgstr "" msgid "Triggers can force a specific branch or tag to get rebuilt with an API call. These tokens will impersonate their associated user including their access to projects and their project permissions." @@ -10197,13 +10782,13 @@ msgid "Try again" msgstr "Спробуйте ще раз" msgid "Try again?" -msgstr "" +msgstr "Спробуйте ще раз?" msgid "Try all GitLab has to offer for 30 days." msgstr "Спробуйте вÑÑ– функції GitLab протÑгом 30 днів." msgid "Trying to communicate with your device. Plug it in (if you haven't already) and press the button on the device now." -msgstr "" +msgstr "ВідбуваєтьÑÑ Ð·'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ñ–Ð· вашим приÑтроєм. Підключіть його (Ñкщо ви цього ще не зробили) Ñ– натиÑніть кнопку на ньому зараз." msgid "Turn on Service Desk" msgstr "Ввімкнути Service Desk" @@ -10218,7 +10803,7 @@ msgid "Type" msgstr "Тип" msgid "URL" -msgstr "" +msgstr "URL" msgid "Unable to load the diff. %{button_try_again}" msgstr "Ðеможливо завантажити порівнÑÐ½Ð½Ñ (diff). %{button_try_again}" @@ -10230,13 +10815,13 @@ msgid "Unable to update this epic at this time." msgstr "Ðеможливо оновити цей епік в даний момент." msgid "Unblock" -msgstr "" +msgstr "Розблокувати" msgid "Undo" msgstr "СкаÑувати" msgid "Unfortunately, your email message to GitLab could not be processed." -msgstr "" +msgstr "Ðа жаль, ваше Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ ÐµÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ñ— пошти до GitLab не може бути оброблено." msgid "Unknown" msgstr "Ðевідомо" @@ -10287,7 +10872,7 @@ msgid "Unsubscribe at project level" msgstr "ВідпиÑатиÑÑ Ð½Ð° рівні проекту" msgid "Unsubscribe from %{type}" -msgstr "" +msgstr "ВідпиÑатиÑÑ Ð²Ñ–Ð´ %{type}" msgid "Unverified" msgstr "Ðепідтверджено" @@ -10301,8 +10886,11 @@ msgstr "Ðезабаром" msgid "Update" msgstr "Оновити" +msgid "Update approvers" +msgstr "Оновити затверджуючих оÑіб" + msgid "Update failed" -msgstr "" +msgstr "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½Ðµ вдалоÑÑ" msgid "Update now" msgstr "Оновити зараз" @@ -10310,11 +10898,17 @@ msgstr "Оновити зараз" msgid "Update your group name, description, avatar, and visibility." msgstr "Оновіть Ñ–Ð¼â€™Ñ Ð³Ñ€ÑƒÐ¿Ð¸, опиÑ, аватар та видиміÑÑ‚ÑŒ." +msgid "Update your project name, tags, description and avatar." +msgstr "" + +msgid "Updated" +msgstr "" + msgid "Updating" msgstr "ОновленнÑ" msgid "Upgrade plan to unlock Canary Deployments feature" -msgstr "" +msgstr "Перейдіть на вищий тарифний план, щоб отримати доÑтуп до функціональноÑÑ‚Ñ– Canary Deployments" msgid "Upgrade your plan to activate Advanced Global Search." msgstr "Перейдіть на вищий тарифний план щоб активувати Покращений Глобальний Пошук." @@ -10335,16 +10929,16 @@ msgid "Upload <code>GoogleCodeProjectHosting.json</code> here:" msgstr "ÐадіÑлати <code>GoogleCodeProjectHosting.json</code> тут:" msgid "Upload CSV file" -msgstr "" +msgstr "Завантажити CSV файл" msgid "Upload New File" msgstr "ÐадіÑлати новий файл" msgid "Upload a certificate for your domain with all intermediates" -msgstr "" +msgstr "Завантажити Ñертифікат Ð´Ð»Ñ Ð²Ð°ÑˆÐ¾Ð³Ð¾ домену з уÑіма проміжними" msgid "Upload a private key for your certificate" -msgstr "" +msgstr "Завантажити приватний ключ Ð´Ð»Ñ Ñертифіката" msgid "Upload file" msgstr "ÐадіÑлати файл" @@ -10389,13 +10983,13 @@ msgid "Use your global notification setting" msgstr "ВикориÑтовуютьÑÑ Ð³Ð»Ð¾Ð±Ð°Ð»ÑŒÐ½Ñ– Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½ÑŒ" msgid "Use your smart card to authenticate with the LDAP server." -msgstr "" +msgstr "ВикориÑтовуйте Ñмарт-карту Ð´Ð»Ñ Ð°Ð²Ñ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ— на Ñервері LDAP." msgid "Used by members to sign in to your group in GitLab" msgstr "ВикориÑтовуєтьÑÑ ÑƒÑ‡Ð°Ñниками Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ñƒ у вашу групу в GitLab" msgid "Used to help configure your identity provider" -msgstr "" +msgstr "ВикориÑтовуєтьÑÑ Ð´Ð»Ñ Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¸ в налаштуванні провайдера ідентифікації" msgid "User Cohorts are only shown when the %{usage_ping_link_start}usage ping%{usage_ping_link_end} is enabled." msgstr "Когорти КориÑтувачів показуютьÑÑ Ð»Ð¸ÑˆÐµ тоді, коли увімкнено %{usage_ping_link_start}збір даних про викориÑтаннÑ%{usage_ping_link_end}." @@ -10422,22 +11016,22 @@ msgid "UserProfile|Edit profile" msgstr "Редагувати профіль" msgid "UserProfile|Explore public groups to find projects to contribute to." -msgstr "" +msgstr "ПереглÑдайте публічні групи та знаходьте проекти Ð´Ð»Ñ Ñвоїх внеÑків." msgid "UserProfile|Groups" msgstr "Групи" msgid "UserProfile|Groups are the best way to manage projects and members." -msgstr "" +msgstr "Групи — це найкращий ÑпоÑіб керувати проектами та учаÑниками." msgid "UserProfile|Join or create a group to start contributing by commenting on issues or submitting merge requests!" -msgstr "" +msgstr "ПриєднуйтеÑÑŒ до або Ñтворіть групу, щоб почати робити внеÑки через коментарі до задач, а також надÑилаючи запити на злиттÑ!" msgid "UserProfile|Most Recent Activity" msgstr "ОÑÑ‚Ð°Ð½Ð½Ñ Ð°ÐºÑ‚Ð¸Ð²Ð½Ñ–ÑÑ‚ÑŒ" msgid "UserProfile|No snippets found." -msgstr "" +msgstr "Сніпетів не знайдено." msgid "UserProfile|Overview" msgstr "ОглÑд" @@ -10452,19 +11046,19 @@ msgid "UserProfile|Snippets" msgstr "Сніпети" msgid "UserProfile|Snippets in GitLab can either be private, internal, or public." -msgstr "" +msgstr "Сніпети в GitLab можуть бути приватними, внутрішніми та публічними." msgid "UserProfile|Subscribe" msgstr "ПідпиÑатиÑÑ" msgid "UserProfile|This user doesn't have any personal projects" -msgstr "" +msgstr "Цей кориÑтувач не має оÑобиÑтих проектів" msgid "UserProfile|This user has a private profile" msgstr "Цей кориÑтувач має приватний профіль" msgid "UserProfile|This user hasn't contributed to any projects" -msgstr "" +msgstr "Цей кориÑтувач не робив внеÑків до жодного із проектів" msgid "UserProfile|View all" msgstr "ПереглÑнути вÑе" @@ -10473,31 +11067,31 @@ msgid "UserProfile|View user in admin area" msgstr "ПереглÑнути кориÑтувача в адмінці" msgid "UserProfile|You can create a group for several dependent projects." -msgstr "" +msgstr "Ви можете Ñтворити групу Ð´Ð»Ñ Ð´ÐµÐºÑ–Ð»ÑŒÐºÐ¾Ñ… залежних проектів." msgid "UserProfile|You haven't created any personal projects." -msgstr "" +msgstr "Ви ще не Ñтворили жодного оÑобиÑтого проекту." msgid "UserProfile|You haven't created any snippets." -msgstr "" +msgstr "Ви ще не Ñтворили жодних Ñніпетів." msgid "UserProfile|Your projects can be available publicly, internally, or privately, at your choice." -msgstr "" +msgstr "За вашим вибором ваші проекти можуть бути доÑтупні публічно, внутрішньо або приватно." msgid "Users" msgstr "КориÑтувачі" msgid "Users requesting access to" -msgstr "" +msgstr "КориÑтувачі, Ñкі запитують доÑтуп до" msgid "Validate" -msgstr "" +msgstr "Перевірити" msgid "Validate your GitLab CI configuration file" -msgstr "" +msgstr "Перевірити ваш файл конфігурації Gitlab CI" msgid "Value" -msgstr "" +msgstr "ЗначеннÑ" msgid "Various container registry settings." msgstr "Різноманітні Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñ€ÐµÑ”Ñтру контейнерів." @@ -10506,7 +11100,7 @@ msgid "Various email settings." msgstr "Різноманітні Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾ÑˆÑ‚Ð¸." msgid "Various localization settings." -msgstr "" +msgstr "Різні параметри локалізації." msgid "Various settings that affect GitLab performance." msgstr "Різноманітні налаштуваннÑ, що впливають на продуктивніÑÑ‚ÑŒ GitLab." @@ -10515,7 +11109,7 @@ msgid "Verification information" msgstr "Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ перевірку" msgid "Verification status" -msgstr "" +msgstr "Стан перевірки" msgid "Verified" msgstr "Підтверджено" @@ -10530,14 +11124,17 @@ msgid "View app" msgstr "ПереглÑнути заÑтоÑунок" msgid "View deployment" -msgstr "" +msgstr "ПереглÑнути розгортаннÑ" msgid "View details: %{details_url}" -msgstr "" +msgstr "ПереглÑнути деталі: %{details_url}" msgid "View documentation" msgstr "ПереглÑнути документацію" +msgid "View eligible approvers" +msgstr "ПереглÑнути доÑтупних оÑіб Ð´Ð»Ñ Ð·Ð°Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ" + msgid "View epics list" msgstr "ПереглÑнути ÑпиÑок епіків" @@ -10547,8 +11144,8 @@ msgstr "ПереглÑд файла @ " msgid "View group labels" msgstr "ПереглÑнути мітки групи" -msgid "View issue" -msgstr "ПереглÑнути задачу" +msgid "View in Sentry" +msgstr "" msgid "View it on GitLab" msgstr "ПереглÑнути це на GitLab" @@ -10575,7 +11172,7 @@ msgid "View the documentation" msgstr "ПереглÑнути документацію" msgid "Viewing commit" -msgstr "" +msgstr "ПереглÑд коміту" msgid "Visibility and access controls" msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ð¸Ð´Ð¸Ð¼Ð¾ÑÑ‚Ñ– та доÑтупу" @@ -10586,6 +11183,9 @@ msgstr "Рівень видимоÑÑ‚Ñ–" msgid "Visibility level:" msgstr "Рівень видимоÑÑ‚Ñ–:" +msgid "Visibility, project features, permissions" +msgstr "" + msgid "Visibility:" msgstr "ВидиміÑÑ‚ÑŒ:" @@ -10602,10 +11202,10 @@ msgid "VisibilityLevel|Unknown" msgstr "Ðевідомий" msgid "Vulnerability Chart" -msgstr "" +msgstr "СтатиÑтика вразливоÑтей" msgid "Vulnerability List" -msgstr "" +msgstr "СпиÑок вразливоÑтей" msgid "Vulnerability|Class" msgstr "КлаÑ" @@ -10632,7 +11232,7 @@ msgid "Vulnerability|Project" msgstr "Проект" msgid "Vulnerability|Report Type" -msgstr "" +msgstr "Тип звіту" msgid "Vulnerability|Severity" msgstr "Рівень" @@ -10641,19 +11241,19 @@ msgid "Want to see the data? Please ask an administrator for access." msgstr "Хочете побачити дані? Будь лаÑка, попроÑить у адмініÑтратора доÑтуп." msgid "We can't find an epic that matches what you are looking for." -msgstr "" +msgstr "Ми не можемо знайти епік, Ñкий відповідає тому, що ви шукаєте." msgid "We can't find an issue that matches what you are looking for." -msgstr "" +msgstr "Ми не можемо знайти задачу, Ñка відповідає тому, що ви шукаєте." msgid "We could not determine the path to remove the epic" -msgstr "" +msgstr "Ми не змогли визначити шлÑÑ… до Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ ÐµÐ¿Ñ–ÐºÑƒ" msgid "We could not determine the path to remove the issue" -msgstr "" +msgstr "Ми не змогли визначити шлÑÑ… до Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð·Ð°Ð´Ð°Ñ‡Ñ–" msgid "We couldn't find any results matching" -msgstr "" +msgstr "Ðе вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ відповідні результати" msgid "We detected potential spam in the %{humanized_resource_name}. Please solve the reCAPTCHA to proceed." msgstr "Ми виÑвили потенційний Ñпам у %{humanized_resource_name}. Будь лаÑка, введіть цей код Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ reCAPTCHA, щоб продовжити." @@ -10662,7 +11262,7 @@ msgid "We don't have enough data to show this stage." msgstr "Ми не маємо доÑтатньо даних Ð´Ð»Ñ Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ñ†Ñ–Ñ”Ñ— Ñтадії." msgid "We heard back from your U2F device. You have been authenticated." -msgstr "" +msgstr "Ми отримали відповідь від вашого приÑтрою U2F. Ви пройшли автентифікацію." msgid "We want to be sure it is you, please confirm you are not a robot." msgstr "Ми хочемо бути впевнені, що це ви, будь лаÑка, підтвердіть, що ви не робот." @@ -10671,7 +11271,7 @@ msgid "Web IDE" msgstr "Веб-IDE" msgid "Web Terminal" -msgstr "" +msgstr "Веб-термінал" msgid "Web terminal" msgstr "Веб-термінал" @@ -10698,7 +11298,7 @@ msgid "When leaving the URL blank, classification labels can still be specified msgstr "Якщо залишити URL порожнім, можна вÑтановлювати мітки клаÑифікації без Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ð½Ñ Ñ„ÑƒÐ½ÐºÑ†Ñ–Ð¹ проекту та Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ Ð·Ð¾Ð²Ð½Ñ–ÑˆÐ½ÑŒÐ¾Ñ— авторизації." msgid "When:" -msgstr "" +msgstr "Коли:" msgid "Who can see this group?" msgstr "Хто може бачити цю групу?" @@ -10842,7 +11442,7 @@ msgid "Wiki|Wiki Pages" msgstr "Вікі-Ñторінки" msgid "Will deploy to" -msgstr "" +msgstr "Розгорне на" msgid "With contribution analytics you can have an overview for the activity of issues, merge requests and push events of your organization and its members." msgstr "З аналітикою контриб’юторів ви може вивчати активніÑÑ‚ÑŒ в задачах, запитах на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ñ– подій відправки коду Ð´Ð»Ñ Ð²Ð°ÑˆÐ¾Ñ— організації Ñ– Ñ—Ñ— учаÑників." @@ -10850,11 +11450,17 @@ msgstr "З аналітикою контриб’юторів ви може ви msgid "Withdraw Access Request" msgstr "СкаÑувати запит доÑтупу" +msgid "Write" +msgstr "" + msgid "Write a comment or drag your files here…" +msgstr "Ðапишіть коментар або перетÑгніть файли Ñюди…" + +msgid "Write access allowed" msgstr "" msgid "Write milestone description..." -msgstr "" +msgstr "Створити Ð¾Ð¿Ð¸Ñ ÐµÑ‚Ð°Ð¿Ñƒ..." msgid "Yes" msgstr "Так" @@ -10869,7 +11475,7 @@ msgid "Yesterday" msgstr "Вчора" msgid "You" -msgstr "" +msgstr "Ви" msgid "You are an admin, which means granting access to <strong>%{client_name}</strong> will allow them to interact with GitLab as an admin as well. Proceed with caution." msgstr "Ви — адмініÑтратор, а це означає, що Ð½Ð°Ð´Ð°Ð½Ð½Ñ Ð´Ð¾Ñтупу Ð´Ð»Ñ <strong>%{client_name}</strong> дозволить їм взаємодіÑти з GitLab Ñк адмініÑтратору. Продовжуйте обережно." @@ -10890,7 +11496,7 @@ msgid "You are on a read-only GitLab instance." msgstr "Ви знаходитеÑÑ Ð½Ð° інÑтанÑÑ– Gitlab \"тільки Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ\"." msgid "You are receiving this message because you are a GitLab administrator for %{url}." -msgstr "" +msgstr "Ви отримуєте це повідомленнÑ, бо ви Ñ” адмініÑтратором GitLab Ð´Ð»Ñ %{url}." msgid "You can %{linkStart}view the blob%{linkEnd} instead." msgstr "ЗаміÑÑ‚ÑŒ цього ви можете %{linkStart}переглÑнути бінарні дані%{linkEnd}." @@ -10917,7 +11523,7 @@ msgid "You can only edit files when you are on a branch" msgstr "Ви можете редагувати файли, лише перебуваючи у ÑкійÑÑŒ гілці" msgid "You can only merge once the items above are resolved" -msgstr "" +msgstr "Ви можете зливати лише коли вищезгадані пункти будуть вирішені" msgid "You can resolve the merge conflict using either the Interactive mode, by choosing %{use_ours} or %{use_theirs} buttons, or by editing the files directly. Commit these changes into %{branch_name}" msgstr "Ви можете розв’Ñзати цей конфлікт Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð·Ð° допомогою інтерактивного режиму (викориÑтовуючи кнопки %{use_ours} та %{use_theirs}), або безпоÑередньо редагуючи файли. Закомітити зміни у %{branch_name}" @@ -10938,7 +11544,7 @@ msgid "You do not have any subscriptions yet" msgstr "У Ð²Ð°Ñ Ñ‰Ðµ немає підпиÑок" msgid "You do not have permission to run the Web Terminal. Please contact a project administrator." -msgstr "" +msgstr "Ви не маєте дозволу запуÑкати Веб-термінал. Будь лаÑка, звернітьÑÑ Ð´Ð¾ адмініÑтратора проекту." msgid "You do not have the correct permissions to override the settings from the LDAP group sync." msgstr "У Ð²Ð°Ñ Ð½ÐµÐ¼Ð°Ñ” необхідних прав доÑтупу, щоб перевизначити Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñинхронізації LDAP-груп." @@ -10950,16 +11556,19 @@ msgid "You don't have any authorized applications" msgstr "Ви не маєте ніÑких авторизованих заÑтоÑунків" msgid "You don't have any deployments right now." -msgstr "" +msgstr "Ðаразі у Ð²Ð°Ñ Ð½ÐµÐ¼Ð°Ñ” ніÑких розгортань." msgid "You have no permissions" msgstr "У Ð²Ð°Ñ Ð½ÐµÐ¼Ð°Ñ” прав доÑтупу" +msgid "You have not added any approvers. Start by adding users or groups." +msgstr "Ви не додали жодної затверджуючої оÑоби. Почніть з Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ ÐºÐ¾Ñ€Ð¸Ñтувачів або груп." + msgid "You have reached your project limit" msgstr "Ви доÑÑгли Ñвого ліміту по кількоÑÑ‚Ñ– проектів" msgid "You may also add variables that are made available to the running application by prepending the variable key with <code>K8S_SECRET_</code>." -msgstr "" +msgstr "Ви також можете додати змінні, що будуть доÑтупними Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑ‰ÐµÐ½Ð¾Ð³Ð¾ заÑтоÑунку шлÑхом Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð¿Ñ€ÐµÑ„Ñ–ÐºÑу <code>K8S_SECRET_</code> до Ñ—Ñ… імен." msgid "You must accept our Terms of Service and privacy policy in order to register an account" msgstr "Ви повинні прийнÑти правила кориÑÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ ÑервіÑом Ñ– політику конфіденційноÑÑ‚Ñ– Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, щоб Ñтворити обліковий запиÑ" @@ -10971,7 +11580,7 @@ msgid "You need a different license to enable FileLocks feature" msgstr "Ð”Ð»Ñ Ð°ÐºÑ‚Ð¸Ð²Ð°Ñ†Ñ–Ñ— функції Ð‘Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð¤Ð°Ð¹Ð»Ñ–Ð² вам потрібна інша ліцензіÑ" msgid "You need a different license to enable Geo replication." -msgstr "" +msgstr "Вам потрібна інша Ð»Ñ–Ñ†ÐµÐ½Ð·Ñ–Ñ Ð½Ð° викориÑÑ‚Ð°Ð½Ð½Ñ Geo реплікації." msgid "You need git-lfs version %{min_git_lfs_version} (or greater) to continue. Please visit https://git-lfs.github.com" msgstr "Вам потрібна верÑÑ–Ñ git-lfs верÑÑ–Ñ— %{min_git_lfs_version} (або новіша), щоб продовжити. Будь лаÑка, відвідайте Ñторінку https://git-lfs.github.com" @@ -10980,13 +11589,13 @@ msgid "You need permission." msgstr "Вам потрібен дозвіл" msgid "You need to register a two-factor authentication app before you can set up a U2F device." -msgstr "" +msgstr "Вам треба зареєÑтрувати програму Ð´Ð»Ñ Ð´Ð²Ð¾Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð½Ð¾Ñ— автентифікації перед налаштуваннÑм приÑтрою U2F." msgid "You will lose all changes you've made to this file. This action cannot be undone." -msgstr "" +msgstr "Ви втратите вÑÑ– зміни, внеÑені вами в цей файл. Цю дію не можна ÑкаÑувати." msgid "You will lose all the unstaged changes you've made in this project. This action cannot be undone." -msgstr "" +msgstr "Ви втратите вÑÑ– неіндекÑовані зміни, внеÑені вами в цей проект. Цю дію не можна ÑкаÑувати." msgid "You will not get any notifications via email" msgstr "Ви не отримаєте ніÑких повідомлень по електронній пошті" @@ -11015,6 +11624,9 @@ msgstr "Ви не зможете відправлÑти та отримуватРmsgid "You'll need to use different branch names to get a valid comparison." msgstr "Вам необхідно викориÑтовувати різні імена гілок Ð´Ð»Ñ ÐºÐ¾Ñ€ÐµÐºÑ‚Ð½Ð¾Ð³Ð¾ порівнÑннÑ." +msgid "You're only seeing %{startTag}other activity%{endTag} in the feed. To add a comment, switch to one of the following options." +msgstr "" + msgid "You're receiving this email because %{reason}." msgstr "Ви отримали цей електронний лиÑÑ‚, оÑкільки %{reason}." @@ -11043,10 +11655,10 @@ msgid "Your Projects' Activity" msgstr "ÐктивніÑÑ‚ÑŒ ваших проектів" msgid "Your Todos" -msgstr "Ваші Задачі" +msgstr "Ваші ÐагадуваннÑ" msgid "Your U2F device needs to be set up. Plug it in (if not already) and click the button on the left." -msgstr "" +msgstr "Ваш приÑтрій U2F має бути налаштований. Підключіть його (Ñкщо ви цього ще не зробили) Ñ– натиÑніть кнопку зліва." msgid "Your applications (%{size})" msgstr "Ваші заÑтоÑунки (%{size})" @@ -11055,7 +11667,7 @@ msgid "Your authorized applications" msgstr "Ваші авторизовані заÑтоÑунки" msgid "Your browser doesn't support U2F. Please use Google Chrome desktop (version 41 or newer)." -msgstr "" +msgstr "Ваш браузер не підтримує U2F. Будь лаÑка, викориÑтовйте Google Chrome Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¿'ютера (верÑÑ–ÑŽ 41 або новішу)." msgid "Your changes can be committed to %{branch_name} because a merge request is open." msgstr "Ваші зміни можуть бути закомічені до %{branch_name}, оÑкільки запит на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸Ð¹." @@ -11070,22 +11682,22 @@ msgid "Your comment will not be visible to the public." msgstr "Ваш коментар не буде видимим Ð´Ð»Ñ Ð²ÑÑ–Ñ…." msgid "Your device was successfully set up! Give it a name and register it with the GitLab server." -msgstr "" +msgstr "Ваш приÑтрій уÑпішно налаштовано! Дайте йому ім'Ñ Ñ‚Ð° зареєÑтруйте його на Ñервері GitLab." msgid "Your groups" msgstr "Ваші групи" msgid "Your issues are being imported. Once finished, you'll get a confirmation email." -msgstr "" +msgstr "Ваші задачі імпортуютьÑÑ. ПіÑÐ»Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ Ð²Ð¸ отримаєте Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ð¾ електронній пошті із підтвердженнÑм." msgid "Your issues will be imported in the background. Once finished, you'll get a confirmation email." -msgstr "" +msgstr "Ваші задачі будуть імпортовані в фоні. ПіÑÐ»Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ Ð²Ð¸ отримаєте Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ð¾ електронній пошті із підтвердженнÑм." msgid "Your name" msgstr "Ваше ім'Ñ" msgid "Your project limit is %{limit} projects! Please contact your administrator to increase it" -msgstr "" +msgstr "Ваш ліміт проектів Ñкладає %{limit}! Будь лаÑка, звернітьÑÑ Ð´Ð¾ адмініÑтратора, щоб його збільшити" msgid "Your projects" msgstr "Ваші проекти" @@ -11093,6 +11705,9 @@ msgstr "Ваші проекти" msgid "a deleted user" msgstr "видалений кориÑтувач" +msgid "added %{created_at_timeago}" +msgstr "" + msgid "ago" msgstr "тому" @@ -11105,7 +11720,13 @@ msgstr "тощо" msgid "assign yourself" msgstr "призначити Ñебе" +msgid "at" +msgstr "" + msgid "attach a new file" +msgstr "прикріпити новий файл" + +msgid "authored" msgstr "" msgid "branch name" @@ -11132,6 +11753,20 @@ msgstr "%{vulnerability} впливає на %{namespace}." msgid "ciReport|%{remainingPackagesCount} more" msgstr "%{remainingPackagesCount} більше" +msgid "ciReport|%{reportType} %{status} detected %{dismissedCount} dismissed vulnerability" +msgid_plural "ciReport|%{reportType} %{status} detected %{dismissedCount} dismissed vulnerabilities" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +msgid "ciReport|%{reportType} %{status} detected %{dismissedCount} dismissed vulnerability for the source branch only" +msgid_plural "ciReport|%{reportType} %{status} detected %{dismissedCount} dismissed vulnerabilities for the source branch only" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + msgid "ciReport|%{reportType} %{status} detected %{fixedCount} fixed vulnerability" msgid_plural "ciReport|%{reportType} %{status} detected %{fixedCount} fixed vulnerabilities" msgstr[0] "%{reportType} %{status} виÑвив %{fixedCount} виправлену вразливіÑÑ‚ÑŒ" @@ -11139,6 +11774,9 @@ msgstr[1] "%{reportType} %{status} виÑвив %{fixedCount} виправлен msgstr[2] "%{reportType} %{status} виÑвив %{fixedCount} виправлених вразливоÑтей" msgstr[3] "%{reportType} %{status} виÑвив %{fixedCount} виправлених вразливоÑтей" +msgid "ciReport|%{reportType} %{status} detected %{fixedCount} fixed, and %{dismissedCount} dismissed vulnerabilities" +msgstr "" + msgid "ciReport|%{reportType} %{status} detected %{newCount} new vulnerability" msgid_plural "ciReport|%{reportType} %{status} detected %{newCount} new vulnerabilities" msgstr[0] "%{reportType} %{status} виÑвив %{newCount} нову вразливіÑÑ‚ÑŒ" @@ -11146,6 +11784,15 @@ msgstr[1] "%{reportType} %{status} виÑвив %{newCount} нові вразлРmsgstr[2] "%{reportType} %{status} виÑвив %{newCount} нових вразливоÑтей" msgstr[3] "%{reportType} %{status} виÑвив %{newCount} нових вразливоÑтей" +msgid "ciReport|%{reportType} %{status} detected %{newCount} new, %{fixedCount} fixed, and %{dismissedCount} dismissed vulnerabilities" +msgstr "" + +msgid "ciReport|%{reportType} %{status} detected %{newCount} new, and %{dismissedCount} dismissed vulnerabilities" +msgstr "" + +msgid "ciReport|%{reportType} %{status} detected %{newCount} new, and %{dismissedCount} dismissed vulnerabilities for the source branch only" +msgstr "" + msgid "ciReport|%{reportType} %{status} detected %{newCount} new, and %{fixedCount} fixed vulnerabilities" msgstr "%{reportType} %{status} виÑвив %{newCount} нових та %{fixedCount} виправлених вразливоÑтей" @@ -11199,17 +11846,29 @@ msgstr "ЯкіÑÑ‚ÑŒ коду" msgid "ciReport|Confidence" msgstr "ВпевненіÑÑ‚ÑŒ" +msgid "ciReport|Container Scanning" +msgstr "" + msgid "ciReport|Container scanning" msgstr "Ð¡ÐºÐ°Ð½ÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ¾Ð½Ñ‚ÐµÐ¹Ð½ÐµÑ€Ð°" msgid "ciReport|Container scanning detects known vulnerabilities in your docker images." msgstr "Ð¡ÐºÐ°Ð½ÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ¾Ð½Ñ‚ÐµÐ¹Ð½ÐµÑ€Ñ–Ð² виÑвлÑÑ” відомі вразливоÑÑ‚Ñ– у ваших Docker образах." +msgid "ciReport|Create issue" +msgstr "" + +msgid "ciReport|Create merge request" +msgstr "" + +msgid "ciReport|Created %{eventType}" +msgstr "" + msgid "ciReport|DAST" msgstr "DAST" msgid "ciReport|Dependency Scanning" -msgstr "" +msgstr "Ð¡ÐºÐ°Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð°Ð»ÐµÐ¶Ð½Ð¾Ñтей" msgid "ciReport|Dependency Scanning detects known vulnerabilities in your source code's dependencies." msgstr "Ð¡ÐºÐ°Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð°Ð»ÐµÐ¶Ð½Ð¾Ñтей виÑвлÑÑ” відомі вразливоÑÑ‚Ñ– у залежноÑÑ‚ÑÑ… вашого коду." @@ -11227,10 +11886,10 @@ msgid "ciReport|Dismissed by" msgstr "Відхилено" msgid "ciReport|Download and apply the patch to fix this vulnerability." -msgstr "" +msgstr "Завантажити або заÑтоÑувати патч, щоб виправити цю вразливіÑÑ‚ÑŒ." msgid "ciReport|Download patch" -msgstr "" +msgstr "Завантажити патч" msgid "ciReport|Dynamic Application Security Testing (DAST) detects known vulnerabilities in your web application." msgstr "Динамічне теÑÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð±ÐµÐ·Ð¿ÐµÐºÐ¸ заÑтоÑунків (DAST) виÑвлÑÑ” відомі вразливоÑÑ‚Ñ– у вашому веб-заÑтоÑунку." @@ -11247,9 +11906,15 @@ msgstr "Виправлено:" msgid "ciReport|Identifiers" msgstr "Ідентифікатори" +msgid "ciReport|Implement this solution by creating a merge request" +msgstr "" + msgid "ciReport|Instances" msgstr "ІнÑтанÑи" +msgid "ciReport|Investigate this vulnerability by creating an issue" +msgstr "" + msgid "ciReport|Learn more about interacting with security reports (Alpha)." msgstr "ДізнатиÑÑ Ð±Ñ–Ð»ÑŒÑˆÐµ про взаємодію з звітами безпеки (Ðльфа)." @@ -11297,9 +11962,6 @@ msgstr "Ðемає змін у показниках продуктивноÑÑ‚Ñ– msgid "ciReport|Performance metrics" msgstr "Показники продуктивноÑÑ‚Ñ–" -msgid "ciReport|Revert dismissal" -msgstr "Відмінити відхиленнÑ" - msgid "ciReport|SAST" msgstr "SAST" @@ -11321,6 +11983,9 @@ msgstr "Статичне теÑÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð±ÐµÐ·Ð¿ÐµÐºÐ¸ заÑтоÑÑƒÐ½ÐºÑ msgid "ciReport|There was an error creating the issue. Please try again." msgstr "Помилка при Ñтворенні задачі. Будь лаÑка Ñпробуйте знову." +msgid "ciReport|There was an error creating the merge request. Please try again." +msgstr "" + msgid "ciReport|There was an error dismissing the vulnerability. Please try again." msgstr "Помилка при відхиленні вразливоÑÑ‚Ñ–. Будь лаÑка, Ñпробуйте знову." @@ -11339,6 +12004,9 @@ msgstr "Помилка при завантаженні звіту по ÑÐºÐ°Ð½Ñ msgid "ciReport|There was an error reverting the dismissal. Please try again." msgstr "Помилка при відміні відхиленнÑ. Будь лаÑка, Ñпробуйте знову." +msgid "ciReport|Undo dismiss" +msgstr "" + msgid "ciReport|Upgrade %{name} from %{version} to %{fixed}." msgstr "Оновити %{name} з %{version} до %{fixed}." @@ -11359,7 +12027,7 @@ msgid "command line instructions" msgstr "інÑтрукції Ð´Ð»Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð³Ð¾ Ñ€Ñдка" msgid "commented on %{link_to_project}" -msgstr "" +msgstr "прокоментовано в %{link_to_project}" msgid "confidentiality|You are going to turn off the confidentiality. This means <strong>everyone</strong> will be able to see and leave a comment on this issue." msgstr "Ви вимикаєте конфіденційніÑÑ‚ÑŒ. Це означає, що <strong>будь-хто</strong> зможе бачити Ñ– залишати коментарі Ð´Ð»Ñ Ñ†Ñ–Ñ”Ñ— задачі." @@ -11384,7 +12052,7 @@ msgstr[2] "днів" msgstr[3] "днів" msgid "deleted" -msgstr "" +msgstr "видалено" msgid "deploy token" msgstr "токен Ð´Ð»Ñ Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ" @@ -11394,10 +12062,10 @@ msgstr "вимкнено" msgid "discussion resolved" msgid_plural "discussions resolved" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "Ð¾Ð±Ð³Ð¾Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¾" +msgstr[1] "Ð¾Ð±Ð³Ð¾Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¾" +msgstr[2] "обговорень завершено" +msgstr[3] "обговорень завершено" msgid "done" msgstr "готово" @@ -11413,13 +12081,13 @@ msgid "enabled" msgstr "увімкнено" msgid "epic" -msgstr "" +msgstr "епік" msgid "error" -msgstr "" +msgstr "помилка" msgid "error code:" -msgstr "" +msgstr "код помилки:" msgid "estimateCommand|%{slash_command} will update the estimated time with the latest command." msgstr "%{slash_command} перезапиÑує запланований Ñ‡Ð°Ñ Ð¾Ñтаннім значеннÑм." @@ -11431,7 +12099,7 @@ msgid "from" msgstr "від" msgid "group" -msgstr "" +msgstr "група" msgid "help" msgstr "допомога" @@ -11439,9 +12107,6 @@ msgstr "допомога" msgid "here" msgstr "тут" -msgid "http://<sentry-host>/api/0/projects/{organization_slug}/{project_slug}/" -msgstr "" - msgid "https://your-bitbucket-server" msgstr "https://your-bitbucket-server" @@ -11455,10 +12120,10 @@ msgid "importing" msgstr "імпорт" msgid "in group %{link_to_group}" -msgstr "" +msgstr "в групі %{link_to_group}" msgid "in project %{link_to_project}" -msgstr "" +msgstr "в проекті %{link_to_project}" msgid "index" msgstr "" @@ -11483,7 +12148,7 @@ msgid "is out of the hierarchy of the Group owning the template" msgstr "" msgid "issue" -msgstr "" +msgstr "задача" msgid "issue boards" msgstr "дошки Ð¾Ð±Ð³Ð¾Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð·Ð°Ð´Ð°Ñ‡" @@ -11492,13 +12157,13 @@ msgid "it is stored externally" msgstr "" msgid "it is stored in LFS" -msgstr "" +msgstr "зберігаєтьÑÑ Ð² LFS" msgid "it is too large" msgstr "" msgid "latest" -msgstr "" +msgstr "оÑтанній" msgid "latest deployment" msgstr "оÑтаннє розгортаннÑ" @@ -11523,19 +12188,22 @@ msgstr[2] "запитів на злиттÑ" msgstr[3] "запитів на злиттÑ" msgid "missing" -msgstr "" +msgstr "відÑутні" msgid "mrWidgetCommitsAdded|%{commitCount} and %{mergeCommitCount} will be added to %{targetBranch}." +msgstr "%{commitCount} Ñ– %{mergeCommitCount} буде додано до %{targetBranch}." + +msgid "mrWidgetCommitsAdded|%{commitCount} will be added to %{targetBranch}." msgstr "" msgid "mrWidgetCommitsAdded|1 merge commit" -msgstr "" +msgstr "1 коміт-злиттÑ" msgid "mrWidget| Please restore it or use a different %{missingBranchName} branch" msgstr "Будь лаÑка відновіть Ñ—Ñ— або викориÑтовуйте іншу %{missingBranchName} гілку" msgid "mrWidget|%{link_start}Learn more about resolving conflicts%{link_end}" -msgstr "" +msgstr "%{link_start}Докладніше про Ð²Ð¸Ñ€Ñ–ÑˆÐµÐ½Ð½Ñ ÐºÐ¾Ð½Ñ„Ð»Ñ–ÐºÑ‚Ñ–Ð²%{link_end}" msgid "mrWidget|%{metricsLinkStart} Memory %{metricsLinkEnd} usage %{emphasisStart} decreased %{emphasisEnd} from %{memoryFrom}MB to %{memoryTo}MB" msgstr "ВикориÑÑ‚Ð°Ð½Ð½Ñ %{metricsLinkStart} пам’ÑÑ‚Ñ– %{metricsLinkEnd} %{emphasisStart} впало %{emphasisEnd} з %{memoryFrom}Мб до %{memoryTo}Мб" @@ -11553,10 +12221,10 @@ msgid "mrWidget|Allows commits from members who can merge to the target branch" msgstr "ДозволÑÑ” коміти від учаÑників, Ñкі можуть зливати до цільової гілки" msgid "mrWidget|An error occurred while removing your approval." -msgstr "" +msgstr "Під Ñ‡Ð°Ñ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð²Ð°ÑˆÐ¾Ð³Ð¾ Ð·Ð°Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ ÑталаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°." msgid "mrWidget|An error occurred while retrieving approval data for this merge request." -msgstr "" +msgstr "Помилка при отриманні даних про Ð·Ð°Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ запиту на злиттÑ." msgid "mrWidget|An error occurred while submitting your approval." msgstr "Помилка при обробці вашого затвердженнÑ." @@ -11564,6 +12232,9 @@ msgstr "Помилка при обробці вашого затвердженн msgid "mrWidget|Approve" msgstr "Затвердити" +msgid "mrWidget|Approve additionally" +msgstr "" + msgid "mrWidget|Approved by" msgstr "Затверджено" @@ -11595,7 +12266,7 @@ msgid "mrWidget|Create an issue to resolve them later" msgstr "Створіть задачу, щоб вирішити Ñ—Ñ… пізніше" msgid "mrWidget|Delete source branch" -msgstr "" +msgstr "Видалити гілку-джерело" msgid "mrWidget|Deployment statistics are not available currently" msgstr "СтатиÑтика Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ Ð½Ð°Ñ€Ð°Ð·Ñ– недоÑтупна" @@ -11636,17 +12307,20 @@ msgstr "Злити локально" msgid "mrWidget|Merge request approved" msgstr "Запит на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð·Ð°Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð¾" +msgid "mrWidget|Merge request approved." +msgstr "" + msgid "mrWidget|Merge request approved; you can approve additionally" msgstr "Запит на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð±ÑƒÐ»Ð¾ затверджено; Ви можете затвердити додатково" msgid "mrWidget|Merged by" msgstr "Злито" -msgid "mrWidget|No Approval required" -msgstr "Ð—Ð°Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ð½Ðµ потрібне" +msgid "mrWidget|No approval required" +msgstr "" -msgid "mrWidget|No Approval required; you can still approve" -msgstr "Ð—Ð°Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ð½Ðµ Ñ” обов’Ñзковим; але ви вÑе одно можете це зробити" +msgid "mrWidget|No approval required; you can still approve" +msgstr "" msgid "mrWidget|Open in Web IDE" msgstr "Відкрити у Web IDE" @@ -11701,6 +12375,9 @@ msgstr "Ðнулювати" msgid "mrWidget|Revert this merge request in a new merge request" msgstr "Ðнулювати цей запит на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð·Ð° допомогою нового запиту на злиттÑ" +msgid "mrWidget|Revoke approval" +msgstr "" + msgid "mrWidget|Set by" msgstr "Ð’Ñтановлено" @@ -11720,19 +12397,19 @@ msgid "mrWidget|The source branch HEAD has recently changed. Please reload the p msgstr "HEAD гілки-джерела нещодавно було змінено. Будь лаÑка оновіть Ñторінку Ñ– переглÑньте зміни перед злиттÑм" msgid "mrWidget|The source branch has been deleted" -msgstr "" +msgstr "Гілку-джерело видалено" msgid "mrWidget|The source branch is %{commitsBehindLinkStart}%{commitsBehind}%{commitsBehindLinkEnd} the target branch" msgstr "Гілка-джерело на %{commitsBehindLinkStart}%{commitsBehind}%{commitsBehindLinkEnd} цільової гілки" msgid "mrWidget|The source branch is being deleted" -msgstr "" +msgstr "Гілка-джерело в процеÑÑ– видаленнÑ" msgid "mrWidget|The source branch will be deleted" -msgstr "" +msgstr "Гілку-джерело буде видалено" msgid "mrWidget|The source branch will not be deleted" -msgstr "" +msgstr "Гілку-джерело не буде видалено" msgid "mrWidget|There are merge conflicts" msgstr "Ñ–Ñнують конфлікти при злитті" @@ -11741,7 +12418,7 @@ msgid "mrWidget|There are unresolved discussions. Please resolve these discussio msgstr "ПриÑутні незавершені обговореннÑ. Будь лаÑка завершіть Ñ—Ñ…" msgid "mrWidget|This feature merges changes from the target branch to the source branch. You cannot use this feature since the source branch is protected." -msgstr "" +msgstr "Ð¦Ñ Ñ„ÑƒÐ½ÐºÑ†Ñ–Ñ Ð·Ð»Ð¸Ð²Ð°Ñ” зміни з цільової гілки до гілки-джерела. Її не можна викориÑтовувати, оÑкільки гілка-джерело Ñ” захищеною." msgid "mrWidget|This merge request failed to be merged automatically" msgstr "ВідбулаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° при автоматичному злитті цього запиту" @@ -11756,7 +12433,7 @@ msgid "mrWidget|You are not allowed to edit this project directly. Please fork t msgstr "Ви не можете безпоÑередньо редагувати цей проект. Будь лаÑка, зробіть форк, щоб внеÑти зміни." msgid "mrWidget|You can delete the source branch now" -msgstr "" +msgstr "Тепер ви можете видалити гілку-джерело" msgid "mrWidget|You can merge this merge request manually using the" msgstr "Ви можете прийнÑти цей запит на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð²Ñ€ÑƒÑ‡Ð½Ñƒ за допомогою" @@ -11780,19 +12457,19 @@ msgid "new merge request" msgstr "Ðовий запит на злиттÑ" msgid "none" -msgstr "" +msgstr "немає" msgid "notification emails" msgstr "ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ ÐµÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾ÑŽ поштою" msgid "nounSeries|%{firstItem} and %{lastItem}" -msgstr "" +msgstr "%{firstItem} Ñ– %{lastItem}" msgid "nounSeries|%{item}, %{nextItem}" -msgstr "" +msgstr "%{item}, %{nextItem}" msgid "nounSeries|%{item}, and %{lastItem}" -msgstr "" +msgstr "%{item}, Ñ– %{lastItem}" msgid "or" msgstr "або" @@ -11818,7 +12495,7 @@ msgid "personal access token" msgstr "оÑобиÑтий токен доÑтупу" msgid "private" -msgstr "" +msgstr "приватний" msgid "private key does not match certificate." msgstr "приватний ключ не відповідає Ñертифікату." @@ -11831,10 +12508,10 @@ msgstr[2] "проектів" msgstr[3] "проектів" msgid "quick actions" -msgstr "" +msgstr "швидкі дії" msgid "register" -msgstr "" +msgstr "зареєÑтруватиÑÑ" msgid "remaining" msgstr "залишилоÑÑŒ" @@ -11859,16 +12536,19 @@ msgstr[2] "відповідей" msgstr[3] "відповідей" msgid "score" +msgstr "результат" + +msgid "security Reports|There was an error creating the merge request" msgstr "" msgid "should be higher than %{access} inherited membership from group %{group_name}" -msgstr "" +msgstr "має бути вищим за %{access}, уÑпадкованого з групи %{group_name}" msgid "show less" -msgstr "" +msgstr "показати менше" msgid "sign in" -msgstr "" +msgstr "увійти" msgid "source" msgstr "джерело" @@ -11883,13 +12563,13 @@ msgid "started" msgstr "розпочато" msgid "stuck" -msgstr "" +msgstr "заблоковано" msgid "syntax is correct" -msgstr "" +msgstr "ÑинтакÑÐ¸Ñ Ð¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¸Ð¹" msgid "syntax is incorrect" -msgstr "" +msgstr "ÑинтакÑÐ¸Ñ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¸Ð¹" msgid "this document" msgstr "цей документ" @@ -11898,10 +12578,10 @@ msgid "to help your contributors communicate effectively!" msgstr "щоб допомогти вашим контриб’юторам ефективно ÑпілкуватиÑÑ!" msgid "triggered" -msgstr "" +msgstr "запущено" msgid "updated" -msgstr "" +msgstr "оновлено" msgid "username" msgstr "ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача" @@ -61,6 +61,7 @@ module QA autoload :File, 'qa/resource/file' autoload :Fork, 'qa/resource/fork' autoload :SSHKey, 'qa/resource/ssh_key' + autoload :Snippet, 'qa/resource/snippet' module Events autoload :Base, 'qa/resource/events/base' @@ -142,6 +143,12 @@ module QA module Dashboard autoload :Projects, 'qa/page/dashboard/projects' autoload :Groups, 'qa/page/dashboard/groups' + + module Snippet + autoload :New, 'qa/page/dashboard/snippet/new' + autoload :Index, 'qa/page/dashboard/snippet/index' + autoload :Show, 'qa/page/dashboard/snippet/show' + end end module Group diff --git a/qa/qa/page/dashboard/projects.rb b/qa/qa/page/dashboard/projects.rb index 0f434577b3b..271c5456efe 100644 --- a/qa/qa/page/dashboard/projects.rb +++ b/qa/qa/page/dashboard/projects.rb @@ -2,8 +2,6 @@ module QA module Page module Dashboard class Projects < Page::Base - view 'app/views/dashboard/projects/index.html.haml' - view 'app/views/shared/projects/_search_form.html.haml' do element :form_filter_by_name, /form_tag.+id: 'project-filter-form'/ # rubocop:disable QA/ElementWithPattern end diff --git a/qa/qa/page/dashboard/snippet/index.rb b/qa/qa/page/dashboard/snippet/index.rb new file mode 100644 index 00000000000..1f467fda9e1 --- /dev/null +++ b/qa/qa/page/dashboard/snippet/index.rb @@ -0,0 +1,21 @@ +# frozen_string_literal: true + +module QA + module Page + module Dashboard + module Snippet + class Index < Page::Base + view 'app/views/layouts/header/_new_dropdown.haml' do + element :new_menu_toggle + element :global_new_snippet_link + end + + def go_to_new_snippet_page + click_element :new_menu_toggle + click_element :global_new_snippet_link + end + end + end + end + end +end diff --git a/qa/qa/page/dashboard/snippet/new.rb b/qa/qa/page/dashboard/snippet/new.rb new file mode 100644 index 00000000000..a637b869d2f --- /dev/null +++ b/qa/qa/page/dashboard/snippet/new.rb @@ -0,0 +1,53 @@ +# frozen_string_literal: true + +module QA + module Page + module Dashboard + module Snippet + class New < Page::Base + view 'app/views/shared/form_elements/_description.html.haml' do + element :issuable_form_description + end + + view 'app/views/shared/snippets/_form.html.haml' do + element :snippet_title + element :snippet_file_name + element :create_snippet_button + end + + def fill_title(title) + fill_element :snippet_title, title + end + + def fill_description(description) + fill_element :issuable_form_description, description + end + + def set_visibility(visibility) + choose visibility + end + + def fill_file_name(name) + finished_loading? + fill_element :snippet_file_name, name + end + + def fill_file_content(content) + finished_loading? + text_area.set content + end + + def create_snippet + click_element :create_snippet_button + end + + private + + def text_area + find('#editor>textarea', visible: false) + end + end + end + end + end +end diff --git a/qa/qa/page/dashboard/snippet/show.rb b/qa/qa/page/dashboard/snippet/show.rb new file mode 100644 index 00000000000..a75ea63eca7 --- /dev/null +++ b/qa/qa/page/dashboard/snippet/show.rb @@ -0,0 +1,63 @@ +# frozen_string_literal: true + +module QA + module Page + module Dashboard + module Snippet + class Show < Page::Base + view 'app/views/shared/snippets/_header.html.haml' do + element :snippet_title + element :snippet_description + element :embed_type + element :snippet_box + end + + view 'app/views/projects/blob/_header_content.html.haml' do + element :file_title_name + end + + view 'app/views/shared/_file_highlight.html.haml' do + element :file_content + end + + def has_snippet_title?(snippet_title) + within_element(:snippet_title) do + has_text?(snippet_title) + end + end + + def has_snippet_description?(snippet_description) + within_element(:snippet_description) do + has_text?(snippet_description) + end + end + + def has_embed_type?(embed_type) + within_element(:embed_type) do + has_text?(embed_type) + end + end + + def has_visibility_type?(visibility_type) + within_element(:snippet_box) do + has_text?(visibility_type) + end + end + + def has_file_name?(file_name) + within_element(:file_title_name) do + has_text?(file_name) + end + end + + def has_file_content?(file_content) + finished_loading? + within_element(:file_content) do + has_text?(file_content) + end + end + end + end + end + end +end diff --git a/qa/qa/page/main/menu.rb b/qa/qa/page/main/menu.rb index 55500e831c6..1b3445b0064 100644 --- a/qa/qa/page/main/menu.rb +++ b/qa/qa/page/main/menu.rb @@ -19,6 +19,7 @@ module QA element :admin_area_link element :projects_dropdown element :groups_dropdown + element :snippets_link end view 'app/views/layouts/nav/projects_dropdown/_show.html.haml' do @@ -66,6 +67,10 @@ module QA end end + def go_to_snippets + click_element :snippets_link + end + def has_personal_area?(wait: Capybara.default_max_wait_time) has_element?(:user_avatar, wait: wait) end diff --git a/qa/qa/page/project/web_ide/edit.rb b/qa/qa/page/project/web_ide/edit.rb index 2b6c01888d5..ff7cc04e352 100644 --- a/qa/qa/page/project/web_ide/edit.rb +++ b/qa/qa/page/project/web_ide/edit.rb @@ -43,11 +43,9 @@ module QA def create_new_file_from_template(file_name, template) click_element :new_file within_element(:template_list) do - begin - click_on file_name - rescue Capybara::ElementNotFound - raise ElementNotFound, %Q(Couldn't find file template named "#{file_name}". Please confirm that it is a valid option.) - end + click_on file_name + rescue Capybara::ElementNotFound + raise ElementNotFound, %Q(Couldn't find file template named "#{file_name}". Please confirm that it is a valid option.) end wait(reload: false) do diff --git a/qa/qa/resource/snippet.rb b/qa/qa/resource/snippet.rb new file mode 100644 index 00000000000..1478f197570 --- /dev/null +++ b/qa/qa/resource/snippet.rb @@ -0,0 +1,30 @@ +# frozen_string_literal: true + +module QA + module Resource + class Snippet < Base + attr_accessor :title, :description, :file_content, :visibility, :file_name + + def initialize + @title = 'New snippet title' + @description = 'The snippet description' + @visibility = 'Public' + @file_content = 'The snippet content' + @file_name = 'New snippet file name' + end + + def fabricate! + Page::Dashboard::Snippet::Index.perform(&:go_to_new_snippet_page) + + Page::Dashboard::Snippet::New.perform do |page| + page.fill_title(@title) + page.fill_description(@description) + page.set_visibility(@visibility) + page.fill_file_name(@file_name) + page.fill_file_content(@file_content) + page.create_snippet + end + end + end + end +end diff --git a/qa/qa/specs/features/browser_ui/3_create/snippet/create_snippet_spec.rb b/qa/qa/specs/features/browser_ui/3_create/snippet/create_snippet_spec.rb new file mode 100644 index 00000000000..ab53dff464e --- /dev/null +++ b/qa/qa/specs/features/browser_ui/3_create/snippet/create_snippet_spec.rb @@ -0,0 +1,31 @@ +# frozen_string_literal: true + +module QA + context 'Create', :smoke do + describe 'Snippet creation' do + it 'User creates a snippet' do + Runtime::Browser.visit(:gitlab, Page::Main::Login) + Page::Main::Login.perform(&:sign_in_using_credentials) + + Page::Main::Menu.perform(&:go_to_snippets) + + Resource::Snippet.fabricate_via_browser_ui! do |snippet| + snippet.title = 'Snippet title' + snippet.description = 'Snippet description' + snippet.visibility = 'Public' + snippet.file_name = 'New snippet file name' + snippet.file_content = 'Snippet file text' + end + + Page::Dashboard::Snippet::Show.perform do |snippet| + expect(snippet).to have_snippet_title('Snippet title') + expect(snippet).to have_snippet_description('Snippet description') + expect(snippet).to have_embed_type('Embed') + expect(snippet).to have_visibility_type('Public') + expect(snippet).to have_file_name('New snippet file name') + expect(snippet).to have_file_content('Snippet file text') + end + end + end + end +end diff --git a/qa/qa/specs/features/browser_ui/3_create/web_ide/add_file_template_spec.rb b/qa/qa/specs/features/browser_ui/3_create/web_ide/add_file_template_spec.rb index f176ec31abd..66cd712afb0 100644 --- a/qa/qa/specs/features/browser_ui/3_create/web_ide/add_file_template_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/web_ide/add_file_template_spec.rb @@ -1,7 +1,8 @@ # frozen_string_literal: true module QA - context 'Create' do + # Failure issue: https://gitlab.com/gitlab-org/quality/staging/issues/46 + context 'Create', :quarantine do describe 'Web IDE file templates' do include Runtime::Fixtures diff --git a/scripts/gitaly_test.rb b/scripts/gitaly_test.rb index dee4c2eba7e..b5d3facd18a 100644 --- a/scripts/gitaly_test.rb +++ b/scripts/gitaly_test.rb @@ -79,15 +79,13 @@ module GitalyTest socket = read_socket_path Integer(timeout / delay).times do - begin - UNIXSocket.new(socket) - puts ' OK' - - return - rescue Errno::ENOENT, Errno::ECONNREFUSED - print '.' - sleep delay - end + UNIXSocket.new(socket) + puts ' OK' + + return + rescue Errno::ENOENT, Errno::ECONNREFUSED + print '.' + sleep delay end puts ' FAILED' diff --git a/scripts/merge-simplecov b/scripts/merge-simplecov index 65f93f8830b..746be3317a7 100755 --- a/scripts/merge-simplecov +++ b/scripts/merge-simplecov @@ -12,11 +12,9 @@ module SimpleCov def resultset_hashes resultset_files.map do |path| - begin - JSON.parse(File.read(path)) - rescue - {} - end + JSON.parse(File.read(path)) + rescue + {} end end diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb index 21e5122c06b..b2e6df6060a 100644 --- a/spec/controllers/groups_controller_spec.rb +++ b/spec/controllers/groups_controller_spec.rb @@ -32,21 +32,46 @@ describe GroupsController do end end + shared_examples 'details view' do + it { is_expected.to render_template('groups/show') } + + context 'as atom' do + let!(:event) { create(:event, project: project) } + let(:format) { :atom } + + it { is_expected.to render_template('groups/show') } + + it 'assigns events for all the projects in the group' do + subject + expect(assigns(:events)).to contain_exactly(event) + end + end + end + describe 'GET #show' do before do sign_in(user) project end - context 'as atom' do - it 'assigns events for all the projects in the group' do - create(:event, project: project) + let(:format) { :html } - get :show, params: { id: group.to_param }, format: :atom + subject { get :show, params: { id: group.to_param }, format: format } - expect(assigns(:events)).not_to be_empty - end + it_behaves_like 'details view' + end + + describe 'GET #details' do + before do + sign_in(user) + project end + + let(:format) { :html } + + subject { get :details, params: { id: group.to_param }, format: format } + + it_behaves_like 'details view' end describe 'GET edit' do diff --git a/spec/features/projects/show/user_sees_git_instructions_spec.rb b/spec/features/projects/show/user_sees_git_instructions_spec.rb index ffa80235083..0d59ef4a727 100644 --- a/spec/features/projects/show/user_sees_git_instructions_spec.rb +++ b/spec/features/projects/show/user_sees_git_instructions_spec.rb @@ -13,7 +13,7 @@ describe 'Projects > Show > User sees Git instructions' do it 'shows Git command line instructions' do click_link 'Create empty repository' - page.within '.empty_wrapper' do + page.within '.empty-wrapper' do expect(page).to have_content('Command line instructions') end end diff --git a/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb b/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb index dcca1d388c7..58bd20d7551 100644 --- a/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb +++ b/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb @@ -20,18 +20,18 @@ describe 'Projects > Show > User sees setup shortcut buttons' do visit project_path(project) end - it 'no Auto DevOps button if can not manage pipelines' do - page.within('.project-buttons') do - expect(page).not_to have_link('Enable Auto DevOps') - expect(page).not_to have_link('Auto DevOps enabled') - end - end - - it '"Auto DevOps enabled" button not linked' do + it 'Project buttons are not visible' do visit project_path(project) page.within('.project-buttons') do - expect(page).to have_text('Auto DevOps enabled') + expect(page).not_to have_link('New file') + expect(page).not_to have_link('Add README') + expect(page).not_to have_link('Add CHANGELOG') + expect(page).not_to have_link('Add CONTRIBUTING') + expect(page).not_to have_link('Enable Auto DevOps') + expect(page).not_to have_link('Auto DevOps enabled') + expect(page).not_to have_link('Add Kubernetes cluster') + expect(page).not_to have_link('Kubernetes configured') end end end @@ -61,46 +61,6 @@ describe 'Projects > Show > User sees setup shortcut buttons' do expect(page).to have_link('Add license', href: presenter.add_license_path) end end - - describe 'Auto DevOps button' do - context 'when Auto DevOps is enabled' do - it '"Auto DevOps enabled" anchor linked to settings page' do - visit project_path(project) - - page.within('.project-buttons') do - expect(page).to have_link('Auto DevOps enabled', href: project_settings_ci_cd_path(project, anchor: 'autodevops-settings')) - end - end - end - - context 'when Auto DevOps is not enabled' do - let(:project) { create(:project, :public, :empty_repo, auto_devops_attributes: { enabled: false }) } - - it '"Enable Auto DevOps" button linked to settings page' do - page.within('.project-buttons') do - expect(page).to have_link('Enable Auto DevOps', href: project_settings_ci_cd_path(project, anchor: 'autodevops-settings')) - end - end - end - end - - describe 'Kubernetes cluster button' do - it '"Add Kubernetes cluster" button linked to clusters page' do - page.within('.project-buttons') do - expect(page).to have_link('Add Kubernetes cluster', href: new_project_cluster_path(project)) - end - end - - it '"Kubernetes cluster" anchor linked to cluster page' do - cluster = create(:cluster, :provided_by_gcp, projects: [project]) - - visit project_path(project) - - page.within('.project-buttons') do - expect(page).to have_link('Kubernetes configured', href: project_cluster_path(project, cluster)) - end - end - end end end diff --git a/spec/features/security/group/private_access_spec.rb b/spec/features/security/group/private_access_spec.rb index de38a2c0204..a776169a8e5 100644 --- a/spec/features/security/group/private_access_spec.rb +++ b/spec/features/security/group/private_access_spec.rb @@ -98,11 +98,7 @@ describe 'Private Group access' do let(:project) { create(:project, :public) } before do - Projects::GroupLinks::CreateService.new( - project, - create(:user), - link_group_access: ProjectGroupLink::DEVELOPER - ).execute(group) + create(:project_group_link, project: project, group: group) end subject { group_path(group) } diff --git a/spec/fixtures/api/schemas/board.json b/spec/fixtures/api/schemas/board.json index 03aca4a3cc0..7c146647948 100644 --- a/spec/fixtures/api/schemas/board.json +++ b/spec/fixtures/api/schemas/board.json @@ -6,6 +6,5 @@ "properties" : { "id": { "type": "integer" }, "name": { "type": "string" } - }, - "additionalProperties": false + } } diff --git a/spec/fixtures/api/schemas/entities/issue.json b/spec/fixtures/api/schemas/entities/issue.json index 00abe73ec8a..162fb9c8108 100644 --- a/spec/fixtures/api/schemas/entities/issue.json +++ b/spec/fixtures/api/schemas/entities/issue.json @@ -38,6 +38,5 @@ "items": { "$ref": "label.json" } }, "assignees": { "type": ["array", "null"] } - }, - "additionalProperties": false + } } diff --git a/spec/fixtures/api/schemas/entities/issue_boards.json b/spec/fixtures/api/schemas/entities/issue_boards.json index 0ac1d9468c8..742f7be5485 100644 --- a/spec/fixtures/api/schemas/entities/issue_boards.json +++ b/spec/fixtures/api/schemas/entities/issue_boards.json @@ -10,6 +10,5 @@ "items": { "$ref": "issue_board.json" } }, "size": { "type": "integer" } - }, - "additionalProperties": false + } } diff --git a/spec/fixtures/api/schemas/entities/merge_request_widget.json b/spec/fixtures/api/schemas/entities/merge_request_widget.json index 67c209f3fc3..6b1cd60c25d 100644 --- a/spec/fixtures/api/schemas/entities/merge_request_widget.json +++ b/spec/fixtures/api/schemas/entities/merge_request_widget.json @@ -52,6 +52,7 @@ "mergeable_discussions_state": { "type": "boolean" }, "conflicts_can_be_resolved_in_ui": { "type": "boolean" }, "branch_missing": { "type": "boolean" }, + "commits_count": { "type": ["integer", "null"] }, "has_conflicts": { "type": "boolean" }, "can_be_merged": { "type": "boolean" }, "mergeable": { "type": "boolean" }, @@ -125,6 +126,5 @@ "can_receive_suggestion": { "type": "boolean" }, "source_branch_protected": { "type": "boolean" }, "conflicts_docs_path": { "type": ["string", "null"] } - }, - "additionalProperties": false + } } diff --git a/spec/fixtures/api/schemas/issue.json b/spec/fixtures/api/schemas/issue.json index a83ec55cede..77de9ae4f9f 100644 --- a/spec/fixtures/api/schemas/issue.json +++ b/spec/fixtures/api/schemas/issue.json @@ -28,7 +28,7 @@ "items": { "$ref": "entities/label.json" } }, "assignee": { - "id": { "type": "integet" }, + "id": { "type": "integer" }, "name": { "type": "string" }, "username": { "type": "string" }, "avatar_url": { "type": "uri" } @@ -52,6 +52,5 @@ } }, "subscribed": { "type": ["boolean", "null"] } - }, - "additionalProperties": false + } } diff --git a/spec/fixtures/api/schemas/issues.json b/spec/fixtures/api/schemas/issues.json index 70771b21c96..fbcd9eea389 100644 --- a/spec/fixtures/api/schemas/issues.json +++ b/spec/fixtures/api/schemas/issues.json @@ -10,6 +10,5 @@ "items": { "$ref": "issue.json" } }, "size": { "type": "integer" } - }, - "additionalProperties": false + } } diff --git a/spec/fixtures/api/schemas/public_api/v4/merge_request.json b/spec/fixtures/api/schemas/public_api/v4/merge_request.json new file mode 100644 index 00000000000..cd50be00418 --- /dev/null +++ b/spec/fixtures/api/schemas/public_api/v4/merge_request.json @@ -0,0 +1,124 @@ +{ + "type": "object", + "properties" : { + "properties" : { + "id": { "type": "integer" }, + "iid": { "type": "integer" }, + "project_id": { "type": "integer" }, + "title": { "type": "string" }, + "description": { "type": ["string", "null"] }, + "state": { "type": "string" }, + "merged_by": { + "type": ["object", "null"], + "properties": { + "name": { "type": "string" }, + "username": { "type": "string" }, + "id": { "type": "integer" }, + "state": { "type": "string" }, + "avatar_url": { "type": "uri" }, + "web_url": { "type": "uri" } + }, + "additionalProperties": false + }, + "merged_at": { "type": ["date", "null"] }, + "closed_by": { + "type": ["object", "null"], + "properties": { + "name": { "type": "string" }, + "username": { "type": "string" }, + "id": { "type": "integer" }, + "state": { "type": "string" }, + "avatar_url": { "type": "uri" }, + "web_url": { "type": "uri" } + }, + "additionalProperties": false + }, + "closed_at": { "type": ["date", "null"] }, + "created_at": { "type": "date" }, + "updated_at": { "type": "date" }, + "target_branch": { "type": "string" }, + "source_branch": { "type": "string" }, + "upvotes": { "type": "integer" }, + "downvotes": { "type": "integer" }, + "author": { + "type": "object", + "properties": { + "name": { "type": "string" }, + "username": { "type": "string" }, + "id": { "type": "integer" }, + "state": { "type": "string" }, + "avatar_url": { "type": "uri" }, + "web_url": { "type": "uri" } + }, + "additionalProperties": false + }, + "assignee": { + "type": ["object", "null"], + "properties": { + "name": { "type": "string" }, + "username": { "type": "string" }, + "id": { "type": "integer" }, + "state": { "type": "string" }, + "avatar_url": { "type": "uri" }, + "web_url": { "type": "uri" } + }, + "additionalProperties": false + }, + "source_project_id": { "type": "integer" }, + "target_project_id": { "type": "integer" }, + "labels": { + "type": "array", + "items": { + "type": "string" + } + }, + "work_in_progress": { "type": "boolean" }, + "milestone": { + "type": ["object", "null"], + "properties": { + "id": { "type": "integer" }, + "iid": { "type": "integer" }, + "project_id": { "type": ["integer", "null"] }, + "group_id": { "type": ["integer", "null"] }, + "title": { "type": "string" }, + "description": { "type": ["string", "null"] }, + "state": { "type": "string" }, + "created_at": { "type": "date" }, + "updated_at": { "type": "date" }, + "due_date": { "type": "date" }, + "start_date": { "type": "date" } + }, + "additionalProperties": false + }, + "merge_when_pipeline_succeeds": { "type": "boolean" }, + "merge_status": { "type": "string" }, + "sha": { "type": "string" }, + "merge_commit_sha": { "type": ["string", "null"] }, + "user_notes_count": { "type": "integer" }, + "changes_count": { "type": "string" }, + "should_remove_source_branch": { "type": ["boolean", "null"] }, + "force_remove_source_branch": { "type": ["boolean", "null"] }, + "discussion_locked": { "type": ["boolean", "null"] }, + "web_url": { "type": "uri" }, + "squash": { "type": "boolean" }, + "time_stats": { + "time_estimate": { "type": "integer" }, + "total_time_spent": { "type": "integer" }, + "human_time_estimate": { "type": ["string", "null"] }, + "human_total_time_spent": { "type": ["string", "null"] } + }, + "allow_collaboration": { "type": ["boolean", "null"] }, + "allow_maintainer_to_push": { "type": ["boolean", "null"] } + }, + "required": [ + "id", "iid", "project_id", "title", "description", + "state", "created_at", "updated_at", "target_branch", + "source_branch", "upvotes", "downvotes", "author", + "assignee", "source_project_id", "target_project_id", + "labels", "work_in_progress", "milestone", "merge_when_pipeline_succeeds", + "merge_status", "sha", "merge_commit_sha", "user_notes_count", + "should_remove_source_branch", "force_remove_source_branch", + "web_url", "squash" + ] + } +} diff --git a/spec/fixtures/api/schemas/public_api/v4/merge_requests.json b/spec/fixtures/api/schemas/public_api/v4/merge_requests.json index 6df27bf32b9..b35c83950e8 100644 --- a/spec/fixtures/api/schemas/public_api/v4/merge_requests.json +++ b/spec/fixtures/api/schemas/public_api/v4/merge_requests.json @@ -1,126 +1,6 @@ { "type": "array", "items": { - "type": "object", - "properties" : { - "id": { "type": "integer" }, - "iid": { "type": "integer" }, - "project_id": { "type": "integer" }, - "title": { "type": "string" }, - "description": { "type": ["string", "null"] }, - "state": { "type": "string" }, - "merged_by": { - "type": ["object", "null"], - "properties": { - "name": { "type": "string" }, - "username": { "type": "string" }, - "id": { "type": "integer" }, - "state": { "type": "string" }, - "avatar_url": { "type": "uri" }, - "web_url": { "type": "uri" } - }, - "additionalProperties": false - }, - "merged_at": { "type": ["date", "null"] }, - "closed_by": { - "type": ["object", "null"], - "properties": { - "name": { "type": "string" }, - "username": { "type": "string" }, - "id": { "type": "integer" }, - "state": { "type": "string" }, - "avatar_url": { "type": "uri" }, - "web_url": { "type": "uri" } - }, - "additionalProperties": false - }, - "closed_at": { "type": ["date", "null"] }, - "created_at": { "type": "date" }, - "updated_at": { "type": "date" }, - "target_branch": { "type": "string" }, - "source_branch": { "type": "string" }, - "upvotes": { "type": "integer" }, - "downvotes": { "type": "integer" }, - "author": { - "type": "object", - "properties": { - "name": { "type": "string" }, - "username": { "type": "string" }, - "id": { "type": "integer" }, - "state": { "type": "string" }, - "avatar_url": { "type": "uri" }, - "web_url": { "type": "uri" } - }, - "additionalProperties": false - }, - "assignee": { - "type": ["object", "null"], - "properties": { - "name": { "type": "string" }, - "username": { "type": "string" }, - "id": { "type": "integer" }, - "state": { "type": "string" }, - "avatar_url": { "type": "uri" }, - "web_url": { "type": "uri" } - }, - "additionalProperties": false - }, - "source_project_id": { "type": "integer" }, - "target_project_id": { "type": "integer" }, - "labels": { - "type": "array", - "items": { - "type": "string" - } - }, - "work_in_progress": { "type": "boolean" }, - "milestone": { - "type": ["object", "null"], - "properties": { - "id": { "type": "integer" }, - "iid": { "type": "integer" }, - "project_id": { "type": ["integer", "null"] }, - "group_id": { "type": ["integer", "null"] }, - "title": { "type": "string" }, - "description": { "type": ["string", "null"] }, - "state": { "type": "string" }, - "created_at": { "type": "date" }, - "updated_at": { "type": "date" }, - "due_date": { "type": "date" }, - "start_date": { "type": "date" } - }, - "additionalProperties": false - }, - "merge_when_pipeline_succeeds": { "type": "boolean" }, - "merge_status": { "type": "string" }, - "sha": { "type": "string" }, - "merge_commit_sha": { "type": ["string", "null"] }, - "user_notes_count": { "type": "integer" }, - "changes_count": { "type": "string" }, - "should_remove_source_branch": { "type": ["boolean", "null"] }, - "force_remove_source_branch": { "type": ["boolean", "null"] }, - "discussion_locked": { "type": ["boolean", "null"] }, - "web_url": { "type": "uri" }, - "squash": { "type": "boolean" }, - "time_stats": { - "time_estimate": { "type": "integer" }, - "total_time_spent": { "type": "integer" }, - "human_time_estimate": { "type": ["string", "null"] }, - "human_total_time_spent": { "type": ["string", "null"] } - }, - "allow_collaboration": { "type": ["boolean", "null"] }, - "allow_maintainer_to_push": { "type": ["boolean", "null"] } - }, - "required": [ - "id", "iid", "project_id", "title", "description", - "state", "created_at", "updated_at", "target_branch", - "source_branch", "upvotes", "downvotes", "author", - "assignee", "source_project_id", "target_project_id", - "labels", "work_in_progress", "milestone", "merge_when_pipeline_succeeds", - "merge_status", "sha", "merge_commit_sha", "user_notes_count", - "should_remove_source_branch", "force_remove_source_branch", - "web_url", "squash" - ], - "additionalProperties": false + "$ref": "./merge_request.json" } } diff --git a/spec/javascripts/environments/environments_store_spec.js b/spec/javascripts/environments/environments_store_spec.js index c3d16f10d72..8abdbcbbe54 100644 --- a/spec/javascripts/environments/environments_store_spec.js +++ b/spec/javascripts/environments/environments_store_spec.js @@ -34,54 +34,46 @@ describe('Store', () => { expect(store.state.stoppedCounter).toEqual(2); }); - describe('store environments', () => { - it('should store environments', () => { - store.storeEnvironments(serverData); - - expect(store.state.environments.length).toEqual(serverData.length); - }); - - it('should add folder keys when environment is a folder', () => { - const environment = { - name: 'bar', - size: 3, - id: 2, - }; + it('should add folder keys when environment is a folder', () => { + const environment = { + name: 'bar', + size: 3, + id: 2, + }; - store.storeEnvironments([environment]); + store.storeEnvironments([environment]); - expect(store.state.environments[0].isFolder).toEqual(true); - expect(store.state.environments[0].folderName).toEqual('bar'); - }); - - it('should extract content of `latest` key when provided', () => { - const environment = { - name: 'bar', - size: 3, - id: 2, - latest: { - last_deployment: {}, - isStoppable: true, - }, - }; - - store.storeEnvironments([environment]); + expect(store.state.environments[0].isFolder).toEqual(true); + expect(store.state.environments[0].folderName).toEqual('bar'); + }); - expect(store.state.environments[0].last_deployment).toEqual({}); - expect(store.state.environments[0].isStoppable).toEqual(true); - }); + it('should extract content of `latest` key when provided', () => { + const environment = { + name: 'bar', + size: 3, + id: 2, + latest: { + last_deployment: {}, + isStoppable: true, + }, + }; + + store.storeEnvironments([environment]); + + expect(store.state.environments[0].last_deployment).toEqual({}); + expect(store.state.environments[0].isStoppable).toEqual(true); + }); - it('should store latest.name when the environment is not a folder', () => { - store.storeEnvironments(serverData); + it('should store latest.name when the environment is not a folder', () => { + store.storeEnvironments(serverData); - expect(store.state.environments[0].name).toEqual(serverData[0].latest.name); - }); + expect(store.state.environments[0].name).toEqual(serverData[0].latest.name); + }); - it('should store root level name when environment is a folder', () => { - store.storeEnvironments(serverData); + it('should store root level name when environment is a folder', () => { + store.storeEnvironments(serverData); - expect(store.state.environments[1].folderName).toEqual(serverData[1].name); - }); + expect(store.state.environments[1].folderName).toEqual(serverData[1].name); }); describe('toggleFolder', () => { diff --git a/spec/javascripts/environments/folder/environments_folder_view_spec.js b/spec/javascripts/environments/folder/environments_folder_view_spec.js index 69ddd26eef1..ff15067aeac 100644 --- a/spec/javascripts/environments/folder/environments_folder_view_spec.js +++ b/spec/javascripts/environments/folder/environments_folder_view_spec.js @@ -3,6 +3,7 @@ import MockAdapter from 'axios-mock-adapter'; import axios from '~/lib/utils/axios_utils'; import environmentsFolderViewComponent from '~/environments/folder/environments_folder_view.vue'; import mountComponent from 'spec/helpers/vue_mount_component_helper'; +import { removeBreakLine, removeWhitespace } from 'spec/helpers/vue_component_helper'; import { environmentsList } from '../mock_data'; describe('Environments Folder View', () => { @@ -15,6 +16,11 @@ describe('Environments Folder View', () => { folderName: 'review', canReadEnvironment: true, cssContainerClass: 'container', + canaryDeploymentFeatureId: 'canary_deployment', + showCanaryDeploymentCallout: true, + userCalloutsPath: '/callouts', + lockPromotionSvgPath: '/assets/illustrations/lock-promotion.svg', + helpCanaryDeploymentsPath: 'help/canary-deployments', }; beforeEach(() => { @@ -89,9 +95,11 @@ describe('Environments Folder View', () => { it('should render parent folder name', done => { setTimeout(() => { - expect(component.$el.querySelector('.js-folder-name').textContent.trim()).toContain( - 'Environments / review', - ); + expect( + removeBreakLine( + removeWhitespace(component.$el.querySelector('.js-folder-name').textContent.trim()), + ), + ).toContain('Environments / review'); done(); }, 0); }); diff --git a/spec/javascripts/test_bundle.js b/spec/javascripts/test_bundle.js index 5eef5682bbd..235a17d13b0 100644 --- a/spec/javascripts/test_bundle.js +++ b/spec/javascripts/test_bundle.js @@ -69,7 +69,7 @@ window.gl = window.gl || {}; window.gl.TEST_HOST = TEST_HOST; window.gon = window.gon || {}; window.gon.test_env = true; -window.gon.ee = false; +window.gon.ee = process.env.EE; gon.relative_url_root = ''; let hasUnhandledPromiseRejections = false; @@ -122,19 +122,26 @@ afterEach(() => { const axiosDefaultAdapter = getDefaultAdapter(); // render all of our tests -const testsContext = require.context('.', true, /_spec$/); -testsContext.keys().forEach(function(path) { - try { - testsContext(path); - } catch (err) { - console.log(err); - console.error('[GL SPEC RUNNER ERROR] Unable to load spec: ', path); - describe('Test bundle', function() { - it(`includes '${path}'`, function() { - expect(err).toBeNull(); +const testContexts = [require.context('spec', true, /_spec$/)]; + +if (process.env.EE) { + testContexts.push(require.context('ee_spec', true, /_spec$/)); +} + +testContexts.forEach(context => { + context.keys().forEach(path => { + try { + context(path); + } catch (err) { + console.log(err); + console.error('[GL SPEC RUNNER ERROR] Unable to load spec: ', path); + describe('Test bundle', function() { + it(`includes '${path}'`, function() { + expect(err).toBeNull(); + }); }); - }); - } + } + }); }); describe('test errors', () => { @@ -204,24 +211,35 @@ if (process.env.BABEL_ENV === 'coverage') { ]; describe('Uncovered files', function() { - const sourceFiles = require.context('~', true, /\.(js|vue)$/); + const sourceFilesContexts = [require.context('~', true, /\.(js|vue)$/)]; + + if (process.env.EE) { + sourceFilesContexts.push(require.context('ee', true, /\.(js|vue)$/)); + } + + const allTestFiles = testContexts.reduce( + (accumulator, context) => accumulator.concat(context.keys()), + [], + ); $.holdReady(true); - sourceFiles.keys().forEach(function(path) { - // ignore if there is a matching spec file - if (testsContext.keys().indexOf(`${path.replace(/\.(js|vue)$/, '')}_spec`) > -1) { - return; - } - - it(`includes '${path}'`, function() { - try { - sourceFiles(path); - } catch (err) { - if (troubleMakers.indexOf(path) === -1) { - expect(err).toBeNull(); - } + sourceFilesContexts.forEach(context => { + context.keys().forEach(path => { + // ignore if there is a matching spec file + if (allTestFiles.indexOf(`${path.replace(/\.(js|vue)$/, '')}_spec`) > -1) { + return; } + + it(`includes '${path}'`, function() { + try { + context(path); + } catch (err) { + if (troubleMakers.indexOf(path) === -1) { + expect(err).toBeNull(); + } + } + }); }); }); }); diff --git a/spec/lib/gitlab/background_migration/deserialize_merge_request_diffs_and_commits_spec.rb b/spec/lib/gitlab/background_migration/deserialize_merge_request_diffs_and_commits_spec.rb index bc71a90605a..e7ff9169f1b 100644 --- a/spec/lib/gitlab/background_migration/deserialize_merge_request_diffs_and_commits_spec.rb +++ b/spec/lib/gitlab/background_migration/deserialize_merge_request_diffs_and_commits_spec.rb @@ -172,10 +172,8 @@ describe Gitlab::BackgroundMigration::DeserializeMergeRequestDiffsAndCommits, :m let(:exception) { ActiveRecord::RecordNotFound } let(:perform_ignoring_exceptions) do - begin - subject.perform(start_id, stop_id) - rescue described_class::Error - end + subject.perform(start_id, stop_id) + rescue described_class::Error end before do diff --git a/spec/lib/gitlab/bitbucket_import/importer_spec.rb b/spec/lib/gitlab/bitbucket_import/importer_spec.rb index c432cc223b9..e1a2bae5fe8 100644 --- a/spec/lib/gitlab/bitbucket_import/importer_spec.rb +++ b/spec/lib/gitlab/bitbucket_import/importer_spec.rb @@ -95,6 +95,9 @@ describe Gitlab::BitbucketImport::Importer do subject { described_class.new(project) } describe '#import_pull_requests' do + let(:source_branch_sha) { sample.commits.last } + let(:target_branch_sha) { sample.commits.first } + before do allow(subject).to receive(:import_wiki) allow(subject).to receive(:import_issues) @@ -102,9 +105,9 @@ describe Gitlab::BitbucketImport::Importer do pull_request = instance_double( Bitbucket::Representation::PullRequest, iid: 10, - source_branch_sha: sample.commits.last, + source_branch_sha: source_branch_sha, source_branch_name: Gitlab::Git::BRANCH_REF_PREFIX + sample.source_branch, - target_branch_sha: sample.commits.first, + target_branch_sha: target_branch_sha, target_branch_name: Gitlab::Git::BRANCH_REF_PREFIX + sample.target_branch, title: 'This is a title', description: 'This is a test pull request', @@ -162,6 +165,19 @@ describe Gitlab::BitbucketImport::Importer do expect(reply_note).to be_a(DiffNote) expect(reply_note.note).to eq(@reply.note) end + + context "when branches' sha is not found in the repository" do + let(:source_branch_sha) { 'a' * Commit::MIN_SHA_LENGTH } + let(:target_branch_sha) { 'b' * Commit::MIN_SHA_LENGTH } + + it 'uses the pull request sha references' do + expect { subject.execute }.to change { MergeRequest.count }.by(1) + + merge_request_diff = MergeRequest.first.merge_request_diff + expect(merge_request_diff.head_commit_sha).to eq source_branch_sha + expect(merge_request_diff.start_commit_sha).to eq target_branch_sha + end + end end context 'issues statuses' do diff --git a/spec/lib/gitlab/database_spec.rb b/spec/lib/gitlab/database_spec.rb index 60106ee3c0b..ae50abd0e7a 100644 --- a/spec/lib/gitlab/database_spec.rb +++ b/spec/lib/gitlab/database_spec.rb @@ -87,6 +87,38 @@ describe Gitlab::Database do end end + describe '.postgresql_minimum_supported_version?' do + it 'returns false when not using PostgreSQL' do + allow(described_class).to receive(:postgresql?).and_return(false) + + expect(described_class.postgresql_minimum_supported_version?).to eq(false) + end + + context 'when using PostgreSQL' do + before do + allow(described_class).to receive(:postgresql?).and_return(true) + end + + it 'returns false when using PostgreSQL 9.5' do + allow(described_class).to receive(:version).and_return('9.5') + + expect(described_class.postgresql_minimum_supported_version?).to eq(false) + end + + it 'returns true when using PostgreSQL 9.6' do + allow(described_class).to receive(:version).and_return('9.6') + + expect(described_class.postgresql_minimum_supported_version?).to eq(true) + end + + it 'returns true when using PostgreSQL 10 or newer' do + allow(described_class).to receive(:version).and_return('10') + + expect(described_class.postgresql_minimum_supported_version?).to eq(true) + end + end + end + describe '.join_lateral_supported?' do it 'returns false when using MySQL' do allow(described_class).to receive(:postgresql?).and_return(false) @@ -195,6 +227,12 @@ describe Gitlab::Database do end end + describe '.pg_last_xact_replay_timestamp' do + it 'returns pg_last_xact_replay_timestamp' do + expect(described_class.pg_last_xact_replay_timestamp).to eq('pg_last_xact_replay_timestamp') + end + end + describe '.nulls_last_order' do context 'when using PostgreSQL' do before do diff --git a/spec/lib/gitlab/git/repository_cleaner_spec.rb b/spec/lib/gitlab/git/repository_cleaner_spec.rb index 7f9cc2bc9ec..6602f22843f 100644 --- a/spec/lib/gitlab/git/repository_cleaner_spec.rb +++ b/spec/lib/gitlab/git/repository_cleaner_spec.rb @@ -37,14 +37,12 @@ describe Gitlab::Git::RepositoryCleaner do let(:object_map) { Gitlab::HttpIO.new(url, object_map_data.size) } around do |example| - begin - tempfile.write(object_map_data) - tempfile.close + tempfile.write(object_map_data) + tempfile.close - example.run - ensure - tempfile.unlink - end + example.run + ensure + tempfile.unlink end it 'removes internal references' do diff --git a/spec/lib/gitlab/request_context_spec.rb b/spec/lib/gitlab/request_context_spec.rb index 3ed57c2c916..23e45aff1c5 100644 --- a/spec/lib/gitlab/request_context_spec.rb +++ b/spec/lib/gitlab/request_context_spec.rb @@ -25,7 +25,7 @@ describe Gitlab::RequestContext do [200, {}, ["Hello"]] end - Rails.application.middleware.build(endpoint).call(env) + described_class.new(endpoint).call(env) expect(client_ip).to eq(load_balancer_ip) end diff --git a/spec/lib/google_api/cloud_platform/client_spec.rb b/spec/lib/google_api/cloud_platform/client_spec.rb index e2134dc279c..1fefc947636 100644 --- a/spec/lib/google_api/cloud_platform/client_spec.rb +++ b/spec/lib/google_api/cloud_platform/client_spec.rb @@ -97,6 +97,12 @@ describe GoogleApi::CloudPlatform::Client do "node_config": { "machine_type": machine_type }, + "master_auth": { + "username": "admin", + "client_certificate_config": { + issue_client_certificate: true + } + }, "legacy_abac": { "enabled": true } @@ -122,6 +128,12 @@ describe GoogleApi::CloudPlatform::Client do "node_config": { "machine_type": machine_type }, + "master_auth": { + "username": "admin", + "client_certificate_config": { + issue_client_certificate: true + } + }, "legacy_abac": { "enabled": false } diff --git a/spec/policies/group_policy_spec.rb b/spec/policies/group_policy_spec.rb index 0ad50c6f91f..92bdaa8b8b8 100644 --- a/spec/policies/group_policy_spec.rb +++ b/spec/policies/group_policy_spec.rb @@ -76,15 +76,10 @@ describe GroupPolicy do context 'with no user and public project' do let(:project) { create(:project, :public) } - let(:user) { create(:user) } let(:current_user) { nil } before do - Projects::GroupLinks::CreateService.new( - project, - user, - link_group_access: ProjectGroupLink::DEVELOPER - ).execute(group) + create(:project_group_link, project: project, group: group) end it { expect_disallowed(:read_group) } @@ -96,11 +91,7 @@ describe GroupPolicy do let(:current_user) { create(:user) } before do - Projects::GroupLinks::CreateService.new( - project, - user, - link_group_access: ProjectGroupLink::DEVELOPER - ).execute(group) + create(:project_group_link, project: project, group: group) end it { expect_disallowed(:read_group) } diff --git a/spec/rack_servers/puma_spec.rb b/spec/rack_servers/puma_spec.rb index 431fab87857..891df4f1a66 100644 --- a/spec/rack_servers/puma_spec.rb +++ b/spec/rack_servers/puma_spec.rb @@ -44,11 +44,9 @@ describe 'Puma' do end after(:all) do - begin - WebMock.disable_net_connect!(allow_localhost: true) - Process.kill('TERM', @puma_master_pid) - rescue Errno::ESRCH - end + WebMock.disable_net_connect!(allow_localhost: true) + Process.kill('TERM', @puma_master_pid) + rescue Errno::ESRCH end def wait_puma_boot!(master_pid, ready_file) diff --git a/spec/routing/group_routing_spec.rb b/spec/routing/group_routing_spec.rb index 71788028cbf..53271550e8b 100644 --- a/spec/routing/group_routing_spec.rb +++ b/spec/routing/group_routing_spec.rb @@ -17,6 +17,10 @@ describe "Groups", "routing" do expect(get("/#{group_path}")).to route_to('groups#show', id: group_path) end + it "to #details" do + expect(get("/groups/#{group_path}/-/details")).to route_to('groups#details', id: group_path) + end + it "to #activity" do expect(get("/groups/#{group_path}/-/activity")).to route_to('groups#activity', id: group_path) end diff --git a/spec/services/projects/destroy_service_spec.rb b/spec/services/projects/destroy_service_spec.rb index dfbdfa2ab69..d3a8ee46f85 100644 --- a/spec/services/projects/destroy_service_spec.rb +++ b/spec/services/projects/destroy_service_spec.rb @@ -128,10 +128,8 @@ describe Projects::DestroyService do it 'keeps project team intact upon an error' do perform_enqueued_jobs do - begin - destroy_project(project, user, {}) - rescue ::Redis::CannotConnectError - end + destroy_project(project, user, {}) + rescue ::Redis::CannotConnectError end expect(project.team.members.count).to eq 2 diff --git a/spec/support/api/schema_matcher.rb b/spec/support/api/schema_matcher.rb index f7d74df0656..4cf34d43117 100644 --- a/spec/support/api/schema_matcher.rb +++ b/spec/support/api/schema_matcher.rb @@ -1,10 +1,16 @@ module SchemaPath - def self.expand(schema, dir = '') - Rails.root.join(dir, 'spec', "fixtures/api/schemas/#{schema}.json").to_s + def self.expand(schema, dir = nil) + if Gitlab.ee? && dir.nil? + ee_path = expand(schema, 'ee') + + return ee_path if File.exist?(ee_path) + end + + Rails.root.join(dir.to_s, 'spec', "fixtures/api/schemas/#{schema}.json").to_s end end -RSpec::Matchers.define :match_response_schema do |schema, dir: '', **options| +RSpec::Matchers.define :match_response_schema do |schema, dir: nil, **options| match do |response| @errors = JSON::Validator.fully_validate( SchemaPath.expand(schema, dir), response.body, options) @@ -18,8 +24,16 @@ RSpec::Matchers.define :match_response_schema do |schema, dir: '', **options| end end -RSpec::Matchers.define :match_schema do |schema, dir: '', **options| +RSpec::Matchers.define :match_schema do |schema, dir: nil, **options| match do |data| - JSON::Validator.validate!(SchemaPath.expand(schema, dir), data, options) + @errors = JSON::Validator.fully_validate( + SchemaPath.expand(schema, dir), data, options) + + @errors.empty? + end + + failure_message do |response| + "didn't match the schema defined by #{SchemaPath.expand(schema, dir)}" \ + " The validation errors were:\n#{@errors.join("\n")}" end end diff --git a/spec/support/helpers/graphql_helpers.rb b/spec/support/helpers/graphql_helpers.rb index 6cdc19ac2e5..ca28325eab9 100644 --- a/spec/support/helpers/graphql_helpers.rb +++ b/spec/support/helpers/graphql_helpers.rb @@ -18,12 +18,10 @@ module GraphqlHelpers # Runs a block inside a BatchLoader::Executor wrapper def batch(max_queries: nil, &blk) wrapper = proc do - begin - BatchLoader::Executor.ensure_current - yield - ensure - BatchLoader::Executor.clear_current - end + BatchLoader::Executor.ensure_current + yield + ensure + BatchLoader::Executor.clear_current end if max_queries diff --git a/spec/support/helpers/stub_object_storage.rb b/spec/support/helpers/stub_object_storage.rb index e0c50e533a6..30c8477f16a 100644 --- a/spec/support/helpers/stub_object_storage.rb +++ b/spec/support/helpers/stub_object_storage.rb @@ -23,15 +23,13 @@ module StubObjectStorage Fog.mock! ::Fog::Storage.new(connection_params).tap do |connection| - begin - connection.directories.create(key: remote_directory) + connection.directories.create(key: remote_directory) - # Cleanup remaining files - connection.directories.each do |directory| - directory.files.map(&:destroy) - end - rescue Excon::Error::Conflict + # Cleanup remaining files + connection.directories.each do |directory| + directory.files.map(&:destroy) end + rescue Excon::Error::Conflict end end diff --git a/spec/support/helpers/test_env.rb b/spec/support/helpers/test_env.rb index 80a22134021..dc902d373b8 100644 --- a/spec/support/helpers/test_env.rb +++ b/spec/support/helpers/test_env.rb @@ -202,12 +202,10 @@ module TestEnv socket = Gitlab::GitalyClient.address('default').sub('unix:', '') Integer(sleep_time / sleep_interval).times do - begin - Socket.unix(socket) - return - rescue - sleep sleep_interval - end + Socket.unix(socket) + return + rescue + sleep sleep_interval end raise "could not connect to gitaly at #{socket.inspect} after #{sleep_time} seconds" diff --git a/spec/validators/sha_validator_spec.rb b/spec/validators/sha_validator_spec.rb index dc1539cf318..0a76570f65e 100644 --- a/spec/validators/sha_validator_spec.rb +++ b/spec/validators/sha_validator_spec.rb @@ -4,7 +4,7 @@ require 'spec_helper' describe ShaValidator do let(:validator) { described_class.new(attributes: [:base_commit_sha]) } - let(:merge_diff) { build(:merge_request_diff) } + let!(:merge_diff) { build(:merge_request_diff) } subject { validator.validate_each(merge_diff, :base_commit_sha, value) } @@ -12,6 +12,8 @@ describe ShaValidator do let(:value) { nil } it 'does not add any error if value is empty' do + expect(Commit).not_to receive(:valid_hash?) + subject expect(merge_diff.errors).to be_empty @@ -21,7 +23,9 @@ describe ShaValidator do context 'with valid sha' do let(:value) { Digest::SHA1.hexdigest(SecureRandom.hex) } - it 'does not add any error if value is empty' do + it 'does not add any error' do + expect(Commit).to receive(:valid_hash?).and_call_original + subject expect(merge_diff.errors).to be_empty @@ -32,6 +36,7 @@ describe ShaValidator do let(:value) { 'foo' } it 'adds error to the record' do + expect(Commit).to receive(:valid_hash?).and_call_original expect(merge_diff.errors).to be_empty subject |