Automatic merge of gitlab-org/gitlab-ce master

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)

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