kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add latest changes from gitlab-org/gitlab@master

Browse source
This commit is contained in:
GitLab Bot 2020-04-23 06:09:28 +00:00
parent 8ab8bc5d07
commit 6553773dd0
10 changed files with 60 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.rubocop.yml
View file

@ -221,10 +221,8 @@ GitlabSecurity/PublicSend:
Gitlab/DuplicateSpecLocation:
Exclude:
- ee/spec/helpers/auth_helper_spec.rb
- ee/spec/lib/gitlab/gl_repository_spec.rb
- ee/spec/services/merge_requests/refresh_service_spec.rb
- ee/spec/helpers/ee/auth_helper_spec.rb
- ee/spec/services/ee/merge_requests/refresh_service_spec.rb
Cop/InjectEnterpriseEditionModule:

32
app/assets/javascripts/environments/components/container.vue
View file

@ -1,6 +1,5 @@
<script>
import { GlLoadingIcon } from '@gitlab/ui';
import containerMixin from 'ee_else_ce/environments/mixins/container_mixin';
import TablePagination from '~/vue_shared/components/pagination/table_pagination.vue';
import EnvironmentTable from '../components/environments_table.vue';
@ -10,8 +9,12 @@ export default {
TablePagination,
GlLoadingIcon,
},
mixins: [containerMixin],
props: {
canaryDeploymentFeatureId: {
type: String,
required: false,
default: null,
},
isLoading: {
type: Boolean,
required: true,
@ -28,6 +31,31 @@ export default {
type: Boolean,
required: true,
},
deployBoardsHelpPath: {
type: String,
required: false,
default: '',
},
helpCanaryDeploymentsPath: {
type: String,
required: false,
default: '',
},
lockPromotionSvgPath: {
type: String,
required: false,
default: '',
},
showCanaryDeploymentCallout: {
type: Boolean,
required: false,
default: false,
},
userCalloutsPath: {
type: String,
required: false,
default: '',
},
},
methods: {
onChangePage(page) {

34
app/assets/javascripts/environments/mixins/container_mixin.js
View file

@ -1,34 +0,0 @@
export default {
props: {
canaryDeploymentFeatureId: {
type: String,
required: false,
default: null,
},
showCanaryDeploymentCallout: {
type: Boolean,
required: false,
default: false,
},
userCalloutsPath: {
type: String,
required: false,
default: null,
},
lockPromotionSvgPath: {
type: String,
required: false,
default: null,
},
helpCanaryDeploymentsPath: {
type: String,
required: false,
default: null,
},
deployBoardsHelpPath: {
type: String,
required: false,
default: '',
},
},
};

2
app/controllers/projects/environments_controller.rb
View file

@ -14,7 +14,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController
before_action :expire_etag_cache, only: [:index], unless: -> { request.format.json? }
before_action only: [:metrics, :additional_metrics, :metrics_dashboard] do
push_frontend_feature_flag(:prometheus_computed_alerts)
push_frontend_feature_flag(:metrics_dashboard_annotations)
push_frontend_feature_flag(:metrics_dashboard_annotations, project)
end
after_action :expire_etag_cache, only: [:cancel_auto_stop]

2
app/views/shared/issuable/_close_reopen_report_toggle.html.haml
View file

@ -11,7 +11,7 @@
.float-left.btn-group.prepend-left-10.issuable-close-dropdown.droplab-dropdown.js-issuable-close-dropdown
= link_to "#{display_button_action} #{display_issuable_type}", close_reopen_issuable_path(issuable),
method: button_method, class: "#{button_class} btn-#{button_action} #{(add_blocked_class ? 'btn-issue-blocked' : '')}", title: "#{display_button_action} #{display_issuable_type}"
method: button_method, class: "#{button_class} btn-#{button_action} #{(add_blocked_class ? 'btn-issue-blocked' : '')}", title: "#{display_button_action} #{display_issuable_type}", data: { qa_selector: 'close_issue_button' }
= button_tag type: 'button', class: "#{toggle_class} btn-#{button_action}-color",
data: { 'dropdown-trigger' => '#issuable-close-menu' }, 'aria-label' => 'Toggle dropdown' do

5
changelogs/unreleased/215147-drop-feature-flag.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: 'Project import queries are now partially batched'
merge_request: 30057
author:
type: performance

5
config/feature_categories.yml
View file

@ -8,6 +8,7 @@
#
---
- accessibility_testing
- alert_management
- analysis
- api
- attack_emulation
@ -17,11 +18,11 @@
- auto_devops
- backup_restore
- behavior_analytics
- billing
- chaos_engineering
- chatops
- cloud_native_installation
- cluster_cost_optimization
- cluster_monitoring
- code_analytics
- code_quality
- code_review
@ -71,6 +72,7 @@
- kubernetes_management
- language_specific
- license_compliance
- live_preview
- load_testing
- logging
- malware_scanning
@ -92,6 +94,7 @@
- runner
- secret_detection
- secrets_management
- security_benchmarking
- serverless
- service_desk
- snippets

4
lib/gitlab/import_export/relation_tree_restorer.rb
View file

@ -37,9 +37,7 @@ module Gitlab
ActiveRecord::Base.no_touching do
update_params!
bulk_inserts_enabled = @importable.class == ::Project &&
Feature.enabled?(:import_bulk_inserts, @importable.group, default_enabled: true)
BulkInsertableAssociations.with_bulk_insert(enabled: bulk_inserts_enabled) do
BulkInsertableAssociations.with_bulk_insert(enabled: @importable.class == ::Project) do
fix_ci_pipelines_not_sorted_on_legacy_project_json!
create_relations!
end

4
package.json
View file

@ -128,7 +128,7 @@
"url-loader": "^3.0.0",
"visibilityjs": "^1.2.4",
"vue": "^2.6.10",
"vue-apollo": "^3.0.0-beta.28",
"vue-apollo": "^3.0.3",
"vue-loader": "^15.9.0",
"vue-router": "^3.0.2",
"vue-template-compiler": "^2.6.10",
@ -163,7 +163,7 @@
"eslint-plugin-no-jquery": "^2.3.0",
"gettext-extractor": "^3.4.3",
"gettext-extractor-vue": "^4.0.2",
"graphql-tag": "^2.10.0",
"graphql-tag": "^2.10.1",
"istanbul-lib-coverage": "^3.0.0",
"istanbul-lib-report": "^3.0.0",
"istanbul-reports": "^3.0.0",

31
yarn.lock
View file

@ -5334,10 +5334,10 @@ graphlib@^2.1.7, graphlib@^2.1.8:
dependencies:
lodash "^4.17.15"
graphql-tag@^2.10.0:
version "2.10.0"
resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.10.0.tgz#87da024be863e357551b2b8700e496ee2d4353ae"
integrity sha512-9FD6cw976TLLf9WYIUPCaaTpniawIjHWZSwIRZSjrfufJamcXbVVYfN2TWvJYbw0Xf2JjYbl1/f2+wDnBVw3/w==
graphql-tag@^2.10.1:
version "2.10.3"
resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.10.3.tgz#ea1baba5eb8fc6339e4c4cf049dabe522b0edf03"
integrity sha512-4FOv3ZKfA4WdOKJeHdz6B3F/vxBLSgmBcGeAFPf4n1F64ltJUvOOerNj0rsJxONQGdhUMynQIvd6LzB+1J5oKA==
graphql@^14.0.2:
version "14.0.2"
@ -10117,7 +10117,7 @@ send@0.17.1:
range-parser "~1.2.1"
statuses "~1.5.0"
serialize-javascript@^2.1.2:
serialize-javascript@^2.1.0, serialize-javascript@^2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
@ -11009,10 +11009,10 @@ throat@^4.0.0:
resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a"
integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=
throttle-debounce@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-2.0.1.tgz#7307ddd6cd9acadb349132fbf6c18d78c88a5e62"
integrity sha512-Sr6jZBlWShsAaSXKyNXyNicOrJW/KtkDqIEwHt4wYwWA2wa/q67Luhqoujg48V8hTk60wB56tYrJJn6jc2R7VA==
throttle-debounce@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-2.1.0.tgz#257e648f0a56bd9e54fe0f132c4ab8611df4e1d5"
integrity sha512-AOvyNahXQuU7NN+VVvOOX+uW6FPaWdAOdRP5HfwYxAfCzXTFKRMoIMk+n+po318+ktcChx+F1Dd91G3YHeMKyg==
through2@^2.0.0:
version "2.0.5"
@ -11725,13 +11725,14 @@ void-elements@^2.0.0:
resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
vue-apollo@^3.0.0-beta.28:
version "3.0.0-beta.28"
resolved "https://registry.yarnpkg.com/vue-apollo/-/vue-apollo-3.0.0-beta.28.tgz#be6a3a1504be2096cbfb23996537e2fc95c8c239"
integrity sha512-ceCc1xTyxpNtiSeJMQgSkfgJue6pnv+TIvp75CwZlwMxRtNZjITj4MGvBWFwnoIEhVrUAw45ff/5udgJ8z9sdQ==
vue-apollo@^3.0.3:
version "3.0.3"
resolved "https://registry.yarnpkg.com/vue-apollo/-/vue-apollo-3.0.3.tgz#7f29558df76eec0f03251847eef153816a261827"
integrity sha512-WJaQ1v/i46/oIPlKv7J0Tx6tTlbuaeCdhrAbL06h+Zca2gzr5ywjUFpl8ijMTGJsQ+Ph/U4xEpBFBOMxQmL+7g==
dependencies:
chalk "^2.4.1"
throttle-debounce "^2.0.0"
chalk "^2.4.2"
serialize-javascript "^2.1.0"
throttle-debounce "^2.1.0"
vue-eslint-parser@^7.0.0:
version "7.0.0"