summaryrefslogtreecommitdiffstats
path: root/templates/org/settings
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2019-06-22 18:35:34 +0100
committerGitHub <noreply@github.com>2019-06-22 18:35:34 +0100
commitbaefea311f1a66a97f9a2779ad3342f4f8167d28 (patch)
treed294d768fe141af768c7f40de6f06eb6edddfeef /templates/org/settings
parentd14595514e35810fbcf1dc0d7e3ba8ada4f08c07 (diff)
downloadgitea-baefea311f1a66a97f9a2779ad3342f4f8167d28.tar.gz
gitea-baefea311f1a66a97f9a2779ad3342f4f8167d28.zip
Fix #732: Add LFS objects to base repository on merging (#7082)
On merge we walk the merge history and ensure that all lfs objects pointed to in the history are added to the base repository. This switches from relying on having git-lfs installed on the server, (and in fact .gitattributes being correctly installed.)
Diffstat (limited to 'templates/org/settings')
0 files changed, 0 insertions, 0 deletions