Show disabled project repo mirrors
Show disabled mirrors with a badge so that they can be deleted by project owners.
This commit is contained in:
Luke Bennett
parent
4ebbfb9f1e
commit
8753384873
8 changed files with 58 additions and 15 deletions
|
|
@ -133,6 +133,10 @@ class RemoteMirror < ApplicationRecord
|
|||
end
|
||||
alias_method :enabled?, :enabled
|
||||
|
||||
def disabled?
|
||||
!enabled?
|
||||
end
|
||||
|
||||
def updated_since?(timestamp)
|
||||
last_update_started_at && last_update_started_at > timestamp && !update_failed?
|
||||
end
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
.badge.badge-warning.qa-disabled-mirror-badge{ data: { toggle: 'tooltip', html: 'true' }, title: _('Disabled mirrors can only be enabled by instance owners. It is recommended that you delete them.') }= _('Disabled')
|
||||
|
|
@ -49,17 +49,19 @@
|
|||
%tbody.js-mirrors-table-body
|
||||
= render_if_exists 'projects/mirrors/table_pull_row'
|
||||
- @project.remote_mirrors.each_with_index do |mirror, index|
|
||||
- if mirror.enabled
|
||||
%tr.qa-mirrored-repository-row
|
||||
%td.qa-mirror-repository-url= mirror.safe_url
|
||||
%td= _('Push')
|
||||
%td.qa-mirror-last-update-at= mirror.last_update_at.present? ? time_ago_with_tooltip(mirror.last_update_at) : _('Never')
|
||||
%td
|
||||
- if mirror.last_error.present?
|
||||
.badge.mirror-error-badge{ data: { toggle: 'tooltip', html: 'true' }, title: html_escape(mirror.last_error.try(:strip)) }= _('Error')
|
||||
%td
|
||||
.btn-group.mirror-actions-group.pull-right{ role: 'group' }
|
||||
- if mirror.ssh_key_auth?
|
||||
= clipboard_button(text: mirror.ssh_public_key, class: 'btn btn-default', title: _('Copy SSH public key'))
|
||||
= render 'shared/remote_mirror_update_button', remote_mirror: mirror
|
||||
%button.js-delete-mirror.btn.btn-danger{ type: 'button', data: { mirror_id: mirror.id, toggle: 'tooltip', container: 'body' }, title: _('Remove') }= icon('trash-o')
|
||||
- next if mirror.new_record?
|
||||
%tr.qa-mirrored-repository-row{ class: ('bg-secondary' if mirror.disabled?) }
|
||||
%td.qa-mirror-repository-url= mirror.safe_url
|
||||
%td= _('Push')
|
||||
%td.qa-mirror-last-update-at= mirror.last_update_at.present? ? time_ago_with_tooltip(mirror.last_update_at) : _('Never')
|
||||
%td
|
||||
- if mirror.disabled?
|
||||
= render 'projects/mirrors/disabled_mirror_badge'
|
||||
- if mirror.last_error.present?
|
||||
.badge.mirror-error-badge{ data: { toggle: 'tooltip', html: 'true' }, title: html_escape(mirror.last_error.try(:strip)) }= _('Error')
|
||||
%td
|
||||
.btn-group.mirror-actions-group.pull-right{ role: 'group' }
|
||||
- if mirror.ssh_key_auth?
|
||||
= clipboard_button(text: mirror.ssh_public_key, class: 'btn btn-default', title: _('Copy SSH public key'))
|
||||
= render 'shared/remote_mirror_update_button', remote_mirror: mirror
|
||||
%button.js-delete-mirror.qa-delete-mirror.btn.btn-danger{ type: 'button', data: { mirror_id: mirror.id, toggle: 'tooltip', container: 'body' }, title: _('Remove') }= icon('trash-o')
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
- if remote_mirror.update_in_progress?
|
||||
%button.btn.disabled{ type: 'button', data: { toggle: 'tooltip', container: 'body' }, title: _('Updating') }
|
||||
= icon("refresh spin")
|
||||
- else
|
||||
- elsif remote_mirror.enabled?
|
||||
= link_to update_now_project_mirror_path(@project, sync_remote: true), method: :post, class: "btn qa-update-now-button", data: { toggle: 'tooltip', container: 'body' }, title: _('Update now') do
|
||||
= icon("refresh")
|
||||
|
|
|
|||
5
changelogs/unreleased/show-disabled-mirrors.yml
Normal file
5
changelogs/unreleased/show-disabled-mirrors.yml
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Show disabled project repo mirrors in settings
|
||||
merge_request: 27326
|
||||
author:
|
||||
type: other
|
||||
|
|
@ -3383,6 +3383,9 @@ msgstr ""
|
|||
msgid "Disabled"
|
||||
msgstr ""
|
||||
|
||||
msgid "Disabled mirrors can only be enabled by instance owners. It is recommended that you delete them."
|
||||
msgstr ""
|
||||
|
||||
msgid "Discard"
|
||||
msgstr ""
|
||||
|
||||
|
|
|
|||
|
|
@ -236,5 +236,17 @@ describe 'Projects > Settings > Repository settings' do
|
|||
expect(mirrored_project.remote_mirrors.count).to eq(0)
|
||||
end
|
||||
end
|
||||
|
||||
it 'shows a disabled mirror' do
|
||||
create(:remote_mirror, project: project, enabled: false)
|
||||
|
||||
visit project_settings_repository_path(project)
|
||||
|
||||
mirror = find('.qa-mirrored-repository-row')
|
||||
|
||||
expect(mirror).to have_selector('.qa-delete-mirror')
|
||||
expect(mirror).to have_selector('.qa-disabled-mirror-badge')
|
||||
expect(mirror).not_to have_selector('.qa-update-now-button')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -373,6 +373,22 @@ describe RemoteMirror, :mailer do
|
|||
end
|
||||
end
|
||||
|
||||
describe '#disabled?' do
|
||||
subject { remote_mirror.disabled? }
|
||||
|
||||
context 'when disabled' do
|
||||
let(:remote_mirror) { build(:remote_mirror, enabled: false) }
|
||||
|
||||
it { is_expected.to be_truthy }
|
||||
end
|
||||
|
||||
context 'when enabled' do
|
||||
let(:remote_mirror) { build(:remote_mirror, enabled: true) }
|
||||
|
||||
it { is_expected.to be_falsy }
|
||||
end
|
||||
end
|
||||
|
||||
def create_mirror(params)
|
||||
project = FactoryBot.create(:project, :repository)
|
||||
project.remote_mirrors.create!(params)
|
||||
|
|
|
|||
Loading…
Reference in a new issue