TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
50,733 Commits 2 Branches 0 Tags 294 MiB
e1ebf146b5
Commit Graph

50733 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Santiago Pastorino
e085a7ddb8 Revert "Merge pull request #19682 from supercaracal/fix_force_ssl_redirection_flash_error" 
This reverts commit d215620340be7cb29e2aa87aab22da5ec9e6e6a7, reversing
changes made to bbbbfe1ac02162ecb5e9a7b560134a3221f129f3.
 2015-04-12 22:26:35 -03:00
Zachary Scott
93d2eeaad5 Apply edits from @senny to close #19397 [ci skip] 2015-04-12 18:17:31 -07:00
Zachary Scott
da5fe3be1f Apply comments from @rafaelfranca: we shouldn't recommend you use scaffold css 
Closes #19492 and fixes #19453
 2015-04-12 18:11:14 -07:00
Zachary Scott
055d9993b5 Merge branch 'patch-1' 2015-04-12 17:58:56 -07:00
wingfire
a9f2c124af Enhance documentation of pluck with a hint to ids [ci skip] 
Documentation is giving an example that can be replaced by a more dry command.
Give a hint that ids can be used instead of pluck(:id).
 2015-04-12 17:57:00 -07:00
Zachary Scott
558597c0f8 Merge pull request #19564 from jonatack/counter_cache_docs 
[skip ci] Fix counter_cache in the Rails Guides
 2015-04-12 16:29:09 -07:00
Matthew Draper
c7b25b842c Fix (intermittent?) test failure 
We don't actually need to enumerate the possible types here any more;
that dates back to before e105e599e706780905d4c348394da989de3b200f, when
they were symbols, and indistinguishable from other options.
 2015-04-13 08:32:35 +09:30
Xavier Noria
f39ec6676a Merge pull request #19738 from ojab/squish 
Speedup String#squish
 2015-04-12 15:10:51 -07:00
ojab
1a0853c41f Speedup String#squish 2015-04-12 21:45:50 +00:00
Zachary Scott
41541b58cb Merge branch 'nishantmodak-view_paths' 2015-04-12 14:43:49 -07:00
Zachary Scott
8b0aa0c1b1 Some copy edits for modifying View Paths [ci skip] 2015-04-12 14:43:25 -07:00
Zachary Scott
66f3ec6746 Merge branch 'view_paths' of https://github.com/nishantmodak/rails into nishantmodak-view_paths 2015-04-12 14:25:14 -07:00
Zachary Scott
9cabd35d43 Merge branch 'mfazekas-action-mailer-async-doc-fixes' 2015-04-12 13:31:29 -07:00
Zachary Scott
a647277fb9 Since the delegator wasn't identified earlier, we should here [ci skip] 2015-04-12 13:29:58 -07:00
Zachary Scott
1ffd603712 Merge branch 'action-mailer-async-doc-fixes' of https://github.com/mfazekas/rails into mfazekas-action-mailer-async-doc-fixes 
Conflicts:
	actionmailer/lib/action_mailer/base.rb
 2015-04-12 13:28:10 -07:00
Zachary Scott
08a3baa380 ✂️ 2015-04-12 13:20:34 -07:00
Nishant Modak
69283303f3 view paths docs [ci skip] 2015-04-13 01:41:48 +05:30
Godfrey Chan
4825042a1c Merge pull request #19735 from Dan-Burnette/fixSecretKeyBaseErrorMessage 
Error message no longer tells you to set the (deprecated) secret_token.
 2015-04-12 10:04:16 -07:00
Dan
b93ae0cd56 Error message no longer tells you to set the (deprecated) secret_token. 2015-04-12 10:49:43 -05:00
Kasper Timm Hansen
efaec3dd63 Merge pull request #19732 from wazery/patch-2 
[ci skip] Update contributing guide
 2015-04-12 16:32:00 +02:00
Islam Wazery
2e1d69ea97 [ci skip] Update contributing guide 2015-04-12 16:23:42 +02:00
Robin Dupret
5493e9c7f8 Fix a few typos and wrap some lines [ci skip] 2015-04-12 15:34:28 +02:00
Yves Senn
5c0a61881b Merge pull request #19734 from y-yagi/action_view_guide 
remove reference to `register_javascript_expansion` and `register_stylesheet_expansion` from guide [ci skip]
 2015-04-12 10:21:22 +02:00
yuuji.yaginuma
3b88493bbb remove reference to register_javascript_expansion and register_stylesheet_expansion from guide [ci skip] 
These methods no longer exists.
 2015-04-12 14:52:28 +09:00
Richard Schneeman
11e8b46a12 Merge pull request #19733 from yuki24/speed-up-levenshtein 
Speed up Levenshtein by 50% and reduce 97% of memory usage
 2015-04-11 18:10:19 -05:00
Yuki Nishijima
f7ba69436a Speed up Levenshtein by 50% and reduce 97% of memory usage 
Calculating -------------------------------------
             each_char   924.000  i/100ms
        each_codepoint     1.381k i/100ms
  -------------------------------------------------
             each_char      9.320k (¡Þ 5.1%) i/s -     47.124k
        each_codepoint     13.857k (¡Þ 3.6%) i/s -     70.431k

  Comparison:
        each_codepoint:    13857.4 i/s
             each_char:     9319.5 i/s - 1.49x slower

The full report can be found here:
  https://gist.github.com/yuki24/a80988f35aceac76f1d5
 2015-04-11 15:28:23 -07:00
Richard Schneeman
29d40544b1 Merge pull request #19566 from aditya-kapoor/remove-dup-doc 
[ci skip] remove duplicate doc for current_page?
 2015-04-11 17:24:14 -05:00
Carlos Antonio da Silva
193297abc8 Remove mention of super old defined_javascript_functions method [ci skip] 
It was removed long ago: e358b1fce8fdcbac896dde08286be020420e843e.
 2015-04-11 17:57:54 -03:00
Robin Dupret
d21c688522 Merge pull request #19721 from vngrs/validates_presence_of_missing_note 
Missing note on validates_presence_of validation [ci skip]
 2015-04-11 22:43:36 +02:00
Mehmet Emin İNAÇ
29986b0d41 Missing note on validates_presence_of validation [ci skip] 
Without this note, someone can misunderstand the usage of validates_presence_of method

add missing note for the validates_presence_of
 2015-04-11 23:24:36 +03:00
Matthew Draper
cab53734e8 Merge pull request #19731 from wazery/rename_bin_to_exe 
Rename railties/bin to railties/exe to match the new Bundler convention
 2015-04-12 04:38:40 +09:30
Islam Wazery
4521aadae0 Rename railties/bin to railties/exe 
That will match the new Bundler executables convention.
Bundler Blog Post: http://bundler.io/blog/2015/03/20/moving-bins-to-exe.html
Also updated the necessary tests.
 2015-04-11 19:26:34 +02:00
Eileen M. Uchitelle
24970a69cb Merge pull request #19727 from supercaracal/fix_wrong_test_method_name 
fix a wrong feature test method name
 2015-04-11 08:48:51 -04:00
eileencodes
6ad9e2c4a5 [ci skip] Remove link_to_function and button_from_function from guides 
These methods were removed in cb9f7f4 and are no longer methods in the
Rails codebase.
 2015-04-11 08:47:44 -04:00
Kasper Timm Hansen
cf57502b02 Merge pull request #19728 from jonatack/patch-4 
[skip ci] primay_key -> primary_key
 2015-04-11 12:21:58 +02:00
Jon Atack
478a755387 [skip ci] primay_key -> primary_key 2015-04-11 15:38:07 +05:30
Taishi Kasuga
3449da4a6c fix a wrong feature test method name 2015-04-11 18:59:56 +09:00
Zachary Scott
409460e440 Merge branch 'girishso-belongs_to_primary_key_doc' 2015-04-10 17:28:22 -07:00
Zachary Scott
d2998764c5 Copy edits for primary_key documentation in association guide. [ci skip] 2015-04-10 17:27:40 -07:00
Zachary Scott
47dc07313b Merge branch 'belongs_to_primary_key_doc' of https://github.com/girishso/rails into girishso-belongs_to_primary_key_doc 2015-04-10 17:20:40 -07:00
Zachary Scott
77a7c4bf7d Merge pull request #17512 from JackDanger/danger/use-default-view-pattern-in-docs 
[docs] Using the real resolver pattern in docs
 2015-04-10 17:03:48 -07:00
Zachary Scott
b0b8a6b0e4 Copy edits for QueueAdapters docs to fix #17765 [ci skip] 2015-04-10 16:37:25 -07:00
Zachary Scott
c2d1bf64c4 Merge branch 'queue-adapters-docs' of https://github.com/KingsleyKelly/rails into queue-adapter-docs 2015-04-10 15:53:27 -07:00
Guillermo Iguaran
1d2cdaead3 Merge pull request #19722 from sikachu/remove-ar-use_transactional_fixtures 
Use `use_transactional_tests` in Active Record
 2015-04-10 15:58:23 -05:00
Prem Sichanugrist
3e482f2956
Use use_transactional_tests in Active Record 
`use_transactional_fixtures` was deprecated in favor of
`use_transactional_tests` in Rails 5.0. This removes one warning while
running test suite.
 2015-04-10 16:51:02 -04:00