delta/gitlab/gitlab-ce.git/lib/ci, branch feature/github-edit-path

Merge branch 'master' into per-build-token

2016-09-19T11:31:42+00:00

Don't leak build tokens in build logs

2016-09-19T10:38:10+00:00

Fix CI job environment configuration attributes

2016-09-19T08:07:14+00:00

Properly create deployment using all possible options

2016-09-19T08:07:12+00:00

Add new CI configuration entry for the environment

2016-09-19T08:07:12+00:00

Fix most of specs

2016-09-15T13:40:53+00:00

Merge remote-tracking branch 'origin/master' into per-build-token

2016-09-15T11:19:53+00:00

# Conflicts:
#	db/schema.rb

Change response for /ci/api/v1/builds/register.json from 404 to 204

2016-09-13T15:44:18+00:00

Use a permissions of user to access all dependent projects from CI jobs (this also includes a container images, and in future LFS files)

2016-09-13T11:30:26+00:00

Merge branch 'gitlab-workhorse-safeties' into 'master'

2016-09-09T11:33:08+00:00


Security and safety improvements for gitlab-workhorse integration

Companion to https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/60

- Use a custom content type when sending data to gitlab-workhorse
- Verify (using JWT and a shared secret on disk) that internal API requests came from gitlab-workhorse

This will allow us to build features in gitlab-workhorse that require
more trust, and protect us against programming mistakes in the future.

This is designed so that no action is required for installations from
source. For omnibus-gitlab we need to add code that manages the shared
secret.

See merge request !5907