aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Improve documentation [ci skip]Jacek Nakonieczny2015-04-181-0/+25
| | | | Add information about usage `uuid` type with `reference`
* Merge pull request #19802 from sikachu/add-missing-requireRafael Mendonça França2015-04-171-0/+1
|\ | | | | Add missing require for String#strip_heredoc
| * Add missing require for String#strip_heredocPrem Sichanugrist2015-04-171-0/+1
|/ | | | | | This method is being used in `#xml_http_request`, but was not properly required. This causes `NoMethodError` on projects that are doing integration test.
* Merge pull request #19800 from yui-knk/fix/wrap_doc3Abdelkader Boudih2015-04-172-2/+2
|\ | | | | [ci skip] Replace `list` with `array`
| * [ci skip] Replace `list` with `array`yui-knk2015-04-182-2/+2
|/
* Merge pull request #19795 from yui-knk/fix/without_guideAbdelkader Boudih2015-04-171-1/+1
|\ | | | | [ci skip] Update code example of Enumerable#without
| * [ci skip] Update code example of Enumerable#withoutyui-knk2015-04-171-1/+1
|/
* Merge pull request #19780 from 10io/active_job_testingAbdelkader Boudih2015-04-161-0/+7
|\ | | | | add active job testing section [ci skip]
| * add active job testing section [ci skip]David Fernandez2015-04-161-0/+7
|/
* Merge pull request #19778 from thenickcox/commands_docsRichard Schneeman2015-04-161-0/+11
|\ | | | | [ci skip] Document running a rake command as a rails command
| * [ci skip] Document running a rake command as a rails commandNick Cox2015-04-151-0/+11
|/
* Merge pull request #19775 from vngrs/fix_typo_asser_urlAbdelkader Boudih2015-04-151-6/+6
|\ | | | | fix typo asser url [ci skip]
| * fix typo asser url [ci skip]Mehmet Emin İNAÇ2015-04-161-6/+6
|/
* Merge pull request #19774 from davydovanton/doc-update-asser-urlAbdelkader Boudih2015-04-151-0/+30
|\ | | | | [Skip ci] Add information about :host options
| * [Skip ci] Add information about :host optionsAnton Davydov2015-04-161-0/+30
| | | | | | | | | | | | Added informations about :host options for each url helper (#javascript_url, #video_url, #stylesheet_url, etc) based on #asser_url method.
* | Merge pull request #19766 from blasterpal/small_typo_in_asset_pipelineRafael Mendonça França2015-04-151-1/+1
|\ \ | | | | | | Correct small typo.
| * | Correct small typo.Hank Beaver2015-04-151-1/+1
| | | | | | | | | | | | * files are written to hard "disk" not "disc".
* | | Merge pull request #19765 from y-yagi/fix_typo_in_form_builderKasper Timm Hansen2015-04-151-1/+1
|\ \ \ | |/ / |/| | remove extra `=` in form builder example [ci skip]
| * | remove extra `=` in form builder example [ci skip]yuuji.yaginuma2015-04-151-1/+1
|/ /
* | Merge pull request #19763 from jonatack/fix-typos-in-docsYves Senn2015-04-1511-29/+55
|\ \ | | | | | | Fix typos and improve the documentation
| * | Fix typos and improve the documentationJon Atack2015-04-1511-29/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Revert "Merge pull request #19755 from yuki24/activerecord/support-for-set"Yves Senn2015-04-153-15/+0
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 524d40591eaa2f4d007409bfad386f6b107492eb, reversing changes made to 34d3a6095100245283861ef480a54d0643bbee4c. Reasoning behind the revert are in the PR discussion: https://github.com/rails/rails/pull/19755 - This means that types can no longer cast to/from `Set`, and reasonably work with `where` (we already have this problem for `array`/`json` types on pg) - This adds precedent for every other `Enumerable`, and we can't target `Enumerable` directly. - Calling `to_a` on a `Set` is reasonable.
* | Merge pull request #19446 from ↵Zachary Scott2015-04-141-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 SectionAnderson Dadario2015-03-221-4/+6
| | |
* | | Merge pull request #19757 from Strech/http-auth-realm-unquotingArthur Nogueira Neves2015-04-141-2/+2
|\ \ \ | | | | | | | | Tiny optimization of http auth Realm unquoting
| * | | Tiny optimization of http auth Realm unquotingStrech (Sergey Fedorov)2015-04-141-2/+2
| | | |
* | | | Merge pull request #19752 from yuki24/use-prepend-rather-than-aliasCarlos Antonio da Silva2015-04-142-42/+36
|\ \ \ \ | | | | | | | | | | Use #prepend rather than using 2 aliases
| * | | | Use #prepend rather than using 2 aliasesYuki Nishijima2015-04-142-42/+36
| | | | |
* | | | | Enable Active Job integration tests againRafael Mendonça França2015-04-141-1/+0
| | | | |
* | | | | avoid double initialization error caused to sidekiqTakumi IINO2015-04-141-13/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sidekiq::CLI#boot_system require "#{dummy_app_path}/config/environment.rb". But this file has already been required in'test/support/integration/helper.rb'. This patch will change to use Sidekiq::Launcher directly.
* | | | | Merge pull request #19758 from andreynering/remove-gzip-docRafael Mendonça França2015-04-141-35/+0
|\ \ \ \ \ | | | | | | | | | | | | Removing GZip section since Sprockets 3.0 no longer create .gz files
| * | | | | Removing GZip section since Sprockets 3.0 no longer create .gz files [ci skip]Andrey Nering2015-04-141-35/+0
| | |/ / / | |/| | | | | | | | | | | | | | | | | | - https://github.com/rails/sprockets/commit/14b3b2eddac4699c64c051888e3801732b9a4418 - https://github.com/rails/sprockets/issues/26
* | | | | Fix typos in the documentation [ci skip]Rafael Mendonça França2015-04-141-1/+1
| | | | |
* | | | | Merge pull request #19736 from kmcphillips/masterRafael Mendonça França2015-04-1410-1/+129
|\ \ \ \ \ | |/ / / / |/| | | | Set default form builder for a controller
| * | | | Override default form builder for a controllerKevin McPhillips2015-04-1310-1/+129
| | | | |
* | | | | Use `silence_warnings` on `StaticTests`eileencodes2015-04-141-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When 7e504927 was merged setting `Encoding.default_internal` and `Encoding.default_external` would throw a warning when the ActionPack tests were run. Example warning: `actionpack/test/dispatch/static_test.rb:12: warning: setting Encoding.default_external` This patch silences the warnings as other similar tests do for setting default_internal and default_external.
* | | | | Merge pull request #19751 from y-yagi/fix_indent_of_controllerAndrew White2015-04-142-4/+7
|\ \ \ \ \ | | | | | | | | | | | | fix indent in routes when using namespaced controllers
| * | | | | fix indent in routes when using namespaced controllersyuuji.yaginuma2015-04-142-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: namespace :foo do namespace :bar do get 'baz/index' end end After: namespace :foo do namespace :bar do get 'baz/index' end end
* | | | | | Merge pull request #19755 from yuki24/activerecord/support-for-setYves Senn2015-04-143-0/+15
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | Add support for Set to Relation#where
| * | | | | Add support for Set to Relation#whereYuki Nishijima2015-04-133-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously `#where` used to treat `Set`objects as nil, but now it treats them as an array: set = Set.new([1, 2]) Author.where(:id => set) # => SELECT "authors".* FROM "authors" WHERE "authors"."id" IN (1, 2)
* | | | | | Merge pull request #19754 from yuki24/ruby-2.2.2-on-travisGuillermo Iguaran2015-04-131-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use Ruby 2.2.2 on travis
| * | | | | | Use Ruby 2.2.2 on travisYuki Nishijima2015-04-131-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | This is required to run https://github.com/rails/rails/pull/19752 successfully.
* | | | | | Merge pull request #19753 from jonatack/use-ruby-2-2-2Guillermo Iguaran2015-04-1312-15/+15
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Upgrade to Ruby 2.2.2
| * | | | | Upgrade to Ruby 2.2.2Jon Atack2015-04-1412-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | and fix the grammar in the ruby_version_check.rb user message.
* | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-04-147-48/+34
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | [ci skip] add missing file extensionMikhail Dieterle2015-04-101-1/+1
| | | | | |
| * | | | | [ci skip] format rake outputMikhail Dieterle2015-04-101-5/+3
| | | | | |
| * | | | | [ci skip] fix helper nameMikhail Dieterle2015-04-101-1/+1
| | | | | |
| * | | | | [ci skip] Wrap with double quotationyui-knk2015-04-101-1/+1
| | | | | |
| * | | | | [ci skip] Add `,`yui-knk2015-04-081-1/+1
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 06:52:51 +0000