aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | |
| * | | | [ci skip] Remove unnecessary linesyui-knk2015-04-011-2/+0
| | | | |
| * | | | [ci skip] Add `:`yui-knk2015-04-011-1/+1
| | | | |
| * | | | No need to mention unit tests in testing guide anymoreKir Shatrov2015-03-311-2/+0
| | | | |
| * | | | New test runner syntax in testing guideKir Shatrov2015-03-311-4/+4
| | | | |
| * | | | Suggest new hash syntax in testing guideKir Shatrov2015-03-311-2/+2
| | | | |
| * | | | [ci skip] Remove unnecessary `>`yui-knk2015-03-311-1/+1
| | | | |
| * | | | Don't suggest `bin/rails test controllers`Kir Shatrov2015-03-311-1/+0
| | | | |
| * | | | Add missing "of" to testing guide.Hendy Tanata2015-03-301-1/+1
| | | | |
| * | | | Merge branch 'kirs'Matthew Draper2015-03-301-30/+23
| |\ \ \ \
| | * | | | Switch to `bin/rails test` in testing guideKir Shatrov2015-03-301-30/+23
| | | | | | | | | | | | | | | | | | rails/rails#18305
* | | | | | Merge pull request #19742 from vngrs/config_autoload_paths_wrong_docCarlos Antonio da Silva2015-04-131-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-131-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | config.autoload_paths is not changeable from environment specific configuration files.
* | | | | | | Improve note about unique index and foreign key on has_one associationCarlos Antonio da Silva2015-04-131-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Related to f1af967e0055a33c45071848a049ff342e9c291e. [ci skip]
* | | | | | | Merge pull request #19741 from greysteil/add-note-about-partial-index-supportYves Senn2015-04-131-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Document that partial indexes are only supported by Postgres and SQLite.
| * | | | | | | Document that partial indexes are only supported by Postgres and SQLite.Grey Baker2015-04-132-0/+8
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Fixes #18106
* | | | | | | Merge branch 'feature/doc_request_forgery_protection_for_api'Zachary Scott2015-04-121-7/+17
|\ \ \ \ \ \ \
| * | | | | | | Add note regarding CSRF for APIs, as a use-case for skipping it [ci skip]Zachary Scott2015-04-121-0/+4
| | | | | | | |
| * | | | | | | Apply comments from @jeremy regarding why HTML and Javascript requestsZachary Scott2015-04-121-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | specifically are checked for CSRF, when dealing with the browser. [ci skip]
| * | | | | | | update request_forgery_protection docs [ci skip]Vladimir Lyzo2015-04-121-7/+8
|/ / / / / / /
* | | | | | | Add a note regarding add_column restricted API [ci skip]Zachary Scott2015-04-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should document current behavior, and this is design of API for now. Closes #17597
* | | | | | | Merge branch 'master' of github.com:rails/railsZachary Scott2015-04-123-31/+3
|\ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 10:34:27 +0000