Merge branch '254281-remove-push-mirror-syncs-lfs-feature-flag' into 'master'

Sync LFS objects when push mirroring over HTTPS See merge request gitlab-org/gitlab!44457

Merge branch '254281-remove-push-mirror-syncs-lfs-feature-flag' into 'master'
Sync LFS objects when push mirroring over HTTPS See merge request gitlab-org/gitlab!44457
39c62c9e · Douglas Barbosa Alexandre · 770dcbe9 · 5067d782 · 39c62c9e · 39c62c9e
Commit 39c62c9e authored Oct 14, 2020 by Douglas Barbosa Alexandre
10 changed files
--- a/app/helpers/mirror_helper.rb
+++ b/app/helpers/mirror_helper.rb
@@ -9,7 +9,11 @@ module MirrorHelper
  end

  def mirror_lfs_sync_message
-    html_escape(_('The Git LFS objects will %{strong_open}not%{strong_close} be synced.')) % { strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe }
+    docs_link_url = help_page_path('topics/git/lfs/index')
+    docs_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: docs_link_url }
+
+    html_escape(_('Git LFS objects will be synced if LFS is %{docs_link_start}enabled for the project%{docs_link_end}. Push mirrors will %{strong_open}not%{strong_close} sync LFS objects over SSH.')) %
+        { docs_link_start: docs_link_start, docs_link_end: '</a>'.html_safe, strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe }
  end
 end


--- a/app/services/projects/update_remote_mirror_service.rb
+++ b/app/services/projects/update_remote_mirror_service.rb
@@ -55,7 +55,6 @@ module Projects
    end

    def send_lfs_objects!(remote_mirror)
-      return unless Feature.enabled?(:push_mirror_syncs_lfs, project)
      return unless project.lfs_enabled?

      # TODO: Support LFS sync over SSH

--- a/changelogs/unreleased/254281-remove-push-mirror-syncs-lfs-feature-flag.yml
+++ b/changelogs/unreleased/254281-remove-push-mirror-syncs-lfs-feature-flag.yml
+---
+title: Sync LFS objects when push mirroring over HTTPS
+merge_request: 44457
+author:
+type: added
--- a/config/feature_flags/development/push_mirror_syncs_lfs.yml
+++ b/config/feature_flags/development/push_mirror_syncs_lfs.yml
---
-name: push_mirror_syncs_lfs
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40137
-rollout_issue_url: 
-group: group::source code
-type: development
-default_enabled: false
--- a/doc/user/project/repository/img/repository_mirroring_push_settings.png
+++ b/doc/user/project/repository/img/repository_mirroring_push_settings.png
--- a/doc/user/project/repository/repository_mirroring.md
+++ b/doc/user/project/repository/repository_mirroring.md
@@ -56,6 +56,7 @@ The following are some possible use cases for repository mirroring:

 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/249) in GitLab Enterprise Edition 8.7.
 > - [Moved to GitLab Core](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/18715) in 10.8.
+> - [LFS support over HTTPS added](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40137) in 13.5

 For an existing project, you can set up push mirroring as follows:


--- a/ee/app/helpers/ee/mirror_helper.rb
+++ b/ee/app/helpers/ee/mirror_helper.rb
@@ -36,13 +36,5 @@ module EE
      count = project.mirror == true ? 1 : 0
      count + @project.remote_mirrors.to_a.count { |mirror| mirror.enabled }
    end
-
-    def mirror_lfs_sync_message
-      docs_link_url = help_page_path('topics/git/lfs/index')
-      docs_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: docs_link_url }
-
-      html_escape(_('Git LFS objects will be synced in pull mirrors if LFS is %{docs_link_start}enabled for the project%{docs_link_end}. They will %{strong_open}not%{strong_close} be synced in push mirrors.')) %
-        { docs_link_start: docs_link_start, docs_link_end: '</a>'.html_safe, strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe }
-    end
  end
 end
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -12121,7 +12121,7 @@ msgstr ""
 msgid "Git LFS is not enabled on this GitLab server, contact your admin."
 msgstr ""

-msgid "Git LFS objects will be synced in pull mirrors if LFS is %{docs_link_start}enabled for the project%{docs_link_end}. They will %{strong_open}not%{strong_close} be synced in push mirrors."
+msgid "Git LFS objects will be synced if LFS is %{docs_link_start}enabled for the project%{docs_link_end}. Push mirrors will %{strong_open}not%{strong_close} sync LFS objects over SSH."
 msgstr ""

 msgid "Git LFS status:"
@@ -25786,9 +25786,6 @@ msgstr ""
 msgid "The CSV export will be created in the background. Once finished, it will be sent to %{strong_open}%{email}%{strong_close} in an attachment."
 msgstr ""

-msgid "The Git LFS objects will %{strong_open}not%{strong_close} be synced."
-msgstr ""
-
 msgid "The GitLab user to which the Jira user %{jiraDisplayName} will be mapped"
 msgstr ""


--- a/qa/qa/specs/features/browser_ui/3_create/repository/push_mirroring_lfs_over_http_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/push_mirroring_lfs_over_http_spec.rb
@@ -3,8 +3,7 @@
 module QA
  RSpec.describe 'Create' do
    describe 'Push mirror a repository over HTTP' do
-      it 'configures and syncs LFS objects for a (push) mirrored repository', :requires_admin, testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/414' do
-        Runtime::Feature.enable(:push_mirror_syncs_lfs)
+      it 'configures and syncs LFS objects for a (push) mirrored repository', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/414' do
        Runtime::Browser.visit(:gitlab, Page::Main::Login)
        Page::Main::Login.perform(&:sign_in_using_credentials)


--- a/spec/services/projects/update_remote_mirror_service_spec.rb
+++ b/spec/services/projects/update_remote_mirror_service_spec.rb
@@ -123,54 +123,36 @@ RSpec.describe Projects::UpdateRemoteMirrorService do
        stub_lfs_setting(enabled: true)
      end

-      context 'feature flag enabled' do
-        before do
-          stub_feature_flags(push_mirror_syncs_lfs: true)
+      it 'pushes LFS objects to a HTTP repository' do
+        expect_next_instance_of(Lfs::PushService) do |service|
+          expect(service).to receive(:execute)
        end

-        it 'pushes LFS objects to a HTTP repository' do
-          expect_next_instance_of(Lfs::PushService) do |service|
-            expect(service).to receive(:execute)
-          end
-
-          execute!
-        end
-
-        it 'does nothing to an SSH repository' do
-          remote_mirror.update!(url: 'ssh://example.com')
-
-          expect_any_instance_of(Lfs::PushService).not_to receive(:execute)
-
-          execute!
-        end
+        execute!
+      end

-        it 'does nothing if LFS is disabled' do
-          expect(project).to receive(:lfs_enabled?) { false }
+      it 'does nothing to an SSH repository' do
+        remote_mirror.update!(url: 'ssh://example.com')

-          expect_any_instance_of(Lfs::PushService).not_to receive(:execute)
+        expect_any_instance_of(Lfs::PushService).not_to receive(:execute)

-          execute!
-        end
+        execute!
+      end

-        it 'does nothing if non-password auth is specified' do
-          remote_mirror.update!(auth_method: 'ssh_public_key')
+      it 'does nothing if LFS is disabled' do
+        expect(project).to receive(:lfs_enabled?) { false }

-          expect_any_instance_of(Lfs::PushService).not_to receive(:execute)
+        expect_any_instance_of(Lfs::PushService).not_to receive(:execute)

-          execute!
-        end
+        execute!
      end

-      context 'feature flag disabled' do
-        before do
-          stub_feature_flags(push_mirror_syncs_lfs: false)
-        end
+      it 'does nothing if non-password auth is specified' do
+        remote_mirror.update!(auth_method: 'ssh_public_key')

-        it 'does nothing' do
-          expect_any_instance_of(Lfs::PushService).not_to receive(:execute)
+        expect_any_instance_of(Lfs::PushService).not_to receive(:execute)

-          execute!
-        end
+        execute!
      end
    end
  end