kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

OS X -> macOS [Closes #30313]

Browse source 
[Jon Moss & Xavier Noria]
This commit is contained in:
Xavier Noria 2018-06-23 08:46:40 +02:00
parent 484f970c6c
commit 96d2c228e3
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
activerecord/test/cases/adapters/postgresql/connection_test.rb
View file

@ -151,7 +151,7 @@ module ActiveRecord
# When prompted, restart the PostgreSQL server with the # When prompted, restart the PostgreSQL server with the
# "-m fast" option or kill the individual connection assuming # "-m fast" option or kill the individual connection assuming
# you know the incantation to do that. # you know the incantation to do that.
# To restart PostgreSQL 9.1 on OS X, installed via MacPorts, ... # To restart PostgreSQL 9.1 on macOS, installed via MacPorts, ...
# sudo su postgres -c "pg_ctl restart -D /opt/local/var/db/postgresql91/defaultdb/ -m fast" # sudo su postgres -c "pg_ctl restart -D /opt/local/var/db/postgresql91/defaultdb/ -m fast"
def test_reconnection_after_actual_disconnection_with_verify def test_reconnection_after_actual_disconnection_with_verify
original_connection_pid = @connection.query("select pg_backend_pid()") original_connection_pid = @connection.query("select pg_backend_pid()")

4
guides/source/command_line.md
View file

@ -633,9 +633,9 @@ $ cat config/database.yml
# #
# Install the pg driver: # Install the pg driver:
# gem install pg # gem install pg
# On OS X with Homebrew: # On macOS with Homebrew:
# gem install pg -- --with-pg-config=/usr/local/bin/pg_config # gem install pg -- --with-pg-config=/usr/local/bin/pg_config
# On OS X with MacPorts: # On macOS with MacPorts:
# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config # gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
# On Windows: # On Windows:
# gem install pg # gem install pg

4
railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml.tt
View file

@ -2,9 +2,9 @@
# #
# Install the pg driver: # Install the pg driver:
# gem install pg # gem install pg
# On OS X with Homebrew: # On macOS with Homebrew:
# gem install pg -- --with-pg-config=/usr/local/bin/pg_config # gem install pg -- --with-pg-config=/usr/local/bin/pg_config
# On OS X with MacPorts: # On macOS with MacPorts:
# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config # gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
# On Windows: # On Windows:
# gem install pg # gem install pg

2
railties/test/app_loader_test.rb
View file

@ -76,7 +76,7 @@ class AppLoaderTest < ActiveSupport::TestCase
# Compare the realpath in case either of them has symlinks. # Compare the realpath in case either of them has symlinks.
# #
# This happens in particular in Mac OS X, where @tmp starts # This happens in particular in macOS, where @tmp starts
# with "/var", and Dir.pwd with "/private/var", due to a # with "/var", and Dir.pwd with "/private/var", due to a
# default system symlink var -> private/var. # default system symlink var -> private/var.
assert_equal File.realpath("#@tmp/foo"), File.realpath(Dir.pwd) assert_equal File.realpath("#@tmp/foo"), File.realpath(Dir.pwd)