yui-knk
4563062e72
[ci skip] Update code example of Enumerable#without
2015-04-17 19:58:13 +09:00
Abdelkader Boudih
c8bab30ce5
Merge pull request #19780 from 10io/active_job_testing
...
add active job testing section [ci skip]
2015-04-16 07:55:23 +01:00
David Fernandez
e87ad3c003
add active job testing section [ci skip]
2015-04-16 08:46:12 +02:00
Richard Schneeman
e263923573
Merge pull request #19778 from thenickcox/commands_docs
...
[ci skip] Document running a rake command as a rails command
2015-04-16 00:00:34 -05:00
Nick Cox
7937c6aa00
[ci skip] Document running a rake command as a rails command
2015-04-15 21:47:37 -07:00
Abdelkader Boudih
5256ada75d
Merge pull request #19775 from vngrs/fix_typo_asser_url
...
fix typo asser url [ci skip]
2015-04-15 22:50:00 +01:00
Mehmet Emin İNAÇ
b0e17b9af4
fix typo asser url [ci skip]
2015-04-16 00:46:07 +03:00
Abdelkader Boudih
8d11151aba
Merge pull request #19774 from davydovanton/doc-update-asser-url
...
[Skip ci] Add information about :host options
2015-04-15 22:23:06 +01:00
Anton Davydov
a4d589e31e
[Skip ci] Add information about :host options
...
Added informations about :host options for each url helper
(#javascript_url, #video_url, #stylesheet_url, etc) based on #asser_url
method.
2015-04-16 00:05:17 +03:00
Rafael Mendonça França
75f141553d
Merge pull request #19766 from blasterpal/small_typo_in_asset_pipeline
...
Correct small typo.
2015-04-15 10:54:52 -04:00
Hank Beaver
62a5d8ad08
Correct small typo.
...
* files are written to hard "disk" not "disc".
2015-04-15 10:46:02 -04:00
Kasper Timm Hansen
810c3cf6ab
Merge pull request #19765 from y-yagi/fix_typo_in_form_builder
...
remove extra `=` in form builder example [ci skip]
2015-04-15 16:09:16 +02:00
yuuji.yaginuma
653246f3e5
remove extra =
in form builder example [ci skip]
2015-04-15 23:06:01 +09:00
Yves Senn
c0939a5038
Merge pull request #19763 from jonatack/fix-typos-in-docs
...
Fix typos and improve the documentation
2015-04-15 13:35:56 +02:00
Jon Atack
6345f31fbf
Fix typos and improve the documentation
...
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.
2015-04-15 16:25:24 +05:30
Yves Senn
5f00ed10dd
Revert "Merge pull request #19755 from yuki24/activerecord/support-for-set"
...
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.
2015-04-15 09:10:00 +02:00
Zachary Scott
163de75707
Merge pull request #19446 from andersonDadario/fix_security_guide_captcha_03_21_2015
...
Fix security guide captcha 03 21 2015 [ci skip]
2015-04-14 16:53:09 -07:00
Arthur Nogueira Neves
7d4a1ab9ee
Merge pull request #19757 from Strech/http-auth-realm-unquoting
...
Tiny optimization of http auth Realm unquoting
2015-04-14 17:00:32 -04:00
Carlos Antonio da Silva
fcd8e62708
Merge pull request #19752 from yuki24/use-prepend-rather-than-alias
...
Use #prepend rather than using 2 aliases
2015-04-14 14:18:39 -03:00
Yuki Nishijima
d3684c4154
Use #prepend rather than using 2 aliases
2015-04-14 10:13:14 -07:00
Rafael Mendonça França
413398fc99
Enable Active Job integration tests again
2015-04-14 13:08:58 -04:00
Takumi IINO
b126e7aaaa
avoid double initialization error caused to sidekiq
...
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.
2015-04-14 13:06:20 -04:00
Rafael Mendonça França
4c665b8ded
Merge pull request #19758 from andreynering/remove-gzip-doc
...
Removing GZip section since Sprockets 3.0 no longer create .gz files
2015-04-14 13:02:46 -04:00
Andrey Nering
f1c2937ce5
Removing GZip section since Sprockets 3.0 no longer create .gz files [ci skip]
...
- 14b3b2edda
- https://github.com/rails/sprockets/issues/26
2015-04-14 14:01:00 -03:00
Rafael Mendonça França
b4a9c59a47
Fix typos in the documentation [ci skip]
2015-04-14 12:56:43 -04:00
Rafael Mendonça França
9ec54d9500
Merge pull request #19736 from kmcphillips/master
...
Set default form builder for a controller
2015-04-14 11:23:49 -04:00
Strech (Sergey Fedorov)
53dedfcde9
Tiny optimization of http auth Realm unquoting
2015-04-14 19:56:07 +05:00
eileencodes
db8897c2de
Use silence_warnings
on StaticTests
...
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.
2015-04-14 08:54:13 -04:00
Andrew White
4fb3a55528
Merge pull request #19751 from y-yagi/fix_indent_of_controller
...
fix indent in routes when using namespaced controllers
2015-04-14 08:45:18 +01:00
Yves Senn
524d40591e
Merge pull request #19755 from yuki24/activerecord/support-for-set
...
Add support for Set to Relation#where
2015-04-14 08:57:10 +02:00
Guillermo Iguaran
34d3a60951
Merge pull request #19754 from yuki24/ruby-2.2.2-on-travis
...
Use Ruby 2.2.2 on travis
2015-04-13 22:57:12 -05:00
Guillermo Iguaran
33ea933d7b
Merge pull request #19753 from jonatack/use-ruby-2-2-2
...
Upgrade to Ruby 2.2.2
2015-04-13 22:56:47 -05:00
Kevin McPhillips
2b8acdcd21
Override default form builder for a controller
2015-04-13 23:43:34 -04:00
Yuki Nishijima
1e2fcbb958
Use Ruby 2.2.2 on travis
...
This is required to run https://github.com/rails/rails/pull/19752 successfully.
2015-04-13 20:19:25 -07:00
Yuki Nishijima
50cae600bd
Add support for Set to Relation#where
...
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)
2015-04-13 20:13:37 -07:00
Jon Atack
32f7491808
Upgrade to Ruby 2.2.2
...
and fix the grammar in the ruby_version_check.rb user message.
2015-04-14 08:41:56 +05:30
Vijay Dev
8ac458ad2e
Merge branch 'master' of github.com:rails/docrails
2015-04-14 02:07:26 +00:00
yuuji.yaginuma
d2be2a9166
fix indent in routes when using namespaced controllers
...
Before:
namespace :foo do
namespace :bar do
get 'baz/index'
end
end
After:
namespace :foo do
namespace :bar do
get 'baz/index'
end
end
2015-04-14 09:34:51 +09:00
Carlos Antonio da Silva
ea97c763c1
Merge pull request #19742 from vngrs/config_autoload_paths_wrong_doc
...
Fix the wrong documentation about config.autoload_paths [ci skip]
2015-04-13 08:27:11 -03:00
Carlos Antonio da Silva
f54e89bf59
Improve note about unique index and foreign key on has_one association
...
Related to f1af967e0055a33c45071848a049ff342e9c291e. [ci skip]
2015-04-13 08:13:16 -03:00
Mehmet Emin İNAÇ
45747a5572
Fix the wrong documentation about config.autoload_paths [ci skip]
...
config.autoload_paths is not changeable from environment specific configuration files.
2015-04-13 11:56:50 +03:00
Yves Senn
ec59d6ec84
Merge pull request #19741 from greysteil/add-note-about-partial-index-support
...
Document that partial indexes are only supported by Postgres and SQLite.
2015-04-13 09:48:04 +02:00
Grey Baker
e91c4339e4
Document that partial indexes are only supported by Postgres and SQLite.
...
Fixes #18106
2015-04-13 09:33:48 +02:00
Zachary Scott
86ba051486
Merge branch 'feature/doc_request_forgery_protection_for_api'
2015-04-12 22:00:18 -07:00
Zachary Scott
2778ba8ed5
Add note regarding CSRF for APIs, as a use-case for skipping it [ci skip]
2015-04-12 21:58:40 -07:00
Zachary Scott
e1ebf146b5
Apply comments from @jeremy regarding why HTML and Javascript requests
...
specifically are checked for CSRF, when dealing with the browser.
[ci skip]
2015-04-12 21:56:01 -07:00
Vladimir Lyzo
fd0f27ce79
update request_forgery_protection docs [ci skip]
2015-04-12 21:48:34 -07:00
Zachary Scott
e83c398f60
Add a note regarding add_column restricted API [ci skip]
...
We should document current behavior, and this is design of API for now.
Closes #17597
2015-04-12 21:01:55 -07:00
Zachary Scott
dc70f71001
Merge branch 'master' of github.com:rails/rails
2015-04-12 20:22:35 -07:00
Zachary Scott
f1af967e00
Add note wrt foreign key constraint to ensure data integrity
...
Thanks for patch @sgrif :trollface:
Closes #18216
2015-04-12 20:20:48 -07:00