rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \|	guides, bring back minitest assertion table. [ci skip]	Yves Senn	2015-04-28	1	-3/+43
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails has different naming conventions for the inverse assertion methods. While minitest uses `refute` we use `_not`. We should have a table listing the common assertions that you want to use in the Rails context. Refs #18305.
* \| \|	Small punctuation fixes [ci skip]	Alexey Markov	2015-04-27	1	-7/+7
\| \| \|
* \| \|	Minor edits to the "Action View Overview" guide	Robin Dupret	2015-04-25	1	-18/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Follow-up to #19672 and 8b0aa0c1. [ci skip]
* \| \|	Merge pull request #19236 from sshaw/more_tagged_logging_docs	Yves Senn	2015-04-24	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|	More docs on tagged logging [ci skip]
\| * \|	More docs on tagged logging [ci skip]	sshaw	2015-03-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mention that tags can also come from a Proc that accepts the request object or something's to_s method
* \| \|	Fix find_each options [ci skip]	Alexey Markov	2015-04-22	1	-2/+2
\| \| \|
* \| \|	Merge pull request #19779 from ↵	Zachary Scott	2015-04-21	1	-13/+20
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	jonatack/improve-contributing-to-ruby-on-rails-guide Improve the Contributing to Rails Guide [skip ci]
\| * \| \|	Improve the Contributing to Rails Guide [skip ci]	Jon Atack	2015-04-16	1	-13/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	First commit: This PR improves the "4.12 Commit Your Changes" section of the Contributing to Ruby on Rails Guide: - Fix formatting of the commit message example - Improve readability and clarity - Fix grammar - Wrap lines See the before and after images below in this PR. ----- Second commit: - Rewrite to remove the word "buffer" [skip ci]
* \| \| \|	update Ruby required version in Getting Started guide [ci skip]	yuuji.yaginuma	2015-04-22	1	-1/+1
\| \| \| \|
* \| \| \|	[ci skip] Update `current version of Ruby`	yui-knk	2015-04-21	1	-1/+1
\| \| \| \|
* \| \| \|	[ci skip] Fix linked html file	yui-knk	2015-04-21	1	-1/+1
\| \| \| \|
* \| \| \|	capitalize title	Xavier Noria	2015-04-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	According to the guidelines: http://guides.rubyonrails.org/ruby_on_rails_guides_guidelines.html#headings References #19821.
* \| \| \|	correct link to Generic template [ci skip]	yuuji.yaginuma	2015-04-20	1	-1/+1
\| \| \| \|
* \| \| \|	Consistency: Rails master -> edge Rails [ci skip]	Godfrey Chan	2015-04-20	1	-1/+1
\| \| \| \|
* \| \| \|	Fix typos in contributing guide [ci skip]	Godfrey Chan	2015-04-19	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* includes -> include * "on your computer" is implied
* \| \| \|	Better explain the bug report templates [ci skip]	Godfrey Chan	2015-04-19	1	-9/+13
\| \| \| \|
* \| \| \|	Update 4_2_release_notes.md	Tony Pitale	2015-04-19	1	-3/+2
\| \| \| \|
* \| \| \|	Merge pull request #19799 from yui-knk/fix/wrap_doc2	Arthur Nogueira Neves	2015-04-19	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	[ci skip] Fix docs and guide about 'Array.wrap'
\| * \| \| \|	[ci skip] Fix docs and guide about 'Array.wrap'	yui-knk	2015-04-19	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	Merge pull request #19812 from piton4eg/patch-1	Robin Dupret	2015-04-19	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update association_basics.md [ci skip]
\| * \| \| \| \|	Update association_basics.md	Markov Alexey	2015-04-19	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Spell out "asynchronously" instead of async in guides [ci skip]	Prathamesh Sonpatki	2015-04-19	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #19806 from vircung/master	Yves Senn	2015-04-18	1	-0/+23
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve documentation for uuid [ci skip]
\| * \| \| \| \|	Improve documentation [ci skip]	Jacek Nakonieczny	2015-04-18	1	-0/+25
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add information about usage `uuid` type with `reference`
* / / / /	[ci skip] Replace `list` with `array`	yui-knk	2015-04-18	1	-1/+1
\|/ / / /
* \| \| \|	[ci skip] Update code example of Enumerable#without	yui-knk	2015-04-17	1	-1/+1
\| \| \| \|
* \| \| \|	add active job testing section [ci skip]	David Fernandez	2015-04-16	1	-0/+7
\|/ / /
* \| \|	Correct small typo.	Hank Beaver	2015-04-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	* files are written to hard "disk" not "disc".
* \| \|	Fix typos and improve the documentation	Jon Atack	2015-04-15	7	-22/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a squash of the following commits, from first to last: - Fix minor, random things I’ve come across lately that individually did not seem worth making a PR for, so I saved them for one commit. One common error is using “it’s” (which is an abbreviation of “it is”) when the possessive “its” should be used for indicating possession. - Changes include the name of a test, so remove the `[skip ci]` (thanks @senny). - Line wrap the changes at 80 chars and add one more doc fix. - Add a missing line wrap in the Contributing to Ruby on Rails Guide. - Line wrap the `TIP` section in the Contributing to Ruby on Rails Guide as well. Rendering the guide locally with `bundle exec rake guides:generate` did not show any change in on-screen formatting after adding the line wrap. The HTML generated is (extra line added to illustrate where the line wrap takes place): <div class="info"><p>Please squash your commits into a single commit when appropriate. This simplifies future cherry picks and also keeps the git log clean.</p></div> - Squash commits.
* \| \|	Merge pull request #19446 from ↵	Zachary Scott	2015-04-14	1	-4/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	andersonDadario/fix_security_guide_captcha_03_21_2015 Fix security guide captcha 03 21 2015 [ci skip]
\| * \| \|	[ci skip] Fix for Security Guide - Captcha Section	Anderson Dadario	2015-03-22	1	-4/+6
\| \| \| \|
* \| \| \|	Removing GZip section since Sprockets 3.0 no longer create .gz files [ci skip]	Andrey Nering	2015-04-14	1	-35/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- https://github.com/rails/sprockets/commit/14b3b2eddac4699c64c051888e3801732b9a4418 - https://github.com/rails/sprockets/issues/26
* \| \| \|	Merge pull request #19753 from jonatack/use-ruby-2-2-2	Guillermo Iguaran	2015-04-13	2	-3/+3
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|	Upgrade to Ruby 2.2.2
\| * \| \|	Upgrade to Ruby 2.2.2	Jon Atack	2015-04-14	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and fix the grammar in the ruby_version_check.rb user message.
* \| \| \|	Merge branch 'master' of github.com:rails/docrails	Vijay Dev	2015-04-14	5	-46/+32
\|\ \ \ \
\| * \| \| \|	[ci skip] add missing file extension	Mikhail Dieterle	2015-04-10	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	[ci skip] format rake output	Mikhail Dieterle	2015-04-10	1	-5/+3
\| \| \| \| \|
\| * \| \| \|	[ci skip] fix helper name	Mikhail Dieterle	2015-04-10	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	[ci skip] Wrap with double quotation	yui-knk	2015-04-10	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	[ci skip] Remove unnecessary lines	yui-knk	2015-04-01	1	-2/+0
\| \| \| \| \|
\| * \| \| \|	[ci skip] Add `:`	yui-knk	2015-04-01	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	No need to mention unit tests in testing guide anymore	Kir Shatrov	2015-03-31	1	-2/+0
\| \| \| \| \|
\| * \| \| \|	New test runner syntax in testing guide	Kir Shatrov	2015-03-31	1	-4/+4
\| \| \| \| \|
\| * \| \| \|	Suggest new hash syntax in testing guide	Kir Shatrov	2015-03-31	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Don't suggest `bin/rails test controllers`	Kir Shatrov	2015-03-31	1	-1/+0
\| \| \| \| \|
\| * \| \| \|	Add missing "of" to testing guide.	Hendy Tanata	2015-03-30	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'kirs'	Matthew Draper	2015-03-30	1	-30/+23
\| \|\ \ \ \
\| \| * \| \| \|	Switch to `bin/rails test` in testing guide	Kir Shatrov	2015-03-30	1	-30/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rails/rails#18305
* \| \| \| \| \|	Merge pull request #19742 from vngrs/config_autoload_paths_wrong_doc	Carlos Antonio da Silva	2015-04-13	1	-3/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the wrong documentation about config.autoload_paths [ci skip]
\| * \| \| \| \| \|	Fix the wrong documentation about config.autoload_paths [ci skip]	Mehmet Emin İNAÇ	2015-04-13	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	config.autoload_paths is not changeable from environment specific configuration files.