From 3f47de948a227e20a7adff8389faf00df45aa6c4 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Mon, 23 Mar 2020 15:05:54 -0600
Subject: [PATCH 1/5] Show a informational message when disabling LFS

... but only if there are LFS objects in the repo.
---
 .../permissions/components/settings_panel.vue | 31 +++++++++++++++++++
 app/helpers/projects_helper.rb                |  2 ++
 2 files changed, 33 insertions(+)

diff --git a/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue b/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
index faaa65b1a16f77..a3743ded6014b0 100644
--- a/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
+++ b/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
@@ -1,4 +1,6 @@
 <script>
+import { GlSprintf, GlLink } from '@gitlab/ui';
+
 import settingsMixin from 'ee_else_ce/pages/projects/shared/permissions/mixins/settings_pannel_mixin';
 import { s__ } from '~/locale';
 import projectFeatureSetting from './project_feature_setting.vue';
@@ -19,6 +21,8 @@ export default {
     projectFeatureSetting,
     projectFeatureToggle,
     projectSettingRow,
+    GlSprintf,
+    GlLink,
   },
   mixins: [settingsMixin],
 
@@ -67,6 +71,16 @@ export default {
       required: false,
       default: '',
     },
+    lfsObjectsExist: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+    lfsObjectsRemovalHelpPath: {
+      type: String,
+      required: false,
+      default: '',
+    },
     registryHelpPath: {
       type: String,
       required: false,
@@ -377,6 +391,23 @@ export default {
             :disabled-input="!repositoryEnabled"
             name="project[lfs_enabled]"
           />
+          <p v-if="!lfsEnabled && lfsObjectsExist">
+            <gl-sprintf
+              :message="
+                s__(
+                  'ProjectSettings|LFS objects from this repository are still available to forks. %{linkStart}How do I remove them?%{linkEnd}',
+                )
+              "
+            >
+              <template #link="{ content }">
+                <span class="d-block">
+                  <gl-link :href="lfsObjectsRemovalHelpPath" target="_blank">
+                    {{ content }}
+                  </gl-link>
+                </span>
+              </template>
+            </gl-sprintf>
+          </p>
         </project-setting-row>
         <project-setting-row
           v-if="packagesAvailable"
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index cf9f3b9e924852..015f8783db57d5 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -603,6 +603,8 @@ def project_permissions_panel_data(project)
       registryHelpPath: help_page_path('user/packages/container_registry/index'),
       lfsAvailable: Gitlab.config.lfs.enabled,
       lfsHelpPath: help_page_path('workflow/lfs/manage_large_binaries_with_git_lfs'),
+      lfsObjectsExist: project.lfs_objects.exists?,
+      lfsObjectsRemovalHelpPath: help_page_path('administration/lfs/manage_large_binaries_with_git_lfs', anchor: 'removing-objects-from-lfs'),
       pagesAvailable: Gitlab.config.pages.enabled,
       pagesAccessControlEnabled: Gitlab.config.pages.access_control,
       pagesAccessControlForced: ::Gitlab::Pages.access_control_is_forced?,
-- 
GitLab


From 24a0dc4c892e4d37eb13cafbff1c4f6c699a68c6 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Thu, 12 Mar 2020 13:54:11 -0600
Subject: [PATCH 2/5] Add some documentation around removing LFS objects

---
 .../lfs/manage_large_binaries_with_git_lfs.md              | 7 +++++++
 doc/topics/git/index.md                                    | 1 +
 2 files changed, 8 insertions(+)

diff --git a/doc/administration/lfs/manage_large_binaries_with_git_lfs.md b/doc/administration/lfs/manage_large_binaries_with_git_lfs.md
index 61b8f28293ffad..27cf27fddc95d0 100644
--- a/doc/administration/lfs/manage_large_binaries_with_git_lfs.md
+++ b/doc/administration/lfs/manage_large_binaries_with_git_lfs.md
@@ -93,6 +93,13 @@ git lfs fetch origin master
 
 Read the documentation on how to [migrate an existing Git repo with Git LFS](../../topics/git/migrate_to_git_lfs/index.md).
 
+### Removing objects from LFS
+
+To remove objects from LFS:
+
+1. Use [BFG-Cleaner](../../user/project/repository/reducing_the_repo_size_using_git.md#using-the-bfg-repo-cleaner) or [filter-branch](../../user/project/repository/reducing_the_repo_size_using_git.md#using-git-filter-branch) to remove the objects from the repository.
+1. Delete the relevant LFS lines for the objects you have removed from your `.gitattributes` file and commit those changes.
+
 ## File Locking
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/issues/35856) in GitLab 10.5.
diff --git a/doc/topics/git/index.md b/doc/topics/git/index.md
index c7abfb1d974c55..4b76f5bdc5845b 100644
--- a/doc/topics/git/index.md
+++ b/doc/topics/git/index.md
@@ -85,6 +85,7 @@ The following relate to Git Large File Storage:
 
 - [Getting Started with Git LFS](https://about.gitlab.com/blog/2017/01/30/getting-started-with-git-lfs-tutorial/)
 - [Migrate an existing Git repo with Git LFS](migrate_to_git_lfs/index.md)
+- [Removing objects from LFS](../../administration/lfs/manage_large_binaries_with_git_lfs.md#removing-objects-from-lfs)
 - [GitLab Git LFS user documentation](../../administration/lfs/manage_large_binaries_with_git_lfs.md)
 - [GitLab Git LFS admin documentation](../../administration/lfs/lfs_administration.md)
 - [git-annex to Git-LFS migration guide](../../administration/lfs/migrate_from_git_annex_to_git_lfs.md)
-- 
GitLab


From a37202c11769945b2b290619245cf89df2e53415 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Thu, 12 Mar 2020 13:13:33 -0600
Subject: [PATCH 3/5] Update translations with new LFS text

---
 locale/gitlab.pot | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 1293c610d38568..3076fd33a0770b 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -15520,6 +15520,9 @@ msgstr ""
 msgid "ProjectSettings|Issues"
 msgstr ""
 
+msgid "ProjectSettings|LFS objects from this repository are still available to forks. %{linkStart}How do I remove them?%{linkEnd}"
+msgstr ""
+
 msgid "ProjectSettings|Learn more about badges."
 msgstr ""
 
-- 
GitLab


From 0ff3faf7d25e2e74be6ea589a0425a97360832c3 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Mon, 23 Mar 2020 17:05:03 -0600
Subject: [PATCH 4/5] Test that the informational message appears

... also, that it does not appear.
---
 .../components/settings_panel_spec.js         | 62 +++++++++++++++----
 1 file changed, 51 insertions(+), 11 deletions(-)

diff --git a/spec/frontend/pages/projects/shared/permissions/components/settings_panel_spec.js b/spec/frontend/pages/projects/shared/permissions/components/settings_panel_spec.js
index c304dfd204822a..76948f3ff4cd05 100644
--- a/spec/frontend/pages/projects/shared/permissions/components/settings_panel_spec.js
+++ b/spec/frontend/pages/projects/shared/permissions/components/settings_panel_spec.js
@@ -1,4 +1,4 @@
-import { shallowMount } from '@vue/test-utils';
+import { shallowMount, mount } from '@vue/test-utils';
 
 import settingsPanel from '~/pages/projects/shared/permissions/components/settings_panel.vue';
 import {
@@ -32,6 +32,8 @@ const defaultProps = {
   registryHelpPath: '/help/user/packages/container_registry/index',
   lfsAvailable: true,
   lfsHelpPath: '/help/workflow/lfs/manage_large_binaries_with_git_lfs',
+  lfsObjectsExist: false,
+  lfsObjectsRemovalHelpPath: `/help/administration/lfs/manage_large_binaries_with_git_lfs#removing-objects-from-lfs`,
   pagesAvailable: true,
   pagesAccessControlEnabled: false,
   pagesAccessControlForced: false,
@@ -43,21 +45,25 @@ const defaultProps = {
 describe('Settings Panel', () => {
   let wrapper;
 
-  const mountComponent = customProps => {
-    const propsData = { ...defaultProps, ...customProps };
-    return shallowMount(settingsPanel, { propsData });
+  const mountComponent = (
+    { currentSettings = {}, ...customProps } = {},
+    mountFn = shallowMount,
+  ) => {
+    const propsData = {
+      ...defaultProps,
+      ...customProps,
+      currentSettings: { ...defaultProps.currentSettings, ...currentSettings },
+    };
+
+    return mountFn(settingsPanel, { propsData });
   };
 
   const overrideCurrentSettings = (currentSettingsProps, extraProps = {}) => {
-    return mountComponent({
-      ...extraProps,
-      currentSettings: {
-        ...defaultProps.currentSettings,
-        ...currentSettingsProps,
-      },
-    });
+    return mountComponent({ ...extraProps, currentSettings: currentSettingsProps });
   };
 
+  const findLFSSettingsMessage = () => wrapper.find({ ref: 'git-lfs-settings' }).find('p');
+
   beforeEach(() => {
     wrapper = mountComponent();
   });
@@ -333,6 +339,40 @@ describe('Settings Panel', () => {
 
       expect(wrapper.find('[name="project[lfs_enabled]"]').props().disabledInput).toEqual(true);
     });
+
+    describe.each`
+      lfsObjectsExist | lfsEnabled | isShown
+      ${true}         | ${true}    | ${false}
+      ${true}         | ${false}   | ${true}
+      ${false}        | ${true}    | ${false}
+      ${false}        | ${false}   | ${false}
+    `(
+      'with (lfsObjectsExist = $lfsObjectsExist, lfsEnabled = $lfsEnabled)',
+      ({ lfsObjectsExist, lfsEnabled, isShown }) => {
+        beforeEach(() => {
+          wrapper = mountComponent({ lfsObjectsExist, currentSettings: { lfsEnabled } }, mount);
+        });
+
+        if (isShown) {
+          it('shows warning message', () => {
+            const message = findLFSSettingsMessage();
+            const link = message.find('a');
+
+            expect(message.text()).toContain(
+              'LFS objects from this repository are still available to forks',
+            );
+            expect(link.text()).toEqual('How do I remove them?');
+            expect(link.attributes('href')).toEqual(
+              '/help/administration/lfs/manage_large_binaries_with_git_lfs#removing-objects-from-lfs',
+            );
+          });
+        } else {
+          it('does not show warning message', () => {
+            expect(findLFSSettingsMessage().exists()).toEqual(false);
+          });
+        }
+      },
+    );
   });
 
   describe('Packages', () => {
-- 
GitLab


From 0bad6214716a8e8d387842fc5d816c5f2cf3933e Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Mon, 16 Mar 2020 14:02:15 -0600
Subject: [PATCH 5/5] Add changelog file

---
 changelogs/unreleased/improve-lfs-toggle-message.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 changelogs/unreleased/improve-lfs-toggle-message.yml

diff --git a/changelogs/unreleased/improve-lfs-toggle-message.yml b/changelogs/unreleased/improve-lfs-toggle-message.yml
new file mode 100644
index 00000000000000..2db2152c676a15
--- /dev/null
+++ b/changelogs/unreleased/improve-lfs-toggle-message.yml
@@ -0,0 +1,5 @@
+---
+title: Show object access warning when disabling repo LFS
+merge_request: 26696
+author:
+type: other
-- 
GitLab