summaryrefslogtreecommitdiff
path: root/lib/gitlab/satellite/satellite.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-02 20:36:54 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-02 20:36:54 -0800
commite89058268118e3b2be4ebaf5d7bf2c684b590437 (patch)
tree94f7b8986ebc3ae2a7c75ed9457628371f97a14b /lib/gitlab/satellite/satellite.rb
parent84a5a548a5e1377f34b7989fc546eaedf86c3510 (diff)
downloadgitlab-ce-e89058268118e3b2be4ebaf5d7bf2c684b590437.tar.gz
Rubocop enabled for: Use spaces inside hash literal braces
Diffstat (limited to 'lib/gitlab/satellite/satellite.rb')
-rw-r--r--lib/gitlab/satellite/satellite.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/satellite/satellite.rb b/lib/gitlab/satellite/satellite.rb
index 1de84309d15..62d1bb364d3 100644
--- a/lib/gitlab/satellite/satellite.rb
+++ b/lib/gitlab/satellite/satellite.rb
@@ -98,13 +98,13 @@ module Gitlab
if heads.include? PARKING_BRANCH
repo.git.checkout({}, PARKING_BRANCH)
else
- repo.git.checkout(default_options({b: true}), PARKING_BRANCH)
+ repo.git.checkout(default_options({ b: true }), PARKING_BRANCH)
end
# remove the parking branch from the list of heads ...
heads.delete(PARKING_BRANCH)
# ... and delete all others
- heads.each { |head| repo.git.branch(default_options({D: true}), head) }
+ heads.each { |head| repo.git.branch(default_options({ D: true }), head) }
end
# Deletes all remotes except origin
@@ -126,7 +126,7 @@ module Gitlab
end
def default_options(options = {})
- {raise: true, timeout: true}.merge(options)
+ { raise: true, timeout: true }.merge(options)
end
# Create directory for storing