Merge branch 'fix-filename-length' into 'master'

Ensure changelog filenames have length less than 99 characters

See merge request gitlab-org/gitlab-ce!31752

4 files changed, 2 insertions, 2 deletions

diff --git a/bin/changelog b/bin/changelog
index 328d9495b96..ec068d06507 100755
--- a/bin/changelog
+++ b/bin/changelog
@@ -23,7 +23,7 @@ module ChangelogHelpers
   Abort = Class.new(StandardError)
   Done = Class.new(StandardError)
 
-  MAX_FILENAME_LENGTH = 140 # ecryptfs has a limit of 140 characters
+  MAX_FILENAME_LENGTH = 99 # GNU tar has a 99 character limit
 
   def capture_stdout(cmd)
     output = IO.popen(cmd, &:read)
diff --git a/changelogs/unreleased/44036-someone-edited-the-issue-at-the-same-time-is-regularly-seen-despite-that-being-a-filthy-lie.yml b/changelogs/unreleased/44036-fix-someone-edited-the-issue-at-the-same-time-false-warning.yml
index 674d53286e6..674d53286e6 100644
--- a/changelogs/unreleased/44036-someone-edited-the-issue-at-the-same-time-is-regularly-seen-despite-that-being-a-filthy-lie.yml
+++ b/changelogs/unreleased/44036-fix-someone-edited-the-issue-at-the-same-time-false-warning.yml
diff --git a/changelogs/unreleased/61787-the-colour-selector-for-broadcast-messages-should-provide-a-few-default-options-with-descriptive-labels-like.yml b/changelogs/unreleased/61787-broadcast-messages-colour-selector-provide-default-options-with-descriptive-labels.yml
index ec6e9c5aff8..ec6e9c5aff8 100644
--- a/changelogs/unreleased/61787-the-colour-selector-for-broadcast-messages-should-provide-a-few-default-options-with-descriptive-labels-like.yml
+++ b/changelogs/unreleased/61787-broadcast-messages-colour-selector-provide-default-options-with-descriptive-labels.yml
diff --git a/spec/bin/changelog_spec.rb b/spec/bin/changelog_spec.rb
index 84bbe0525e5..c3a5abf2b7a 100644
--- a/spec/bin/changelog_spec.rb
+++ b/spec/bin/changelog_spec.rb
@@ -15,7 +15,7 @@ describe 'bin/changelog' do
       allow(entry).to receive(:branch_name).and_return('long-branch-' * 100)
 
       file_path = entry.send(:file_path)
-      expect(file_path.length).to eq(140)
+      expect(file_path.length).to eq(99)
     end
   end