diff options
| author | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-05-07 11:52:53 +0200 |
|---|---|---|
| committer | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-05-07 12:00:14 +0200 |
| commit | d12a29911771e794202ffc9d9ab64fddacfbd485 (patch) | |
| tree | 91bc3f70236acb4161e1ed30fcc407b4244f940d | |
| parent | 961255b107370a1350f91d0835cf0e849d237f7d (diff) | |
| download | gitlab-ce-d12a29911771e794202ffc9d9ab64fddacfbd485.tar.gz | |
Adds changelog entry, changes RemoteMirror#sync? to be semantically sound and remove reference to pull mirrors in view
| -rw-r--r-- | app/models/remote_mirror.rb | 4 | ||||
| -rw-r--r-- | app/views/admin/application_settings/show.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/42099-port-push-mirroring-to-ce-ce-port-v-2.yml | 5 |
3 files changed, 8 insertions, 3 deletions
diff --git a/app/models/remote_mirror.rb b/app/models/remote_mirror.rb index 3b9fd6d710f..bbf8fd9c6a7 100644 --- a/app/models/remote_mirror.rb +++ b/app/models/remote_mirror.rb @@ -87,11 +87,11 @@ class RemoteMirror < ActiveRecord::Base end def sync? - !enabled? + enabled? end def sync - return if sync? + return unless sync? if recently_scheduled? RepositoryUpdateRemoteMirrorWorker.perform_in(backoff_delay, self.id, Time.now) diff --git a/app/views/admin/application_settings/show.html.haml b/app/views/admin/application_settings/show.html.haml index 4d686d02046..3f440c76ee0 100644 --- a/app/views/admin/application_settings/show.html.haml +++ b/app/views/admin/application_settings/show.html.haml @@ -321,6 +321,6 @@ %button.btn.js-settings-toggle{ type: 'button' } = expanded ? 'Collapse' : 'Expand' %p - = _('Configure push and pull mirrors.') + = _('Configure push mirrors.') .settings-content = render partial: 'repository_mirrors_form' diff --git a/changelogs/unreleased/42099-port-push-mirroring-to-ce-ce-port-v-2.yml b/changelogs/unreleased/42099-port-push-mirroring-to-ce-ce-port-v-2.yml new file mode 100644 index 00000000000..f23521ea416 --- /dev/null +++ b/changelogs/unreleased/42099-port-push-mirroring-to-ce-ce-port-v-2.yml @@ -0,0 +1,5 @@ +--- +title: Adds push mirrors to GitLab Community Edition +merge_request: 18715 +author: +type: changed |