Merge branch 'winh-templates-10-2' into 'master'

Update templates for 10.2 See merge request gitlab-org/gitlab-ce!15317 (cherry picked from commit 913c0bf5) a2bf79c9 Update templates for 10.2

Merge branch 'winh-templates-10-2' into 'master'
ef4c8782 · Oswaldo Ferreira · d3bdb260 · ef4c8782 · ef4c8782 · ef4c8782
Commit ef4c8782 authored Nov 10, 2017 by Oswaldo Ferreira
Showing with 3 additions and 3 deletions

Android.gitignore vendor/gitignore/Android.gitignore +1 -1

Perl.gitignore vendor/gitignore/Perl.gitignore +1 -1

Crystal.gitlab-ci.yml vendor/gitlab-ci-yml/Crystal.gitlab-ci.yml +1 -1

No files found.
--- a/vendor/gitignore/Android.gitignore
+++ b/vendor/gitignore/Android.gitignore
@@ -32,7 +32,7 @@ proguard/
 # Android Studio captures folder
 captures/

-# Intellij
+# IntelliJ
 *.iml
 .idea/workspace.xml
 .idea/tasks.xml

--- a/vendor/gitignore/Perl.gitignore
+++ b/vendor/gitignore/Perl.gitignore
@@ -24,7 +24,7 @@ Build.bat
 # Module::Install
 inc/

-# ExtUitls::MakeMaker
+# ExtUtils::MakeMaker
 /blib/
 /_eumm/
 /*.gz

--- a/vendor/gitlab-ci-yml/Crystal.gitlab-ci.yml
+++ b/vendor/gitlab-ci-yml/Crystal.gitlab-ci.yml
@@ -16,7 +16,7 @@ image: "crystallang/crystal:latest"
 # Cache shards in between builds
 cache:
  paths:
-    - libs
+    - lib

 # This is a basic example for a shard or script which doesn't use
 # services such as redis or postgres