Merge branch '15521-keepstore-logging'

[arvados.git] / services / api / app / models / user.rb

diff --git a/services/api/app/models/user.rb b/services/api/app/models/user.rb
index 4340d4c0f589028be60d304b1fd83729135bff11..50ecc6b65df04adbf36b9b00e5f34cf985ad26b5 100644 (file)
--- a/services/api/app/models/user.rb
+++ b/services/api/app/models/user.rb
@@ -301,7 +301,7 @@ class User < ArvadosModel
       #
       # If 'self' is a local user, it is okay to transfer
       # authorizations, even if the 'new' user is a remote account,
-      # theq remote site does not gain the ability to access an
+      # because the remote site does not gain the ability to access an
       # account it could not before.
 
       if redirect_to_new_user and self.uuid[0..4] == Rails.configuration.ClusterID
@@ -426,7 +426,7 @@ class User < ArvadosModel
         if !primary_user
           primary_user = user.redirects_to
         elsif primary_user.uuid != user.redirects_to.uuid
-          raise "Ambigious email address, directs to both #{primary_user.uuid} and #{user.redirects_to.uuid}"
+          raise "Ambiguous email address, directs to both #{primary_user.uuid} and #{user.redirects_to.uuid}"
         end
       end
     end