summaryrefslogtreecommitdiff
path: root/app/controllers/admin/users_controller.rb
diff options
context:
space:
mode:
authorJohannes Schleifenbaum <johannes@js-webcoding.de>2013-07-29 12:46:00 +0200
committerJohannes Schleifenbaum <johannes@js-webcoding.de>2013-07-29 12:47:06 +0200
commitcd19f82e5126e087ea6ef3b1bc3307bb74efacbd (patch)
tree83c0eeabeedec6a14262bcf0edc776adf5ef332d /app/controllers/admin/users_controller.rb
parent5e0e97ec5dd963a33a6522b0095a15abf987d6e0 (diff)
downloadgitlab-ce-cd19f82e5126e087ea6ef3b1bc3307bb74efacbd.tar.gz
Fix typos
Diffstat (limited to 'app/controllers/admin/users_controller.rb')
-rw-r--r--app/controllers/admin/users_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 62b9fe08091..7703ae8b249 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -24,7 +24,7 @@ class Admin::UsersController < Admin::ApplicationController
if user.block
redirect_to :back, alert: "Successfully blocked"
else
- redirect_to :back, alert: "Error occured. User was not blocked"
+ redirect_to :back, alert: "Error occurred. User was not blocked"
end
end
@@ -32,7 +32,7 @@ class Admin::UsersController < Admin::ApplicationController
if user.activate
redirect_to :back, alert: "Successfully unblocked"
else
- redirect_to :back, alert: "Error occured. User was not unblocked"
+ redirect_to :back, alert: "Error occurred. User was not unblocked"
end
end