diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-08-26 17:47:18 -0700 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-08-26 17:47:18 -0700 |
| commit | 6afd69f4445cc0688aa1695389eb3f79033e3121 (patch) | |
| tree | 729b58c8a0a7013e4166dca05e2e68adfe274a1d /config | |
| parent | 046b28312704f3131e72dcd2dbdacc5264d4aa62 (diff) | |
| download | gitlab-ce-6afd69f4445cc0688aa1695389eb3f79033e3121.tar.gz | |
Update gitignore, change literal DB table names, fix errors, fix fontawesome
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab_ci.yml | 19 | ||||
| -rw-r--r-- | config/secrets.yml | 3 |
2 files changed, 0 insertions, 22 deletions
diff --git a/config/gitlab_ci.yml b/config/gitlab_ci.yml deleted file mode 100644 index 03a86307f40..00000000000 --- a/config/gitlab_ci.yml +++ /dev/null @@ -1,19 +0,0 @@ -development: - gitlab_server: - url: 'http://gitlab.dev' - app_id: 'cfda7ec2551af42d06acc6dbda9087dbdc8d45b7e2bc240f498fad3f84ff4044' - app_secret: 'd1802d55db9c1aedc950812a9489e2659fa1430dc488babde949bc9c409cc01b' - - gitlab_ci: - host: 'http://ci.gitlab.dev' - port: 80 - https: false -test: - gitlab_server: - url: 'http://demo.gitlab.com/' - app_id: '' - app_secret: '' - gitlab_ci: - host: localhost - port: 80 - https: false diff --git a/config/secrets.yml b/config/secrets.yml deleted file mode 100644 index f63c74d0688..00000000000 --- a/config/secrets.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -development: - db_key_base: 53ab5c413f37a5a87df3c7e55dc49924793c44b9a40834af258f75ce3cc71067478b7c1f999bf22d9cfb9e6dedffda989dc462684f8c869705f735a92b7230ed |