summaryrefslogtreecommitdiff
path: root/app/presenters
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-11-18 18:09:08 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-11-18 18:09:08 +0000
commit7ea5ca0bb5aa9792c514a22d59217dffa3800581 (patch)
tree753d90cbdb990d5b4889990fe7e8534d030480b3 /app/presenters
parente26bf16ed06dd7fc959961cfe16621c19f0e6acf (diff)
downloadgitlab-ce-7ea5ca0bb5aa9792c514a22d59217dffa3800581.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/presenters')
-rw-r--r--app/presenters/projects/import_export/project_export_presenter.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/presenters/projects/import_export/project_export_presenter.rb b/app/presenters/projects/import_export/project_export_presenter.rb
index 8f3fc53af10..b52f3411c49 100644
--- a/app/presenters/projects/import_export/project_export_presenter.rb
+++ b/app/presenters/projects/import_export/project_export_presenter.rb
@@ -15,6 +15,10 @@ module Projects
self.respond_to?(:override_description) ? override_description : super
end
+ def protected_branches
+ project.exported_protected_branches
+ end
+
private
def converted_group_members