Skip to content
Snippets Groups Projects
Commit 7127ddbe authored by Sjoerd Simons's avatar Sjoerd Simons
Browse files

Merge branch 'wip/ritesh/apply-missed-out-patches' into 'collabora/master'

Really apply the OBS ACL patches

See merge request !20
parents e411bb2e c81b1f71
Branches
No related tags found
1 merge request!20Really apply the OBS ACL patches
open-build-service (2.7.4-3co5) stretch; urgency=medium
* Really apply the OBS ACL patches
-- Ritesh Raj Sarraf <ritesh.sarraf@collabora.com> Mon, 25 Jan 2021 21:47:17 +0530
open-build-service (2.7.4-3co4) stretch; urgency=medium
* Make obs-worker depend on either libarchive-tools or bsdtar.
......
......@@ -27,11 +27,9 @@ but that restriction is not enforced here.
src/api/app/views/models/_project.xml.builder | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/api/app/views/models/_project.xml.builder b/src/api/app/views/models/_project.xml.builder
index 530c7de..5ceae74 100644
--- a/src/api/app/views/models/_project.xml.builder
+++ b/src/api/app/views/models/_project.xml.builder
@@ -62,10 +62,13 @@ xml.project(project_attributes) do
@@ -67,10 +67,13 @@
repo.path_elements.includes(:link).each do |pe|
if pe.link.remote_project_name
project_name = pe.link.project.name+":"+pe.link.remote_project_name
......
......@@ -36,3 +36,7 @@ collabora/backend-Handle-ERROR_WANT_-READ-WRITE-from-ssl-reads.patch
collabora/backend-Support-https-urls-for-package-downloads.patch
collabora/BSConfig-Make-every-architecture-its-own-relsync-pool.patch
collabora/BSConfig-Read-a-BSConfig.local.pm-if-it-exists.patch
collabora/Add-a-new-none-or-some-element-allowbuilddep-to-project-m.patch
collabora/Use-the-allowbuilddep-in-meta-config-to-whitelist-project.patch
collabora/Invalidate-the-rails-cache-for-project-meta-xml-in-show_p.patch
collabora/Suppress-a-500-error-in-the-web-UI-for-project-meta-confi.patch
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment