diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-01-23 16:47:54 +0400 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-01-23 19:00:39 +0400 |
| commit | d819d0d1f84946bcc0d2c871682c220db6dbd478 (patch) | |
| tree | 0ec267ecad9634c68223473f8acff4797e7db430 /spec | |
| parent | 3bcfdf07cd81408105cb912ceb64532688e1e9cd (diff) | |
Use the correct paths.
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/lib/gitlab/satellite/merge_action_spec.rb | 2 | ||||
| -rw-r--r-- | spec/seed_project.tar.gz | bin | 9825908 -> 9833961 bytes |
2 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/satellite/merge_action_spec.rb b/spec/lib/gitlab/satellite/merge_action_spec.rb index d2f026f96e8..e144b7c43d1 100644 --- a/spec/lib/gitlab/satellite/merge_action_spec.rb +++ b/spec/lib/gitlab/satellite/merge_action_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe 'Gitlab::Satellite::MergeAction' do before(:each) do - @master = ['master', 'b1e6a9dbf1c85e6616497a5e7bad9143a4bd0828'] + @master = ['master', '69b34b7e9ad9f496f0ad10250be37d6265a03bba'] @one_after_stable = ['stable', '6ea87c47f0f8a24ae031c3fff17bc913889ecd00'] #this commit sha is one after stable @wiki_branch = ['wiki', '635d3e09b72232b6e92a38de6cc184147e5bcb41'] #this is the commit sha where the wiki branch goes off from master @conflicting_metior = ['metior', '313d96e42b313a0af5ab50fa233bf43e27118b3f'] #this branch conflicts with the wiki branch diff --git a/spec/seed_project.tar.gz b/spec/seed_project.tar.gz Binary files differindex a2daf383277..ee8c3f23c70 100644 --- a/spec/seed_project.tar.gz +++ b/spec/seed_project.tar.gz |