aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-07-12 03:58:17 -0300
committerGitHub <noreply@github.com>2016-07-12 03:58:17 -0300
commit3df3d80ade705dd096ec481845ff0fc2d70427b0 (patch)
treefbbc8c3ad540d0ff60ca09d2caca7a3149263759 /activerecord/lib
parent2afd5e78b842a84e401a030bc747bf60879863e2 (diff)
parentd8575289a2d278ae8866cb7cddf38d8f2e9dc010 (diff)
downloadrails-3df3d80ade705dd096ec481845ff0fc2d70427b0.tar.gz
rails-3df3d80ade705dd096ec481845ff0fc2d70427b0.tar.bz2
rails-3df3d80ade705dd096ec481845ff0fc2d70427b0.zip
Merge pull request #25794 from mechanicles/rails-to-Rails
rails -> Rails [ci skip]
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb2
-rw-r--r--activerecord/lib/active_record/railtie.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
index eb2268157b..3384012c49 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
@@ -159,7 +159,7 @@ module ActiveRecord
end
# Returns 62. SQLite supports index names up to 64
- # characters. The rest is used by rails internally to perform
+ # characters. The rest is used by Rails internally to perform
# temporary rename operations
def allowed_index_name_length
index_name_length - 2
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb
index 98ea425d16..2c0ca62924 100644
--- a/activerecord/lib/active_record/railtie.rb
+++ b/activerecord/lib/active_record/railtie.rb
@@ -3,7 +3,7 @@ require "rails"
require "active_model/railtie"
# For now, action_controller must always be present with
-# rails, so let's make sure that it gets required before
+# Rails, so let's make sure that it gets required before
# here. This is needed for correctly setting up the middleware.
# In the future, this might become an optional require.
require "action_controller/railtie"