diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-09 12:06:19 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-09 12:06:19 +0300 |
commit | 3744bcc0d10d24104e39985b6833a0ec51791c0a (patch) | |
tree | ecad3a8435a74bd618acd591762906429f88bfd4 | |
parent | 78adf0c5cc2534908e3f16a9b8abf06509444cf3 (diff) |
Add latest changes from gitlab-org/gitlab@master
19 files changed, 111 insertions, 51 deletions
diff --git a/app/assets/javascripts/monitoring/components/charts/time_series.vue b/app/assets/javascripts/monitoring/components/charts/time_series.vue index 04aced985c8..76fb35aaa78 100644 --- a/app/assets/javascripts/monitoring/components/charts/time_series.vue +++ b/app/assets/javascripts/monitoring/components/charts/time_series.vue @@ -1,6 +1,6 @@ <script> import { s__, __ } from '~/locale'; -import { GlLink, GlButton } from '@gitlab/ui'; +import { GlLink, GlButton, GlTooltip } from '@gitlab/ui'; import { GlAreaChart, GlLineChart, GlChartSeriesLabel } from '@gitlab/ui/dist/charts'; import dateFormat from 'dateformat'; import { debounceByAnimationFrame, roundOffFloat } from '~/lib/utils/common_utils'; @@ -16,6 +16,7 @@ export default { components: { GlAreaChart, GlLineChart, + GlTooltip, GlButton, GlChartSeriesLabel, GlLink, @@ -72,6 +73,7 @@ export default { isDeployment: false, sha: '', }, + showTitleTooltip: false, width: 0, height: chartHeight, svgs: {}, @@ -202,6 +204,12 @@ export default { watch: { containerWidth: 'onResize', }, + mounted() { + const graphTitleEl = this.$refs.graphTitle; + if (graphTitleEl && graphTitleEl.scrollWidth > graphTitleEl.offsetWidth) { + this.showTitleTooltip = true; + } + }, beforeDestroy() { window.removeEventListener('resize', debouncedResize); }, @@ -265,8 +273,16 @@ export default { <template> <div class="prometheus-graph"> <div class="prometheus-graph-header"> - <h5 class="prometheus-graph-title js-graph-title">{{ graphData.title }}</h5> - <div class="prometheus-graph-widgets js-graph-widgets"> + <h5 + ref="graphTitle" + class="prometheus-graph-title js-graph-title text-truncate append-right-8" + > + {{ graphData.title }} + </h5> + <gl-tooltip :target="() => $refs.graphTitle" :disabled="!showTitleTooltip"> + {{ graphData.title }} + </gl-tooltip> + <div class="prometheus-graph-widgets js-graph-widgets flex-fill"> <slot></slot> </div> </div> diff --git a/app/assets/javascripts/monitoring/components/dashboard.vue b/app/assets/javascripts/monitoring/components/dashboard.vue index b5ed54a6e25..084f736911f 100644 --- a/app/assets/javascripts/monitoring/components/dashboard.vue +++ b/app/assets/javascripts/monitoring/components/dashboard.vue @@ -475,7 +475,10 @@ export default { :project-path="projectPath" group-id="monitor-time-series-chart" > - <div class="d-flex align-items-center"> + <div + class="d-flex align-items-center" + :class="alertWidgetAvailable ? 'justify-content-between' : 'justify-content-end'" + > <alert-widget v-if="alertWidgetAvailable && graphData" :modal-id="`alert-modal-${index}-${graphIndex}`" @@ -486,7 +489,7 @@ export default { /> <gl-dropdown v-gl-tooltip - class="mx-2" + class="ml-2 mr-3" toggle-class="btn btn-transparent border-0" :right="true" :no-caret="true" diff --git a/app/assets/stylesheets/pages/prometheus.scss b/app/assets/stylesheets/pages/prometheus.scss index 72f1b5307ec..245efd91ec8 100644 --- a/app/assets/stylesheets/pages/prometheus.scss +++ b/app/assets/stylesheets/pages/prometheus.scss @@ -39,11 +39,14 @@ align-items: center; justify-content: space-between; margin-bottom: $gl-padding-8; +} - h5 { - font-size: $gl-font-size-large; - margin: 0; - } +.prometheus-graph-title { + font-size: $gl-font-size-large; +} + +.alert-current-setting { + max-width: 240px; } .prometheus-graph-cursor { diff --git a/app/models/project.rb b/app/models/project.rb index 29fe9aad62a..9bd9f969331 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -2312,7 +2312,7 @@ class Project < ApplicationRecord end def repository_with_same_path_already_exists? - gitlab_shell.exists?(repository_storage, "#{disk_path}.git") + gitlab_shell.repository_exists?(repository_storage, "#{disk_path}.git") end def set_timestamps_for_create diff --git a/app/services/projects/destroy_service.rb b/app/services/projects/destroy_service.rb index 5fdf98c3c5e..90e703e7050 100644 --- a/app/services/projects/destroy_service.rb +++ b/app/services/projects/destroy_service.rb @@ -123,11 +123,9 @@ module Projects mv_repository(old_path, new_path) end - # rubocop: disable CodeReuse/ActiveRecord def repo_exists?(path) - gitlab_shell.exists?(project.repository_storage, path + '.git') + gitlab_shell.repository_exists?(project.repository_storage, path + '.git') end - # rubocop: enable CodeReuse/ActiveRecord def mv_repository(from_path, to_path) return true unless repo_exists?(from_path) diff --git a/app/services/projects/hashed_storage/base_repository_service.rb b/app/services/projects/hashed_storage/base_repository_service.rb index f97a28b8c3b..b7e9d3e8791 100644 --- a/app/services/projects/hashed_storage/base_repository_service.rb +++ b/app/services/projects/hashed_storage/base_repository_service.rb @@ -20,16 +20,13 @@ module Projects protected - # rubocop: disable CodeReuse/ActiveRecord def has_wiki? - gitlab_shell.exists?(project.repository_storage, "#{old_wiki_disk_path}.git") + gitlab_shell.repository_exists?(project.repository_storage, "#{old_wiki_disk_path}.git") end - # rubocop: enable CodeReuse/ActiveRecord - # rubocop: disable CodeReuse/ActiveRecord def move_repository(from_name, to_name) - from_exists = gitlab_shell.exists?(project.repository_storage, "#{from_name}.git") - to_exists = gitlab_shell.exists?(project.repository_storage, "#{to_name}.git") + from_exists = gitlab_shell.repository_exists?(project.repository_storage, "#{from_name}.git") + to_exists = gitlab_shell.repository_exists?(project.repository_storage, "#{to_name}.git") # If we don't find the repository on either original or target we should log that as it could be an issue if the # project was not originally empty. @@ -46,7 +43,6 @@ module Projects gitlab_shell.mv_repository(project.repository_storage, from_name, to_name) end - # rubocop: enable CodeReuse/ActiveRecord def rollback_folder_move move_repository(new_disk_path, old_disk_path) diff --git a/lib/gitlab/shell.rb b/lib/gitlab/shell.rb index 7722480903d..125d0d1cfbb 100644 --- a/lib/gitlab/shell.rb +++ b/lib/gitlab/shell.rb @@ -297,6 +297,12 @@ module Gitlab end # rubocop: enable CodeReuse/ActiveRecord + def repository_exists?(storage, dir_name) + Gitlab::Git::Repository.new(storage, dir_name, nil, nil).exists? + rescue GRPC::Internal + false + end + def hooks_path File.join(gitlab_shell_path, 'hooks') end diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 38e919a6277..c41fa78f0c2 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -12641,6 +12641,9 @@ msgstr "" msgid "Prometheus listen_address in config/gitlab.yml is not a valid URI" msgstr "" +msgid "PrometheusAlerts|%{count} alerts applied" +msgstr "" + msgid "PrometheusAlerts|Add alert" msgstr "" @@ -16017,6 +16020,9 @@ msgstr "" msgid "The snippet is visible to any logged in user." msgstr "" +msgid "The specified tab is invalid, please select another" +msgstr "" + msgid "The staging stage shows the time between merging the MR and deploying code to the production environment. The data will be automatically added once you deploy to production for the first time." msgstr "" @@ -16671,9 +16677,6 @@ msgstr "" msgid "Timeago|right now" msgstr "" -msgid "Timeframe" -msgstr "" - msgid "Timeout" msgstr "" diff --git a/spec/controllers/profiles_controller_spec.rb b/spec/controllers/profiles_controller_spec.rb index 08681c0341a..eb479d9a0aa 100644 --- a/spec/controllers/profiles_controller_spec.rb +++ b/spec/controllers/profiles_controller_spec.rb @@ -153,7 +153,7 @@ describe ProfilesController, :request_store do user.reload expect(response.status).to eq(302) - expect(gitlab_shell.exists?(project.repository_storage, "#{new_username}/#{project.path}.git")).to be_truthy + expect(gitlab_shell.repository_exists?(project.repository_storage, "#{new_username}/#{project.path}.git")).to be_truthy end end @@ -171,7 +171,7 @@ describe ProfilesController, :request_store do user.reload expect(response.status).to eq(302) - expect(gitlab_shell.exists?(project.repository_storage, "#{project.disk_path}.git")).to be_truthy + expect(gitlab_shell.repository_exists?(project.repository_storage, "#{project.disk_path}.git")).to be_truthy expect(before_disk_path).to eq(project.disk_path) end end diff --git a/spec/lib/gitlab/bare_repository_import/importer_spec.rb b/spec/lib/gitlab/bare_repository_import/importer_spec.rb index 0c1eedad7f4..2fb9f1a0a08 100644 --- a/spec/lib/gitlab/bare_repository_import/importer_spec.rb +++ b/spec/lib/gitlab/bare_repository_import/importer_spec.rb @@ -89,7 +89,7 @@ describe Gitlab::BareRepositoryImport::Importer, :seed_helper do repo_path = "#{project.disk_path}.git" hook_path = File.join(repo_path, 'hooks') - expect(gitlab_shell.exists?(project.repository_storage, repo_path)).to be(true) + expect(gitlab_shell.repository_exists?(project.repository_storage, repo_path)).to be(true) expect(gitlab_shell.exists?(project.repository_storage, hook_path)).to be(true) end @@ -145,8 +145,8 @@ describe Gitlab::BareRepositoryImport::Importer, :seed_helper do project = Project.find_by_full_path("#{admin.full_path}/#{project_path}") - expect(gitlab_shell.exists?(project.repository_storage, project.disk_path + '.git')).to be(true) - expect(gitlab_shell.exists?(project.repository_storage, project.disk_path + '.wiki.git')).to be(true) + expect(gitlab_shell.repository_exists?(project.repository_storage, project.disk_path + '.git')).to be(true) + expect(gitlab_shell.repository_exists?(project.repository_storage, project.disk_path + '.wiki.git')).to be(true) end context 'with a repository already on disk' do @@ -186,7 +186,7 @@ describe Gitlab::BareRepositoryImport::Importer, :seed_helper do project = Project.find_by_full_path(project_path) - expect(gitlab_shell.exists?(project.repository_storage, project.disk_path + '.wiki.git')).to be(true) + expect(gitlab_shell.repository_exists?(project.repository_storage, project.disk_path + '.wiki.git')).to be(true) end end diff --git a/spec/lib/gitlab/shell_spec.rb b/spec/lib/gitlab/shell_spec.rb index 55d8bac6c03..ff9e31ec346 100644 --- a/spec/lib/gitlab/shell_spec.rb +++ b/spec/lib/gitlab/shell_spec.rb @@ -422,6 +422,30 @@ describe Gitlab::Shell do end end + describe '#repository_exists?' do + context 'when the storage path does not exist' do + subject { described_class.new.repository_exists?(storage, "non-existing.git") } + + it { is_expected.to be_falsey } + end + + context 'when the repository does not exist' do + let(:project) { create(:project, :repository, :legacy_storage) } + + subject { described_class.new.repository_exists?(storage, "#{project.repository.disk_path}-some-other-repo.git") } + + it { is_expected.to be_falsey } + end + + context 'when the repository exists' do + let(:project) { create(:project, :repository, :legacy_storage) } + + subject { described_class.new.repository_exists?(storage, "#{project.repository.disk_path}.git") } + + it { is_expected.to be_truthy } + end + end + describe '#remove' do it 'removes the namespace' do subject.add_namespace(storage, "mepmep") diff --git a/spec/models/namespace_spec.rb b/spec/models/namespace_spec.rb index 93ad6008aec..1e06d0fd7b9 100644 --- a/spec/models/namespace_spec.rb +++ b/spec/models/namespace_spec.rb @@ -250,7 +250,7 @@ describe Namespace do it "moves dir if path changed" do namespace.update(path: namespace.full_path + '_new') - expect(gitlab_shell.exists?(project.repository_storage, "#{namespace.path}/#{project.path}.git")).to be_truthy + expect(gitlab_shell.repository_exists?(project.repository_storage, "#{namespace.path}/#{project.path}.git")).to be_truthy end context 'when #write_projects_repository_config raises an error' do @@ -358,7 +358,7 @@ describe Namespace do namespace.update(path: namespace.full_path + '_new') expect(before_disk_path).to eq(project.disk_path) - expect(gitlab_shell.exists?(project.repository_storage, "#{project.disk_path}.git")).to be_truthy + expect(gitlab_shell.repository_exists?(project.repository_storage, "#{project.disk_path}.git")).to be_truthy end end diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index d9936a62191..2870c55c7c6 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -4192,13 +4192,24 @@ describe Project do end describe '#check_repository_path_availability' do - let(:project) { build(:project) } + let(:project) { build(:project, :repository, :legacy_storage) } + subject { project.check_repository_path_availability } + + context 'when the repository already exists' do + let(:project) { create(:project, :repository, :legacy_storage) } - it 'skips gitlab-shell exists?' do - project.skip_disk_validation = true + it { is_expected.to be_falsey } + end - expect(project.gitlab_shell).not_to receive(:exists?) - expect(project.check_repository_path_availability).to be_truthy + context 'when the repository does not exist' do + it { is_expected.to be_truthy } + + it 'skips gitlab-shell exists?' do + project.skip_disk_validation = true + + expect(project.gitlab_shell).not_to receive(:repository_exists?) + is_expected.to be_truthy + end end end diff --git a/spec/services/groups/destroy_service_spec.rb b/spec/services/groups/destroy_service_spec.rb index b50a2db8bbe..d13739cefd9 100644 --- a/spec/services/groups/destroy_service_spec.rb +++ b/spec/services/groups/destroy_service_spec.rb @@ -119,7 +119,7 @@ describe Groups::DestroyService do let!(:project) { create(:project, :legacy_storage, :empty_repo, namespace: group) } it 'removes repository' do - expect(gitlab_shell.exists?(project.repository_storage, "#{project.disk_path}.git")).to be_falsey + expect(gitlab_shell.repository_exists?(project.repository_storage, "#{project.disk_path}.git")).to be_falsey end end @@ -127,7 +127,7 @@ describe Groups::DestroyService do let!(:project) { create(:project, :empty_repo, namespace: group) } it 'removes repository' do - expect(gitlab_shell.exists?(project.repository_storage, "#{project.disk_path}.git")).to be_falsey + expect(gitlab_shell.repository_exists?(project.repository_storage, "#{project.disk_path}.git")).to be_falsey end end end diff --git a/spec/services/projects/destroy_service_spec.rb b/spec/services/projects/destroy_service_spec.rb index 9a6f64b825a..2331281bd8e 100644 --- a/spec/services/projects/destroy_service_spec.rb +++ b/spec/services/projects/destroy_service_spec.rb @@ -24,8 +24,8 @@ describe Projects::DestroyService do it 'deletes the project' do expect(Project.unscoped.all).not_to include(project) - expect(project.gitlab_shell.exists?(project.repository_storage, path + '.git')).to be_falsey - expect(project.gitlab_shell.exists?(project.repository_storage, remove_path + '.git')).to be_falsey + expect(project.gitlab_shell.repository_exists?(project.repository_storage, path + '.git')).to be_falsey + expect(project.gitlab_shell.repository_exists?(project.repository_storage, remove_path + '.git')).to be_falsey end end diff --git a/spec/services/projects/hashed_storage/migrate_repository_service_spec.rb b/spec/services/projects/hashed_storage/migrate_repository_service_spec.rb index 5b778f16b5a..f81d9af01ea 100644 --- a/spec/services/projects/hashed_storage/migrate_repository_service_spec.rb +++ b/spec/services/projects/hashed_storage/migrate_repository_service_spec.rb @@ -48,8 +48,8 @@ describe Projects::HashedStorage::MigrateRepositoryService do it 'renames project and wiki repositories' do service.execute - expect(gitlab_shell.exists?(project.repository_storage, "#{new_disk_path}.git")).to be_truthy - expect(gitlab_shell.exists?(project.repository_storage, "#{new_disk_path}.wiki.git")).to be_truthy + expect(gitlab_shell.repository_exists?(project.repository_storage, "#{new_disk_path}.git")).to be_truthy + expect(gitlab_shell.repository_exists?(project.repository_storage, "#{new_disk_path}.wiki.git")).to be_truthy end it 'updates project to be hashed and not read-only' do @@ -84,8 +84,8 @@ describe Projects::HashedStorage::MigrateRepositoryService do service.execute - expect(gitlab_shell.exists?(project.repository_storage, "#{new_disk_path}.git")).to be_falsey - expect(gitlab_shell.exists?(project.repository_storage, "#{new_disk_path}.wiki.git")).to be_falsey + expect(gitlab_shell.repository_exists?(project.repository_storage, "#{new_disk_path}.git")).to be_falsey + expect(gitlab_shell.repository_exists?(project.repository_storage, "#{new_disk_path}.wiki.git")).to be_falsey expect(project.repository_read_only?).to be_falsey end diff --git a/spec/services/projects/hashed_storage/rollback_repository_service_spec.rb b/spec/services/projects/hashed_storage/rollback_repository_service_spec.rb index bd4354a7df3..48302e7a81b 100644 --- a/spec/services/projects/hashed_storage/rollback_repository_service_spec.rb +++ b/spec/services/projects/hashed_storage/rollback_repository_service_spec.rb @@ -48,8 +48,8 @@ describe Projects::HashedStorage::RollbackRepositoryService, :clean_gitlab_redis it 'renames project and wiki repositories' do service.execute - expect(gitlab_shell.exists?(project.repository_storage, "#{new_disk_path}.git")).to be_truthy - expect(gitlab_shell.exists?(project.repository_storage, "#{new_disk_path}.wiki.git")).to be_truthy + expect(gitlab_shell.repository_exists?(project.repository_storage, "#{new_disk_path}.git")).to be_truthy + expect(gitlab_shell.repository_exists?(project.repository_storage, "#{new_disk_path}.wiki.git")).to be_truthy end it 'updates project to be legacy and not read-only' do @@ -84,8 +84,8 @@ describe Projects::HashedStorage::RollbackRepositoryService, :clean_gitlab_redis service.execute - expect(gitlab_shell.exists?(project.repository_storage, "#{new_disk_path}.git")).to be_falsey - expect(gitlab_shell.exists?(project.repository_storage, "#{new_disk_path}.wiki.git")).to be_falsey + expect(gitlab_shell.repository_exists?(project.repository_storage, "#{new_disk_path}.git")).to be_falsey + expect(gitlab_shell.repository_exists?(project.repository_storage, "#{new_disk_path}.wiki.git")).to be_falsey expect(project.repository_read_only?).to be_falsey end diff --git a/spec/services/projects/transfer_service_spec.rb b/spec/services/projects/transfer_service_spec.rb index 6b906f9372c..26d8ac9b479 100644 --- a/spec/services/projects/transfer_service_spec.rb +++ b/spec/services/projects/transfer_service_spec.rb @@ -103,7 +103,7 @@ describe Projects::TransferService do it 'rolls back repo location' do attempt_project_transfer - expect(gitlab_shell.exists?(project.repository_storage, "#{project.disk_path}.git")).to be(true) + expect(gitlab_shell.repository_exists?(project.repository_storage, "#{project.disk_path}.git")).to be(true) expect(original_path).to eq current_path end diff --git a/spec/services/users/destroy_service_spec.rb b/spec/services/users/destroy_service_spec.rb index 4a5f4509a7b..23a0c71175e 100644 --- a/spec/services/users/destroy_service_spec.rb +++ b/spec/services/users/destroy_service_spec.rb @@ -183,7 +183,7 @@ describe Users::DestroyService do let!(:project) { create(:project, :empty_repo, :legacy_storage, namespace: user.namespace) } it 'removes repository' do - expect(gitlab_shell.exists?(project.repository_storage, "#{project.disk_path}.git")).to be_falsey + expect(gitlab_shell.repository_exists?(project.repository_storage, "#{project.disk_path}.git")).to be_falsey end end @@ -191,7 +191,7 @@ describe Users::DestroyService do let!(:project) { create(:project, :empty_repo, namespace: user.namespace) } it 'removes repository' do - expect(gitlab_shell.exists?(project.repository_storage, "#{project.disk_path}.git")).to be_falsey + expect(gitlab_shell.repository_exists?(project.repository_storage, "#{project.disk_path}.git")).to be_falsey end end end |