Skip to content

Commit 001bcd8

Browse files
committed
Merge pull request #1608 from will-in-wi/rubocop_align_parameters
Enable AlignParameters cop
2 parents 3ec9e86 + 57fadc8 commit 001bcd8

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

.rubocop.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ Style/BlockDelimiters:
4141
Enabled: false
4242
Style/ConditionalAssignment:
4343
Enabled: false
44-
Style/AlignParameters:
45-
Enabled: false
4644
Style/IfUnlessModifier:
4745
Enabled: false
4846
Style/Lambda:

lib/capistrano/dsl.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ def sudo(*args)
2929

3030
def revision_log_message
3131
fetch(:revision_log_message,
32-
t(:revision_log_message,
33-
:branch => fetch(:branch),
34-
:user => local_user,
35-
:sha => fetch(:current_revision),
36-
:release => fetch(:release_timestamp))
32+
t(:revision_log_message,
33+
:branch => fetch(:branch),
34+
:user => local_user,
35+
:sha => fetch(:current_revision),
36+
:release => fetch(:release_timestamp))
3737
)
3838
end
3939

lib/capistrano/tasks/deploy.rake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,8 @@ namespace :deploy do
177177
last_release_path = releases_path.join(last_release)
178178
if test "[ `readlink #{current_path}` != #{last_release_path} ]"
179179
execute :tar, "-czf",
180-
deploy_path.join("rolled-back-release-#{last_release}.tar.gz"),
181-
last_release_path
180+
deploy_path.join("rolled-back-release-#{last_release}.tar.gz"),
181+
last_release_path
182182
execute :rm, "-rf", last_release_path
183183
else
184184
debug "Last release is the current release, skip cleanup_rollback."

spec/support/Vagrantfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Vagrant.configure("2") do |config|
1313
vagrantkey = open("https://raw.githubusercontent.com/mitchellh/vagrant/master/keys/vagrant.pub", "r",&:read)
1414

1515
primary.vm.provision :shell,
16-
:inline => <<-INLINE
16+
:inline => <<-INLINE
1717
install -d -m 700 /root/.ssh
1818
echo -e "#{vagrantkey}" > /root/.ssh/authorized_keys
1919
chmod 0600 /root/.ssh/authorized_keys

0 commit comments

Comments
 (0)