diff --git a/modules/swagger-codegen/src/main/resources/ruby/api.mustache b/modules/swagger-codegen/src/main/resources/ruby/api.mustache
index 62d9ac0165a..6514f2c1b75 100644
--- a/modules/swagger-codegen/src/main/resources/ruby/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/ruby/api.mustache
@@ -12,10 +12,10 @@ class {{classname}}
 {{#operation}}
 {{newline}}
   # {{summary}}
-  # {{notes}}{{newLine}}
-{{#allParams}}{{^optional}}{{newLine}}  # @param {{paramName}} {{description}}
-{{/optional}}{{/allParams}}{{#allParams}}{{#optional}}{{newLine}}  # @option opts [{{dataType}}] :{{baseName}} {{description}}
-{{/optional}}{{/allParams}}  # @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}{{newLine}}
+  # {{notes}}
+{{#allParams}}{{^optional}}  # @param {{paramName}} {{description}}
+{{/optional}}{{/allParams}}{{#allParams}}{{#optional}}  # @option opts [{{dataType}}] :{{baseName}} {{description}}
+{{/optional}}{{/allParams}}  # @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
   def self.{{nickname}} ({{#allParams}}{{paramName}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}, {{/allParams}}opts={})
     query_param_keys = [{{#queryParams}}:{{paramName}}{{#hasMore}},{{/hasMore}}{{/queryParams}}]
 
@@ -61,10 +61,10 @@ class {{classname}}
         post_body = array
       else 
         if body.respond_to?("to_body".to_sym)
-	        post_body = body.to_body
-	      else
-	        post_body = body
-	      end
+          post_body = body.to_body
+        else
+          post_body = body
+        end
       end
     end
     {{/bodyParam}}
diff --git a/samples/client/petstore/ruby/lib/pet_api.rb b/samples/client/petstore/ruby/lib/pet_api.rb
index a254ad8edfb..771536c9248 100644
--- a/samples/client/petstore/ruby/lib/pet_api.rb
+++ b/samples/client/petstore/ruby/lib/pet_api.rb
@@ -52,10 +52,10 @@ class PetApi
         post_body = array
       else 
         if body.respond_to?("to_body".to_sym)
-	        post_body = body.to_body
-	      else
-	        post_body = body
-	      end
+          post_body = body.to_body
+        else
+          post_body = body
+        end
       end
     end
     
@@ -112,10 +112,10 @@ class PetApi
         post_body = array
       else 
         if body.respond_to?("to_body".to_sym)
-	        post_body = body.to_body
-	      else
-	        post_body = body
-	      end
+          post_body = body.to_body
+        else
+          post_body = body
+        end
       end
     end
     
diff --git a/samples/client/petstore/ruby/lib/store_api.rb b/samples/client/petstore/ruby/lib/store_api.rb
index cc93b0edd02..0d438576ecd 100644
--- a/samples/client/petstore/ruby/lib/store_api.rb
+++ b/samples/client/petstore/ruby/lib/store_api.rb
@@ -92,10 +92,10 @@ class StoreApi
         post_body = array
       else 
         if body.respond_to?("to_body".to_sym)
-	        post_body = body.to_body
-	      else
-	        post_body = body
-	      end
+          post_body = body.to_body
+        else
+          post_body = body
+        end
       end
     end
     
diff --git a/samples/client/petstore/ruby/lib/user_api.rb b/samples/client/petstore/ruby/lib/user_api.rb
index 3bb359674cf..64aeb210f60 100644
--- a/samples/client/petstore/ruby/lib/user_api.rb
+++ b/samples/client/petstore/ruby/lib/user_api.rb
@@ -52,10 +52,10 @@ class UserApi
         post_body = array
       else 
         if body.respond_to?("to_body".to_sym)
-	        post_body = body.to_body
-	      else
-	        post_body = body
-	      end
+          post_body = body.to_body
+        else
+          post_body = body
+        end
       end
     end
     
@@ -112,10 +112,10 @@ class UserApi
         post_body = array
       else 
         if body.respond_to?("to_body".to_sym)
-	        post_body = body.to_body
-	      else
-	        post_body = body
-	      end
+          post_body = body.to_body
+        else
+          post_body = body
+        end
       end
     end
     
@@ -172,10 +172,10 @@ class UserApi
         post_body = array
       else 
         if body.respond_to?("to_body".to_sym)
-	        post_body = body.to_body
-	      else
-	        post_body = body
-	      end
+          post_body = body.to_body
+        else
+          post_body = body
+        end
       end
     end
     
@@ -358,10 +358,10 @@ class UserApi
         post_body = array
       else 
         if body.respond_to?("to_body".to_sym)
-	        post_body = body.to_body
-	      else
-	        post_body = body
-	      end
+          post_body = body.to_body
+        else
+          post_body = body
+        end
       end
     end