From ff0c5fe23fa436c9970e649727f6bf360e5f025f Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Tue, 6 Sep 2022 16:25:35 +0530 Subject: [PATCH 1/2] Don't translate some strings as it causes issue with weblate --- res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 85950899c..acae4c740 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -29,10 +29,10 @@ Downloads - @string/files_label + @string/files_label - @string/files_label + @string/files_label Open from -- GitLab From a8993aa1aac4c2f591d9f75dbed32c869854a463 Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Wed, 14 Sep 2022 17:02:24 +0530 Subject: [PATCH 2/2] DocumentsUI: add gitlab ci --- .gitlab-ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 000000000..f01e77790 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,7 @@ +stages: + - update-from-upstream + +include: + - project: 'e/templates' + ref: master + file: '/gitlab-ci/.gitlab-ci-import-updates-from-upstream.yml' -- GitLab