mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity
50,766 Commits 61 Branches 565 Tags 420 MiB
Commit Graph

50766 Commits

Author SHA1 Message Date
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
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 f1af967e00. [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
Santiago Pastorino e085a7ddb8 Revert "Merge pull request #19682 from supercaracal/fix_force_ssl_redirection_flash_error" 
This reverts commit d215620340, reversing
changes made to bbbbfe1ac0.
 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 e105e599e7, 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