Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
760f827b
Commit
760f827b
authored
Mar 22, 2014
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove code that does nothing
ping @karlhungus
parent
fa340595
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
4 deletions
+1
-4
lib/gitlab/satellite/satellite.rb
lib/gitlab/satellite/satellite.rb
+0
-1
spec/support/test_env.rb
spec/support/test_env.rb
+1
-3
No files found.
lib/gitlab/satellite/satellite.rb
View file @
760f827b
...
@@ -24,7 +24,6 @@ module Gitlab
...
@@ -24,7 +24,6 @@ module Gitlab
def
clear_and_update!
def
clear_and_update!
raise
SatelliteNotExistError
unless
exists?
raise
SatelliteNotExistError
unless
exists?
File
.
exists?
path
@repo
=
nil
@repo
=
nil
clear_working_dir!
clear_working_dir!
delete_heads!
delete_heads!
...
...
spec/support/test_env.rb
View file @
760f827b
...
@@ -29,7 +29,6 @@ module TestEnv
...
@@ -29,7 +29,6 @@ module TestEnv
disable_mailer
if
opts
[
:mailer
]
==
false
disable_mailer
if
opts
[
:mailer
]
==
false
setup_stubs
setup_stubs
clear_test_repo_dir
if
opts
[
:init_repos
]
==
true
clear_test_repo_dir
if
opts
[
:init_repos
]
==
true
setup_test_repos
(
opts
)
if
opts
[
:repos
]
==
true
setup_test_repos
(
opts
)
if
opts
[
:repos
]
==
true
end
end
...
@@ -165,8 +164,7 @@ module TestEnv
...
@@ -165,8 +164,7 @@ module TestEnv
def
clear_test_repo_dir
def
clear_test_repo_dir
setup_stubs
setup_stubs
# Use tmp dir for FS manipulations
repos_path
=
testing_path
()
# Remove tmp/test-git-base-path
# Remove tmp/test-git-base-path
FileUtils
.
rm_rf
Gitlab
.
config
.
gitlab_shell
.
repos_path
FileUtils
.
rm_rf
Gitlab
.
config
.
gitlab_shell
.
repos_path
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment