From f90fa6555b66ae4d58fe6273d9c616f0938f87bc Mon Sep 17 00:00:00 2001 From: Nick Thomas Date: Thu, 21 Mar 2019 13:03:26 +0000 Subject: Merge branch '59293-android-template-is-missing-gitlab-ci-yml' into 'master' Resolve "Android template is missing .gitlab-ci.yml" Closes #59293 See merge request gitlab-org/gitlab-ce!26415 (cherry picked from commit 134df14c1c327a53668eb5b6c1ece9fb33a00caa) 755b6bbc Add missing .gitlab-ci.yml for Android template 78c35f28 Remove additional extra file 285c05f6 Add missing chmod --- ...3-android-template-is-missing-gitlab-ci-yml.yml | 5 +++++ vendor/project_templates/android.tar.gz | Bin 132152 -> 132592 bytes 2 files changed, 5 insertions(+) create mode 100644 changelogs/unreleased/59293-android-template-is-missing-gitlab-ci-yml.yml diff --git a/changelogs/unreleased/59293-android-template-is-missing-gitlab-ci-yml.yml b/changelogs/unreleased/59293-android-template-is-missing-gitlab-ci-yml.yml new file mode 100644 index 00000000000..ea559e74a2d --- /dev/null +++ b/changelogs/unreleased/59293-android-template-is-missing-gitlab-ci-yml.yml @@ -0,0 +1,5 @@ +--- +title: Add missing .gitlab-ci.yml to Android template +merge_request: 26415 +author: +type: fixed diff --git a/vendor/project_templates/android.tar.gz b/vendor/project_templates/android.tar.gz index 3df17a0d9a6..277aedaa1ca 100644 Binary files a/vendor/project_templates/android.tar.gz and b/vendor/project_templates/android.tar.gz differ -- cgit v1.2.3