about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
authorluzpaz <luzpaz@users.noreply.github.com>2018-09-13 18:53:09 -0400
committerEugen Rochko <eugen@zeonfederated.com>2018-09-14 00:53:09 +0200
commit40dd19be37852d4442a924c2a74bcbbfbf57e054 (patch)
treee47f0e5fbf2fa08db31583c0566c14c715daaf2e /config
parent4959ead07c56be120fd00b10c5da4f9db0bb1ea1 (diff)
Misc. typos (#8694)
Found via `codespell -q 3 --skip="./app/javascript/mastodon/locales,./config/locales"`
Diffstat (limited to 'config')
-rw-r--r--config/environments/test.rb2
-rw-r--r--config/initializers/simple_form.rb2
-rw-r--r--config/initializers/twitter_regex.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 1c1891561..a35cadcfa 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -23,7 +23,7 @@ Rails.application.configure do
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # The default store, file_store is shared by processses parallely executed
+  # The default store, file_store is shared by processes parallelly executed
   # and should not be used.
   config.cache_store = :memory_store
 
diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb
index 5983918cd..e413cdb44 100644
--- a/config/initializers/simple_form.rb
+++ b/config/initializers/simple_form.rb
@@ -116,7 +116,7 @@ SimpleForm.setup do |config|
   # You can define the class to use on all labels. Default is nil.
   # config.label_class = nil
 
-  # You can define the default class to be used on forms. Can be overriden
+  # You can define the default class to be used on forms. Can be overridden
   # with `html: { :class }`. Defaulting to none.
   # config.default_form_class = nil
 
diff --git a/config/initializers/twitter_regex.rb b/config/initializers/twitter_regex.rb
index c227f92d3..76b23f416 100644
--- a/config/initializers/twitter_regex.rb
+++ b/config/initializers/twitter_regex.rb
@@ -28,7 +28,7 @@ module Twitter
     )/iox
     REGEXEN[:valid_url] = %r{
       (                                                                                     #   $1 total match
-        (#{REGEXEN[:valid_url_preceding_chars]})                                            #   $2 Preceeding chracter
+        (#{REGEXEN[:valid_url_preceding_chars]})                                            #   $2 Preceding character
         (                                                                                   #   $3 URL
           ((https?|dat|dweb|ipfs|ipns|ssb|gopher):\/\/)?                                    #   $4 Protocol (optional)
           (#{REGEXEN[:valid_domain]})                                                       #   $5 Domain(s)