diff options
author | Douwe Maan <douwe@selenight.nl> | 2016-07-29 01:57:42 +0300 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2016-07-29 01:57:42 +0300 |
commit | ce1843b7dea3b63cfced7800612098a766c68e13 (patch) | |
tree | 3340c4b5aca30047c2e22986c15f355bf3f845fe /vendor | |
parent | 8b1a2e4d0b635c6040cd7e4a7a5870ffae516cb0 (diff) | |
parent | b9b0c0283a001010370741c2683e2fe400bf7599 (diff) |
Merge branch 'master' into diff-line-comment-vuejs
# Conflicts:
# db/schema.rb
Diffstat (limited to 'vendor')
-rw-r--r-- | vendor/gitlab-ci-yml/Elixir.gitlab-ci.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vendor/gitlab-ci-yml/Elixir.gitlab-ci.yml b/vendor/gitlab-ci-yml/Elixir.gitlab-ci.yml index 0b329aaf1c4..00f9541e89b 100644 --- a/vendor/gitlab-ci-yml/Elixir.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/Elixir.gitlab-ci.yml @@ -2,7 +2,7 @@ # The image already has Hex installed. You might want to consider to use `elixir:latest` image: trenpixster/elixir:latest -# Pic zero or more services to be used on all builds. +# Pick zero or more services to be used on all builds. # Only needed when using a docker container to run your tests in. # Check out: http://docs.gitlab.com/ce/ci/docker/using_docker_images.html#what-is-service services: |