From b566c4ba1a4b44044154b54e33f1fa45fc5b1e90 Mon Sep 17 00:00:00 2001
From: saltycrys <73420320+saltycrys@users.noreply.github.com>
Date: Thu, 10 Dec 2020 08:18:30 +0100
Subject: Untrack config.yml (#1557)

* Untrack config.yml

`config/config.yml` has been untracked and moved to `config/config.example.yml`.

The Dockerfile has been updated to copy all `config/config.*` files and to try
to move `config/config.example.yml` to `config/config.yml`. If a user supplied
`config/config.yml` exists it is not overwritten.

* Update Dockerfile to use `shard.lock`

* Fix tests
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 3bbfccf0..1779a73d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /.vscode/
 /invidious
 /sentry
+/config/config.yml
-- 
cgit v1.2.3