summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Koronen <koronen@kth.se>2015-08-08 16:47:25 +0200
committerVictor Koronen <koronen@kth.se>2015-08-14 12:29:44 +0200
commitca272b8f02d847ae897b7c1b87d3e3614d400f74 (patch)
treebaaa325146e02776503429a3c2935a944ea3bdad
parent83acfe3b45e48b7ba7c092ba5955157f2f47a847 (diff)
downloadbundler-ca272b8f02d847ae897b7c1b87d3e3614d400f74.tar.gz
Fix Style/MultilineIfThen
-rw-r--r--.rubocop_todo.yml5
-rw-r--r--lib/bundler/lazy_specification.rb2
-rw-r--r--lib/bundler/remote_specification.rb2
3 files changed, 2 insertions, 7 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index b559ba9f2c..240fddb882 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -242,11 +242,6 @@ Style/MultilineBlockChain:
Style/MultilineBlockLayout:
Enabled: false
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/MultilineIfThen:
- Enabled: false
-
# Offense count: 13
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
diff --git a/lib/bundler/lazy_specification.rb b/lib/bundler/lazy_specification.rb
index 43d9dc993d..f0efbc448f 100644
--- a/lib/bundler/lazy_specification.rb
+++ b/lib/bundler/lazy_specification.rb
@@ -19,7 +19,7 @@ module Bundler
end
def full_name
- if platform == Gem::Platform::RUBY or platform.nil? then
+ if platform == Gem::Platform::RUBY or platform.nil?
"#{@name}-#{@version}"
else
"#{@name}-#{@version}-#{platform}"
diff --git a/lib/bundler/remote_specification.rb b/lib/bundler/remote_specification.rb
index 5a32bd2435..3050c37371 100644
--- a/lib/bundler/remote_specification.rb
+++ b/lib/bundler/remote_specification.rb
@@ -27,7 +27,7 @@ module Bundler
end
def full_name
- if platform == Gem::Platform::RUBY or platform.nil? then
+ if platform == Gem::Platform::RUBY or platform.nil?
"#{@name}-#{@version}"
else
"#{@name}-#{@version}-#{platform}"