diff options
| author | marmis85 <marmis85@gmail.com> | 2015-01-11 05:07:34 +0100 |
|---|---|---|
| committer | marmis85 <marmis85@gmail.com> | 2015-01-11 05:07:34 +0100 |
| commit | 02adb9ccd605a10984f4af582fcd9b22bfab52d7 (patch) | |
| tree | 3c8c73734916bc27d53c3c40a83e60a97dd44183 | |
| parent | 32233d522f6b4cab90835643b8a3d2e2a890cb64 (diff) | |
| download | gitlab-ce-02adb9ccd605a10984f4af582fcd9b22bfab52d7.tar.gz | |
point to a specific branch in the test repo to avoid conflicts
| -rw-r--r-- | spec/helpers/tree_helper_spec.rb | 2 | ||||
| -rw-r--r-- | spec/support/test_env.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/helpers/tree_helper_spec.rb b/spec/helpers/tree_helper_spec.rb index ad3535a15e6..8aa50c4c778 100644 --- a/spec/helpers/tree_helper_spec.rb +++ b/spec/helpers/tree_helper_spec.rb @@ -6,7 +6,7 @@ describe TreeHelper do before { @repository = project.repository - @commit = project.repository.commit + @commit = project.repository.commit("e56497bb") } context "on a directory containing more than one file/directory" do diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index 2b8f7a945d4..e6db410fb1c 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -10,7 +10,7 @@ module TestEnv 'fix' => '12d65c8', 'improve/awesome' => '5937ac0', 'markdown' => '0ed8c6c', - 'master' => 'e56497b' + 'master' => '5937ac0' } # Test environment |