diff options
| author | James Lopez <james@jameslopez.es> | 2016-06-16 14:04:00 +0300 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-06-16 14:04:00 +0300 |
| commit | 778d72664f386dfee45dab171f137395739958f6 (patch) | |
| tree | 7f2c902f4b97ac29aa97e96e877da201130a33b3 /spec/support | |
| parent | 452c076a34cc11cc97f4b1c3113e86ce4367e055 (diff) | |
| parent | c369cc8bf42a680b2b0fc9721a9a7926dc5426f6 (diff) | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export
# Conflicts:
# app/models/ci/pipeline.rb
Diffstat (limited to 'spec/support')
| -rw-r--r-- | spec/support/test_env.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index 71664bb192e..498bd4bf800 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -16,6 +16,7 @@ module TestEnv 'master' => '5937ac0', "'test'" => 'e56497b', 'orphaned-branch' => '45127a9', + 'binary-encoding' => '7b1cf43', } # gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily |