diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-11-10 15:28:03 +0000 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-11-10 19:12:36 +0000 |
| commit | ef4c8782af0bd3a7b95c46abd686f4477bf23087 (patch) | |
| tree | 5b385c491d7222e727d7cfdba35a2639d989bca1 | |
| parent | d3bdb260e57dd244aa1df5c429bfbbcd95cf0958 (diff) | |
| download | gitlab-ce-ef4c8782af0bd3a7b95c46abd686f4477bf23087.tar.gz | |
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 913c0bf52226d952edee1cd43559fbb1e03dd338)
a2bf79c9 Update templates for 10.2
| -rw-r--r-- | vendor/gitignore/Android.gitignore | 2 | ||||
| -rw-r--r-- | vendor/gitignore/Perl.gitignore | 2 | ||||
| -rw-r--r-- | vendor/gitlab-ci-yml/Crystal.gitlab-ci.yml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/vendor/gitignore/Android.gitignore b/vendor/gitignore/Android.gitignore index c79ba5080a3..addf405e4f5 100644 --- 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 diff --git a/vendor/gitignore/Perl.gitignore b/vendor/gitignore/Perl.gitignore index 9bf1537f6ae..ecf66f84291 100644 --- 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 diff --git a/vendor/gitlab-ci-yml/Crystal.gitlab-ci.yml b/vendor/gitlab-ci-yml/Crystal.gitlab-ci.yml index 02cfab3a5b2..36386a19fdc 100644 --- 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 |