From 631a2d977016df28ccf15f894f78ccaf3dfef913 Mon Sep 17 00:00:00 2001 From: Prathamesh Sonpatki Date: Wed, 21 Aug 2013 11:41:08 +0530 Subject: Moved "`mod_expires` to be enabled" to new line. - Right now the comment was not rendering properly. # The Expires* directives requires the Apache module `mod_expires` to be # enabled. - After this change - # The Expires* directives requires the Apache module # `mod_expires` to be enabled. --- guides/source/asset_pipeline.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'guides') diff --git a/guides/source/asset_pipeline.md b/guides/source/asset_pipeline.md index 862742679c..d5f193ff06 100644 --- a/guides/source/asset_pipeline.md +++ b/guides/source/asset_pipeline.md @@ -760,8 +760,8 @@ headers. For Apache: ```apache -# The Expires* directives requires the Apache module `mod_expires` to be -# enabled. +# The Expires* directives requires the Apache module +# `mod_expires` to be enabled. # Use of ETag is discouraged when Last-Modified is present Header unset ETag FileETag None -- cgit v1.2.3 From ae54e41824011692106fe7a27dc0991a6342096d Mon Sep 17 00:00:00 2001 From: wangjohn Date: Wed, 21 Aug 2013 16:34:36 -0400 Subject: Removing merge conflict remnants in the guides. --- guides/source/development_dependencies_install.md | 6 ------ 1 file changed, 6 deletions(-) (limited to 'guides') diff --git a/guides/source/development_dependencies_install.md b/guides/source/development_dependencies_install.md index 034fef71c8..42340cc2b4 100644 --- a/guides/source/development_dependencies_install.md +++ b/guides/source/development_dependencies_install.md @@ -86,7 +86,6 @@ And if you are on Fedora or CentOS, you're done with $ sudo yum install sqlite3 sqlite3-devel ``` -<<<<<<< HEAD If you are on Arch Linux, you will need to run: ```bash @@ -101,8 +100,6 @@ For FreeBSD users, you're done with: Or compile the `databases/sqlite3` port. -======= ->>>>>>> ec8ef1e1055c4e1598da13f49d30261f07f4a9b4 Get a recent version of [Bundler](http://gembundler.com/) ```bash @@ -169,7 +166,6 @@ $ sudo yum install mysql-server mysql-devel $ sudo yum install postgresql-server postgresql-devel ``` -<<<<<<< HEAD If you are running Arch Linux, MySQL isn't supported anymore so you will need to use MariaDB instead (see [this announcement](https://www.archlinux.org/news/mariadb-replaces-mysql-in-repositories/)): @@ -189,8 +185,6 @@ Or install them through ports (they are located under the `databases` folder). If you run into troubles during the installation of MySQL, please see [the MySQL documentation](http://dev.mysql.com/doc/refman/5.1/en/freebsd-installation.html). -======= ->>>>>>> ec8ef1e1055c4e1598da13f49d30261f07f4a9b4 After that, run: ```bash -- cgit v1.2.3 From de2043ade69508070fbc80a6eb4f7d5bce58ca76 Mon Sep 17 00:00:00 2001 From: wangjohn Date: Wed, 21 Aug 2013 18:00:47 -0500 Subject: Document ability to run a single test. --- guides/source/development_dependencies_install.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'guides') diff --git a/guides/source/development_dependencies_install.md b/guides/source/development_dependencies_install.md index 42340cc2b4..a5016b6ea8 100644 --- a/guides/source/development_dependencies_install.md +++ b/guides/source/development_dependencies_install.md @@ -133,13 +133,20 @@ $ cd railties $ TEST_DIR=generators bundle exec rake test ``` -You can run any single test separately too: +You can run the tests for a particular file by using: ```bash $ cd actionpack $ bundle exec ruby -Itest test/template/form_helper_test.rb ``` +Or, you can run a single test in a particular file: + +```bash +$ cd actionpack +$ bundle exec ruby -Itest path/to/test.rb -n test_name +``` + ### Active Record Setup The test suite of Active Record attempts to run four times: once for SQLite3, once for each of the two MySQL gems (`mysql` and `mysql2`), and once for PostgreSQL. We are going to see now how to set up the environment for them. -- cgit v1.2.3 From d4863f30de023d0f6817afcddc114889493e6d3c Mon Sep 17 00:00:00 2001 From: Jay Hayes Date: Thu, 29 Aug 2013 11:12:57 -0500 Subject: Note functional equivalence in reset task --- guides/source/migrations.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'guides') diff --git a/guides/source/migrations.md b/guides/source/migrations.md index 6100fc89c8..55bb89bd71 100644 --- a/guides/source/migrations.md +++ b/guides/source/migrations.md @@ -694,8 +694,8 @@ version to migrate to. ### Resetting the Database -The `rake db:reset` task will drop the database, recreate it and load the -current schema into it. +The `rake db:reset` task will drop the database and set it up again. This is +functionally eqivalent to `rake db:drop db:setup` NOTE: This is not the same as running all the migrations. It will only use the contents of the current schema.rb file. If a migration can't be rolled back, -- cgit v1.2.3 From 5f08154230f69a8aee88d72e09fe088bf728f506 Mon Sep 17 00:00:00 2001 From: Jay Hayes Date: Thu, 29 Aug 2013 11:18:07 -0500 Subject: Add documentation for rake db:setup task --- guides/source/migrations.md | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'guides') diff --git a/guides/source/migrations.md b/guides/source/migrations.md index 55bb89bd71..d154dae752 100644 --- a/guides/source/migrations.md +++ b/guides/source/migrations.md @@ -692,6 +692,11 @@ Neither of these Rake tasks do anything you could not do with `db:migrate`. They are simply more convenient, since you do not need to explicitly specify the version to migrate to. +### Setup the Database + +The `rake db:setup` task will create the database, load the schema and initialize +it with seed data. + ### Resetting the Database The `rake db:reset` task will drop the database and set it up again. This is -- cgit v1.2.3 From 3bcecf8258d6b63ded2714672f92ad767423e41f Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Fri, 30 Aug 2013 01:10:30 -0300 Subject: Fix typos [ci skip] --- guides/source/migrations.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'guides') diff --git a/guides/source/migrations.md b/guides/source/migrations.md index d154dae752..414ce46a4e 100644 --- a/guides/source/migrations.md +++ b/guides/source/migrations.md @@ -695,12 +695,12 @@ version to migrate to. ### Setup the Database The `rake db:setup` task will create the database, load the schema and initialize -it with seed data. +it with the seed data. ### Resetting the Database The `rake db:reset` task will drop the database and set it up again. This is -functionally eqivalent to `rake db:drop db:setup` +functionally equivalent to `rake db:drop db:setup`. NOTE: This is not the same as running all the migrations. It will only use the contents of the current schema.rb file. If a migration can't be rolled back, -- cgit v1.2.3