diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb index 949a39960405e45b9799381c0bd8eb211c007157..31d25377b767256b2503b32ae5db86a5f5348229 100644 --- 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 16f8d9f225b54347504b80fa149fcd3aad36a98b..fefd2594880a3d3662f79cf811b42c0f4e40c969 100644 --- 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 17c0392c384ec038300abb2f7826279047d01b5e..8d19e1b8b0b4ba3b8cc45001d5f5890224c09f34 100644 --- 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 fe450899b6ff2b2afa59bdbf779185d3e02ade8b..858a638c7be5a7fdbd4c7b4e763429c32d4629c8 100644 --- 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