From 4867893431a00c47537c9f4657283db34a1d0be4 Mon Sep 17 00:00:00 2001
From: Laust Rud Jacobsen <laust@object.io>
Date: Sun, 15 Nov 2015 18:43:28 +0100
Subject: [PATCH] Rubocop: fix more guarded methods

---
 .rubocop.yml                          |  2 +-
 app/controllers/deploys_controller.rb | 18 +++++++++---------
 app/helpers/apps_helper.rb            | 18 +++++++++---------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index b8a0a72..14f1f7c 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -24,7 +24,7 @@ Style/IndentationConsistency:
   EnforcedStyle: rails
 
 Style/GuardClause:
-  MinBodyLength: 10
+  MinBodyLength: 6
 
 Style/AccessModifierIndentation:
   EnforcedStyle: outdent
diff --git a/app/controllers/deploys_controller.rb b/app/controllers/deploys_controller.rb
index 3a22d0d..2301396 100644
--- a/app/controllers/deploys_controller.rb
+++ b/app/controllers/deploys_controller.rb
@@ -19,15 +19,15 @@ class DeploysController < ApplicationController
 private
 
   def default_deploy
-    if params[:deploy]
-      {
-        username:    params[:deploy][:local_username],
-        environment: params[:deploy][:rails_env],
-        repository:  params[:deploy][:scm_repository],
-        revision:    params[:deploy][:scm_revision],
-        message:     params[:deploy][:message]
-      }
-    end
+    return if params[:deploy].blank?
+
+    {
+      username:    params[:deploy][:local_username],
+      environment: params[:deploy][:rails_env],
+      repository:  params[:deploy][:scm_repository],
+      revision:    params[:deploy][:scm_revision],
+      message:     params[:deploy][:message]
+    }
   end
 
   # handle Heroku's HTTP post deployhook format
diff --git a/app/helpers/apps_helper.rb b/app/helpers/apps_helper.rb
index e4f975c..5ca2e2c 100644
--- a/app/helpers/apps_helper.rb
+++ b/app/helpers/apps_helper.rb
@@ -1,14 +1,14 @@
 module AppsHelper
   def link_to_copy_attributes_from_other_app
-    if App.count > 1
-      html =  link_to('copy settings from another app', '#',
-        class: 'button copy_config')
-      html << select("duplicate", "app",
-        App.all.asc(:name).reject { |a| a == @app }.
-        collect { |p| [p.name, p.id] }, { include_blank: "[choose app]" },
-        class: "choose_other_app", style: "display: none;")
-      return html
-    end
+    return if App.count <= 1
+
+    html = link_to('copy settings from another app', '#',
+      class: 'button copy_config')
+    html << select("duplicate", "app",
+      App.all.asc(:name).reject { |a| a == @app }.
+      collect { |p| [p.name, p.id] }, { include_blank: "[choose app]" },
+      class: "choose_other_app", style: "display: none;")
+    html
   end
 
   def any_github_repos?
--
libgit2 0.21.2