aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2016-08-07 23:41:00 +0200
committerXavier Noria <fxn@hashref.com>2016-08-07 23:41:00 +0200
commitb45c9ca9b6571108242c1dfc3d3e160f56baf025 (patch)
tree831cdef7e70fd26f001aa108daf2365a5fdc8b87 /railties
parentf90ee8ce2733326e9e1bf91426bb401017adb483 (diff)
downloadrails-b45c9ca9b6571108242c1dfc3d3e160f56baf025.tar.gz
rails-b45c9ca9b6571108242c1dfc3d3e160f56baf025.tar.bz2
rails-b45c9ca9b6571108242c1dfc3d3e160f56baf025.zip
revises most Lint/EndAlignment offenses
Some case expressions remain, need to think about those ones.
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/commands/plugin.rb7
-rw-r--r--railties/lib/rails/info.rb6
-rw-r--r--railties/lib/rails/test_unit/testing.rake6
3 files changed, 10 insertions, 9 deletions
diff --git a/railties/lib/rails/commands/plugin.rb b/railties/lib/rails/commands/plugin.rb
index 6404748fca..56413aa7b0 100644
--- a/railties/lib/rails/commands/plugin.rb
+++ b/railties/lib/rails/commands/plugin.rb
@@ -6,9 +6,10 @@ else
customrc = ARGV.index{ |x| x.include?("--rc=") }
railsrc = if customrc
File.expand_path(ARGV.delete_at(customrc).gsub(/--rc=/, ""))
- else
- File.join(File.expand_path("~"), ".railsrc")
- end
+ else
+ File.join(File.expand_path("~"), ".railsrc")
+ end
+
if File.exist?(railsrc)
extra_args_string = File.read(railsrc)
extra_args = extra_args_string.split(/\n+/).flat_map(&:split)
diff --git a/railties/lib/rails/info.rb b/railties/lib/rails/info.rb
index d69cbbc001..5d4acd6f6b 100644
--- a/railties/lib/rails/info.rb
+++ b/railties/lib/rails/info.rb
@@ -43,9 +43,9 @@ module Rails
table << %(<tr><td class="name">#{CGI.escapeHTML(name.to_s)}</td>)
formatted_value = if value.kind_of?(Array)
"<ul>" + value.map { |v| "<li>#{CGI.escapeHTML(v.to_s)}</li>" }.join + "</ul>"
- else
- CGI.escapeHTML(value.to_s)
- end
+ else
+ CGI.escapeHTML(value.to_s)
+ end
table << %(<td class="value">#{formatted_value}</td></tr>)
end
table << "</table>"
diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index 91ff7f4be7..4c157c1262 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -9,9 +9,9 @@ task :test do
$: << "test"
pattern = if ENV.key?("TEST")
ENV["TEST"]
- else
- "test"
- end
+ else
+ "test"
+ end
Minitest.rake_run([pattern])
end