Commit 760f827ba0257d6664f429a832d1962fcac6e58e
1 parent
fa340595
Exists in
spb-stable
and in
3 other branches
Remove code that does nothing
ping @karlhungus
Showing
2 changed files
with
1 additions
and
4 deletions
Show diff stats
lib/gitlab/satellite/satellite.rb
| @@ -24,7 +24,6 @@ module Gitlab | @@ -24,7 +24,6 @@ module Gitlab | ||
| 24 | def clear_and_update! | 24 | def clear_and_update! |
| 25 | raise SatelliteNotExistError unless exists? | 25 | raise SatelliteNotExistError unless exists? |
| 26 | 26 | ||
| 27 | - File.exists? path | ||
| 28 | @repo = nil | 27 | @repo = nil |
| 29 | clear_working_dir! | 28 | clear_working_dir! |
| 30 | delete_heads! | 29 | delete_heads! |
spec/support/test_env.rb
| @@ -29,7 +29,6 @@ module TestEnv | @@ -29,7 +29,6 @@ module TestEnv | ||
| 29 | disable_mailer if opts[:mailer] == false | 29 | disable_mailer if opts[:mailer] == false |
| 30 | setup_stubs | 30 | setup_stubs |
| 31 | 31 | ||
| 32 | - | ||
| 33 | clear_test_repo_dir if opts[:init_repos] == true | 32 | clear_test_repo_dir if opts[:init_repos] == true |
| 34 | setup_test_repos(opts) if opts[:repos] == true | 33 | setup_test_repos(opts) if opts[:repos] == true |
| 35 | end | 34 | end |
| @@ -165,8 +164,7 @@ module TestEnv | @@ -165,8 +164,7 @@ module TestEnv | ||
| 165 | 164 | ||
| 166 | def clear_test_repo_dir | 165 | def clear_test_repo_dir |
| 167 | setup_stubs | 166 | setup_stubs |
| 168 | - # Use tmp dir for FS manipulations | ||
| 169 | - repos_path = testing_path() | 167 | + |
| 170 | # Remove tmp/test-git-base-path | 168 | # Remove tmp/test-git-base-path |
| 171 | FileUtils.rm_rf Gitlab.config.gitlab_shell.repos_path | 169 | FileUtils.rm_rf Gitlab.config.gitlab_shell.repos_path |
| 172 | 170 |