Kamil Trzcinski 842f0a3401 Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2 ...

# Conflicts:
#	features/steps/shared/builds.rb
#	spec/requests/ci/api/builds_spec.rb

2016-06-06 11:21:39 +02:00

..

api

Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2

2016-06-06 11:21:39 +02:00

ci/api

Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2

2016-06-06 11:21:39 +02:00

jwt_controller_spec.rb

Fix the CI login to Container Registry (the gitlab-ci-token user)

2016-05-23 00:34:51 +02:00