diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-03-21 16:03:26 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-03-25 13:53:52 +0300 |
| commit | f90fa6555b66ae4d58fe6273d9c616f0938f87bc (patch) | |
| tree | 4b107f24758cdc4b79a4a38f296e74ce40fd6556 | |
| parent | 2a4fe8d84f699fd125dbc0f9ee8f304ffdcc641a (diff) | |
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
| -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 |