aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #18129 from ↵Guillermo Iguaran2014-12-212-14/+0
|\ \ \ \ | |/ / / |/| | | | | | | | | | | claudiob/remove-unused-sheep-fixture-from-action-view Remove unused Sheep fixture from AV
| * | | Remove unused Sheep fixture from AVclaudiob2014-12-222-14/+0
|/ / / | | | | | | | | | | | | | | | | | | | | | The `Sheep` fixture was added in eb23754e when moving template tests from actionpack to actionview, but it's not actually used in ActionView tests. The `Sheep` fixture is only used to test `uncountable` in ActiveModel tests, and is already defined in activemodel/test/models/sheep.rb
* | | Merge pull request #18126 from Decagon/patch-1Xavier Noria2014-12-211-1/+1
|\ \ \ | | | | | | | | Remove extra bullet in README.md [ci skip]
| * | | Remove bulletDecagon2014-12-211-1/+1
|/ / /
* | | Merge pull request #18118 from vipulnsward/fix-validation-messageCarlos Antonio da Silva2014-12-211-3/+2
|\ \ \ | | | | | | | | Validation test fixes
| * | | - Fixed unused variableVipul A M2014-12-211-3/+2
| | | | | | | | | | | | | | | | - Changed test to verify complete message instead of verifying if message contains text.
* | | | Merge pull request #18119 from joker1007/add_require_core_ext_hash_to_activejobSean Griffin2014-12-211-0/+2
|\ \ \ \ | |_|/ / |/| | | Add 'require' for Hash#with_indifferent_access to active_job/arguments.rb
| * | | Add 'require' for Hash#with_indifferent_accessjoker10072014-12-211-0/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | ActiveJob::Arguments uses Hash#with_indifferent_access. But, activejob gem does not require Hash extension library. When we use activejob as standalone, we need extra require statement. This is unhandy. This commit fixes it.
* | | Merge pull request #18124 from jonatack/patch-8Abdelkader Boudih2014-12-211-1/+1
|\ \ \ | |/ / |/| | Testing guide grammar fix
| * | Testing guide grammar fixJon Atack2014-12-211-1/+1
|/ / | | | | [skip ci]
* | We will be using the application already created in the Getting Started guide.Zachary Scott2014-12-201-4/+2
| | | | | | | | [ci skip]
* | Merge pull request #18114 from jonatack/patch-8Zachary Scott2014-12-201-1/+1
|\ \ | | | | | | Follow-up to d971021 [skip ci]
| * | Follow-up to d9710212 [skip ci]Jon Atack2014-12-211-1/+1
|/ /
* | Fixture data is accessible by a local method, and not a variable [ci skip]Zachary Scott2014-12-201-2/+2
| |
* | Shorten the explaination of this to fit on one line [ci skip]Zachary Scott2014-12-201-1/+1
| |
* | s/folder/directory [ci skip]Zachary Scott2014-12-201-7/+7
| |
* | "In PostgreSQL, just superusers.." => "In PostgreSQL, only superusers.."Zachary Scott2014-12-201-1/+1
| | | | | | | | [ci skip]
* | Make sure this section is rendered as a `NOTE` and remove redundant sentence.Zachary Scott2014-12-201-5/+1
| | | | | | | | [ci skip]
* | Add note about the association between the two fixture files and how they're ↵Zachary Scott2014-12-201-0/+2
| | | | | | | | | | | | connection. [ci skip]
* | Remove YAML implementation detail, as we're not trying to document all ofZachary Scott2014-12-201-1/+1
| | | | | | | | YAML's behavior in this guide. [ci skip]
* | Remove use of "very" [ci skip]Zachary Scott2014-12-201-1/+1
| |
* | Fix syntax error with RDoc directive,Zachary Scott2014-12-201-1/+1
| | | | | | | | this should be `:nodoc:` in order to be parsed.
* | Merge pull request #18113 from ↵Zachary Scott2014-12-201-1/+1
|\ \ | | | | | | | | | | | | eileencodes/fix-grammar-in-assets-configuring-guide Improve grammar in configuring serve_static_files guide [ci skip]
| * | [ci skip] Improve grammar in configuring serve_static_files guideeileencodes2014-12-201-1/+1
| | |
* | | Describe the mailer and helpers directories which are generated by `rails new`.Zachary Scott2014-12-201-1/+1
|/ / | | | | | | [ci skip]
* | Update comment regarding test environment with help from @matthewd [ci skip]Zachary Scott2014-12-201-1/+3
| |
* | Fixed syntax error in RDoc directiveZachary Scott2014-12-201-1/+1
| |
* | Merge pull request #18092 from nippysaurus/clarity_batch_starting_pointArthur Nogueira Neves2014-12-201-2/+2
|\ \ | | | | | | Update description for `start` parameter.
| * | Clarity start parameterMichael Dawson2014-12-191-2/+2
| | | | | | | | | | | | | | | | | | I find that `Specifies the starting point for the batch processing.` does not give enough information for me to understand what this parameter actually does.
* | | Renaming the autoloading guide [ci skip]Vijay Dev2014-12-201-0/+0
| | | | | | | | | | | | | | | The term 'constant autoloading' can be mistakenly construed as 'constantly autoloading'.
* | | pass over the autoloading guide [ci skip]Vijay Dev2014-12-201-8/+8
| | |
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-12-209-7/+181
|\ \ \
| * | | Add docs for ActionDispatch::Http::URL methodsclaudiob2014-12-181-0/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs for `extract_domain`, `extract_subdomains`, `extract_subdomain`. Add doc examples for `url`, `protocol`, `raw_host_with_port`, `host`, `host_with_port`, `port`, `standard_port`, `standard_port?`, `optional_port`, `port_string`. [ci skip]
| * | | Add docs for Numeric time-related methodsclaudiob2014-12-171-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs for `minutes`, `hours`, `days`, `weeks` and `fortnights`. Fix docs for `in_milliseconds`. [ci skip]
| * | | Replace `#=>` with `# =>` [ci skip]claudiob2014-12-177-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | @rafaelfranca suggested in f7c7bcd9 that code examples should display the result after `# =>` and not after `#=>`. This commit replaces *all* the occurrences of `#=>` in the code documentation (mostly added by me :sob:) with the suggested `# =>`.
| * | | Add docs for Numeric#*_bytes methodsclaudiob2014-12-171-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs for `kilobytes`, `megabytes`, `gigabytes`, `terabytes`, `petabytes` and `exabytes`. Fix docs for `bytes`. [ci skip]
| * | | Add docs for Time#find_zoneclaudiob2014-12-171-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | Also improves docs for `Time#find_zone!` [ci skip]
| * | | Fix docs for AS::Notifications::Event#durationclaudiob2014-12-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stems from comments by @zzak on e07f3dd: * https://github.com/rails/docrails/commit/e07f3ddcac394d2a8dc23fc571318b7e8c2497b1#commitcomment-9015634 * https://github.com/rails/docrails/commit/e07f3ddcac394d2a8dc23fc571318b7e8c2497b1#commitcomment-9015639 [ci skip]
| * | | Add docs for AS::Notifications::Event#durationclaudiob2014-12-171-0/+12
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge pull request #18110 from claudiob/point-guide-to-masterYves Senn2014-12-201-1/+1
|\ \ \ \ | | | | | | | | | | Replace guides.ror.org/v4.2.0 with guides.ror.org
| * | | | Replace guides.ror.org/v4.2.0 with guides.ror.orgclaudiob2014-12-201-1/+1
|/ / / / | | | | | | | | | | | | | | | | No need to point links to http://guides.rubyonrails.org/v4.2.0/... now that the Ruby on Rails guides point to 4.2.0.
* | | | Merge pull request #18108 from kryzhovnik/fix_autoloading_guideAbdelkader Boudih2014-12-201-1/+1
|\ \ \ \ | | | | | | | | | | Fix link in autoloading guide
| * | | | Fix link in autoloading guideAndrey Samsonov2014-12-201-1/+1
|/ / / / | | | | | | | | | | | | [ci skip]
* | | | activejob needs to be built before actionmailerGodfrey Chan2014-12-191-1/+1
| | | |
* | | | Merge pull request #18104 from andreynering/guides-dslXavier Noria2014-12-201-2/+3
|\ \ \ \ | | | | | | | | | | Add link for Domain-Specific Language [ci skip]
| * | | | Add link for Domain-Specific Language [ci skip]Andrey Nering2014-12-191-2/+3
| | |_|/ | |/| |
* | | | prefer single quotes, by the beard of the prophet!Xavier Noria2014-12-201-10/+10
| | | |
* | | | Merge pull request #18103 from tpope/portable-setupXavier Noria2014-12-201-7/+9
|\ \ \ \ | | | | | | | | | | Make bin/setup portable
| * | | | Make bin/setup portableTim Pope2014-12-191-7/+9
| |/ / /
* / / / Merge pull request #18102 from arthurnn/nodoc_constantArthur Nogueira Neves2014-12-192-0/+3
|/ / / | | | | | | | | | Add nodoc to some constants [skip ci]