summaryrefslogtreecommitdiffstats
path: root/app/controllers
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2017-04-02 03:34:44 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2017-04-02 03:34:44 +0000
commit6139e0033a0435f526f16b5df9b1e597402d3377 (patch)
tree2863f34c452528dfa9104d614970b7c6220d8434 /app/controllers
parentadce697d9964be3092b358ea5fc10b399964cb19 (diff)
downloadredmine-6139e0033a0435f526f16b5df9b1e597402d3377.tar.gz
redmine-6139e0033a0435f526f16b5df9b1e597402d3377.zip
spelling fixes (#25495)
git-svn-id: http://svn.redmine.org/redmine/trunk@16445 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/account_controller.rb2
-rw-r--r--app/controllers/application_controller.rb2
-rw-r--r--app/controllers/comments_controller.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index f98603270..6bd7e02f5 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -42,7 +42,7 @@ class AccountController < ApplicationController
authenticate_user
end
rescue AuthSourceException => e
- logger.error "An error occured when authenticating #{params[:username]}: #{e.message}"
+ logger.error "An error occurred when authenticating #{params[:username]}: #{e.message}"
render_error :message => e.message
end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 73e332617..d3f549e46 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -646,7 +646,7 @@ class ApplicationController < ActionController::Base
render_error "An error occurred while executing the query and has been logged. Please report this error to your Redmine administrator."
end
- # Renders a 200 response for successfull updates or deletions via the API
+ # Renders a 200 response for successful updates or deletions via the API
def render_api_ok
render_api_head :ok
end
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 9544caa1d..20cde9463 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -43,7 +43,7 @@ class CommentsController < ApplicationController
private
# ApplicationController's find_model_object sets it based on the controller
- # name so it needs to be overriden and set to @news instead
+ # name so it needs to be overridden and set to @news instead
def find_model_object
super
@news = @object