Use simple render syntax in controllers

diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index 949a399..31d2537 100644 (file)
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -25,7 +25,7 @@ class Admin::GroupsController < Admin::ApplicationController
     if @group.save
       redirect_to [:admin, @group], notice: 'Group was successfully created.'
     else
-      render action: "new"
+      render "new"
     end
   end
 
@@ -40,7 +40,7 @@ class Admin::GroupsController < Admin::ApplicationController
     if @group.update_attributes(group_params)
       redirect_to [:admin, @group], notice: 'Group was successfully updated.'
     else
-      render action: "edit"
+      render "edit"
     end
   end
 

diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 16f8d9f..fefd259 100644 (file)
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -53,7 +53,7 @@ class Admin::UsersController < Admin::ApplicationController
         format.html { redirect_to [:admin, @admin_user], notice: 'User was successfully created.' }
         format.json { render json: @admin_user, status: :created, location: @admin_user }
       else
-        format.html { render action: "new" }
+        format.html { render "new" }
         format.json { render json: @admin_user.errors, status: :unprocessable_entity }
       end
     end
@@ -76,7 +76,7 @@ class Admin::UsersController < Admin::ApplicationController
       else
         # restore username to keep form action url.
         admin_user.username = params[:id]
-        format.html { render action: "edit" }
+        format.html { render "edit" }
         format.json { render json: admin_user.errors, status: :unprocessable_entity }
       end
     end

diff --git a/app/controllers/merge_requests_controller.rb b/app/controllers/merge_requests_controller.rb
index 17c0392..8d19e1b 100644 (file)
--- a/app/controllers/merge_requests_controller.rb
+++ b/app/controllers/merge_requests_controller.rb
@@ -54,7 +54,7 @@ class MergeRequestsController < ProjectResourceController
       @merge_request.reload_code
       redirect_to [@project, @merge_request], notice: 'Merge request was successfully created.'
     else
-      render action: "new"
+      render "new"
     end
   end
 
@@ -64,7 +64,7 @@ class MergeRequestsController < ProjectResourceController
       @merge_request.mark_as_unchecked
       redirect_to [@project, @merge_request], notice: 'Merge request was successfully updated.'
     else
-      render action: "edit"
+      render "edit"
     end
   end
 

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index fe45089..858a638 100644 (file)
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -27,7 +27,7 @@ class ProjectsController < ProjectResourceController
         if @project.saved?
           redirect_to @project
         else
-          render action: "new"
+          render "new"
         end
       end
       format.js
@@ -43,7 +43,7 @@ class ProjectsController < ProjectResourceController
         format.html { redirect_to edit_project_path(@project), notice: 'Project was successfully updated.' }
         format.js
       else
-        format.html { render action: "edit", layout: "project_settings" }
+        format.html { render "edit", layout: "project_settings" }
         format.js
       end
     end
@@ -90,7 +90,7 @@ class ProjectsController < ProjectResourceController
           redirect_to(@forked_project, notice: 'Project was successfully forked.')
         else
           @title = 'Fork project'
-          render action: "fork"
+          render "fork"
         end
       end
       format.js