diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-03-21 13:03:26 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-03-21 13:04:09 +0000 |
| commit | 9dc79382adc5005ca3553b4ab211e4fd72754976 (patch) | |
| tree | 97685ca6901929dbfca720ce4b5d83c833b10d14 | |
| parent | 91b769dba1ac24923c5a55a1dd0ebde35aa8ce5b (diff) | |
| download | gitlab-ce-11-9-stable-prepare-rc11.tar.gz | |
Merge branch '59293-android-template-is-missing-gitlab-ci-yml' into 'master'11-9-stable-prepare-rc11
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
| -rw-r--r-- | changelogs/unreleased/59293-android-template-is-missing-gitlab-ci-yml.yml | 5 | ||||
| -rw-r--r-- | vendor/project_templates/android.tar.gz | bin | 132152 -> 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 Binary files differindex 3df17a0d9a6..277aedaa1ca 100644 --- a/vendor/project_templates/android.tar.gz +++ b/vendor/project_templates/android.tar.gz |