summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Lenny <jason@gitlab.com>2019-03-21 13:03:25 +0000
committerNick Thomas <nick@gitlab.com>2019-03-21 13:03:25 +0000
commitf1404d42009595770a69037688d06c009fcd14f1 (patch)
treefd5daf23cbe7aaf22fe00934a1faa41bd3e08125
parent22fbf7345b1df67b6f169d9ca664723867be5ae7 (diff)
downloadgitlab-ce-f1404d42009595770a69037688d06c009fcd14f1.tar.gz
Resolve "Android template is missing .gitlab-ci.yml"
-rw-r--r--changelogs/unreleased/59293-android-template-is-missing-gitlab-ci-yml.yml5
-rw-r--r--vendor/project_templates/android.tar.gzbin132152 -> 132592 bytes
2 files changed, 5 insertions, 0 deletions
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
--- a/vendor/project_templates/android.tar.gz
+++ b/vendor/project_templates/android.tar.gz
Binary files differ