TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
53,939 Commits 2 Branches 0 Tags 294 MiB
26f2447252
Commit Graph

53939 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Myers
26f2447252 Fix Typo in EagerLoadPolymorphicError [ci skip] 2015-10-27 21:05:22 -04:00
Rafael Mendonça França
0ef2256c4a Merge pull request #18383 from scambra/habtm-with-where-includes-16032-for-master 
Includes HABTM returns correct size now
 2015-10-27 22:07:41 -02:00
Rafael França
c19d664380 Merge pull request #22093 from y-yagi/fix_typo_in_db_purge 
fix typo in `db:purge` description [ci skip]
 2015-10-27 21:43:14 -02:00
yuuji.yaginuma
17541c701e fix typo in db:purge description [ci skip] 2015-10-28 08:32:09 +09:00
Kasper Timm Hansen
0174837bfa Merge pull request #22087 from yui-knk/fix_ar_changelog 
[ci skip] Aline code examples in AR changelog
 2015-10-27 16:14:51 +01:00
Santiago Pastorino
7a9ce69ce0 Merge pull request #22078 from arunagw/secret-key-as-an-integer 
raise `ArgumentError` when `SECRET_KEY_BASE` is an integer
 2015-10-27 11:32:41 -02:00
yui-knk
64d4571f6c [ci skip] Aline code examples in AR changelog 2015-10-27 20:12:31 +09:00
Arun Agrawal
4810f401c4 raise ArgumentError when SECRET_KEY_BASE is an integer 
If `SECRET_KEY_BASE` or other `secret` gets passed as other then string
we need to raise `ArgumentError` to know that it's a wrong argument.

Closes #22072
 2015-10-27 10:18:05 +01:00
Guo Xiang Tan
190c69ece3 Remove skipped JRuby tests that are passing on 9.0.3.0. 2015-10-27 01:13:28 -02:00
Rafael Mendonça França
8e57ed1a39 Revert "Merge pull request #21994 from mtodd/inherit-scopes" 
This reverts commit 60c9701269f5b412849f1a507df61ba4735914d7, reversing
changes made to 6a25202d9ea3b4a7c9f2d6154b97cf8ba58403db.

Reason: Broken build
 2015-10-27 01:12:03 -02:00
Arthur Neves
60c9701269 Merge pull request #21994 from mtodd/inherit-scopes 
Fix InheritanceTest#test_scope_inherited_properly implementation bugs
 2015-10-26 22:04:02 -04:00
Matt Todd
3c4aa73ce8 Make inherited scope test fail 
This triggers the JoinDependency work to reflect on the associations
and trigger an error as follows:

  ActiveRecord::ConfigurationError: Association named 'account' was
  not found on Company; perhaps you misspelled it?

Fix Company.of_first_firm joins association name

Should be `Company.joins(:accounts)` not `Company.joins(:account)`.

Do the same for Client.of_first_firm
 2015-10-26 21:36:43 -04:00
schneems
6a25202d9e [ci skip] Add doc for preloader_for 2015-10-26 18:07:34 -05:00
schneems
d81fbe22ed [ci skip] Clarify doc for preloaders_for_one 2015-10-26 18:07:34 -05:00
schneems
3a6872c49a [ci skip] Add doc to preloaders_on 2015-10-26 18:07:34 -05:00
Sean Griffin
118232aef4 Merge pull request #19686 from tsun1215/index_errors 
Errors can be indexed with nested attributes

Close #8638
 2015-10-26 16:05:16 -06:00
Rafael França
2794de05d6 Merge pull request #22080 from AnnaErshova/edits-config-code-text 
Edits default `config/boot.rb` to match what's generated by Rails 4.2.
 2015-10-26 17:41:53 -02:00
AnnaErshova
6eada87b61 Edits default config/boot.rb to match what's generated by Rails 4.2. 2015-10-26 15:22:30 -04:00
Sean Griffin
04bc52f7dc Merge pull request #19924 from iamvery/db-tasks-exit-status 
Explicitly exit with status "1" for create and drop failures
 2015-10-26 12:27:58 -06:00
schneems
67b8f92743 [ci skip] Fix method documentation location 2015-10-26 11:36:12 -05:00
Sean Griffin
6616cb866e Merge pull request #22071 from yui-knk/redefine_method_keep_visibility 
Make `Module#redefine_method` to keep method visibility
 2015-10-26 06:48:04 -06:00
yui-knk
7189e5554e Make Module#redefine_method to keep method visibility 
Before this commit `Module#redefine_method` always changes
visibility of redefined method to `public`.
This commit changes behavior of Module#redefine_method` to
keep method visibility.
 2015-10-26 19:40:46 +09:00
Sean Griffin
0946318386 Merge pull request #22064 from kamipo/do_not_omit_parentheses 
Do not omit parentheses [ci skip]
 2015-10-25 11:54:28 -05:00
Claudio B
504e5e102b Merge pull request #22060 from sebmck/tweak-wording 
Tweaked wording used in some tests.
 2015-10-25 08:04:40 -07:00
Yves Senn
5746638e55 Merge pull request #22062 from y-yagi/fix_rdoc_markup 
fix rdoc markup [ci skip]
 2015-10-25 13:51:18 +01:00
yuuji.yaginuma
8e7998cd5a fix rdoc markup [ci skip] 2015-10-25 21:25:16 +09:00
Sebastian McKenzie
a97dcde689 Tweaked wording used in some tests. 2015-10-25 08:57:50 +00:00
Ryuta Kamizono
e7c0595f3b Do not omit parentheses [ci skip] 2015-10-25 01:49:37 +09:00
Yves Senn
6843cf6a94 Merge pull request #22040 from arunagw/remove-jruby-travis-opts 
Remove JRUBY_OPTS from .travis.yml file
 2015-10-24 15:27:05 +02:00
Matthew Draper
df153edcfb Merge pull request #22054 from tgxworld/jruby_issue_fixed 
Remove skip on tests that have been fixed.
 2015-10-24 14:46:46 +10:30
Guo Xiang Tan
682d624a85 Remove skip on tests that have been fixed. 2015-10-24 08:08:26 +08:00
Rafael Mendonça França
5a47639aac Merge pull request #22033 from jmccartie/jm/uuid_nil 
Guard clause for id_kind in generator
 2015-10-23 21:34:40 -02:00
Rafael Mendonça França
ef31d541e0 Stop aligning the arguments 2015-10-23 21:34:08 -02:00
Rafael Mendonça França
ff044c3c3a Use thor class_option to make the primary_key_type option work 
Also move the method to the right class
 2015-10-23 21:34:07 -02:00
Jon McCartie
f0323288da Move default uuid generation to active_record 2015-10-23 21:34:00 -02:00
Arthur Nogueira Neves
f94e328cf8 Merge pull request #22052 from piton4eg/patch-10 
Fix punctuation [ci skip]
 2015-10-23 16:47:18 -04:00
Kasper Timm Hansen
50f248cae5 Merge pull request #21990 from greysteil/invalid-utf8-querystrings 
Catch invalid UTF-8 querystring values and respond with BadRequest
 2015-10-23 22:28:28 +02:00
Markov Alexey
6f9d7f346b Fix punctuation [ci skip] 2015-10-23 23:20:00 +03:00
Grey Baker
59ab2d1ee5 Catch invalid UTF-8 querystring values and respond with BadRequest 2015-10-23 14:56:47 +01:00
Kasper Timm Hansen
6f62ace65a Merge pull request #22038 from tgxworld/fix_random_error_when_running_tests_with_jruby 
FIX: Randomly failing test when running without GIL.
 2015-10-23 15:54:48 +02:00
Guo Xiang Tan
c285bbec17 FIX: Randomly failing test when running without GIL. 2015-10-23 21:15:51 +08:00
Sean Griffin
e81719650a Merge pull request #22037 from kamipo/remove_no_need_binds_empty 
Remove no need `binds.empty?` checking
 2015-10-23 07:12:29 -05:00
Richard Schneeman
976debac89 Merge pull request #22041 from y-yagi/remove_unnecessary_files_indummy_application 
remove unnecessary readme in dummy application
 2015-10-23 06:36:01 -05:00
yuuji.yaginuma
65590e3c96 remove unnecessary readme in dummy application 
`README` it is changed to `README.rdoc` in 6b126e2, it has been changed to` README.md` further 89a12c9.
 2015-10-23 19:41:56 +09:00
Arun Agrawal
dcb75834c3 Remove JRUBY_OPTS from .travis.yml file 
As we are not running tests for JRuby on travis this option is not
needed.

For more details check 0e8c04529159522aadbfe4fe71ea3d326df07d52
 2015-10-23 10:46:51 +02:00
Yves Senn
2ad9afe4ff Merge pull request #22035 from yui-knk/update_doc_anonymous 
[ci skip] Add more code examples for `Module#anonymous?` docs
 2015-10-23 08:38:10 +02:00
Ryuta Kamizono
be0f3179d4 Remove no need binds.empty? checking 
`#exec_stmt` is private method and only called in `#exec_query`. it
means `binds` is provided always. No need `binds.empty?` checking.
 2015-10-23 15:00:02 +09:00
yui-knk
f3de0c185a [ci skip] Add more code examples for Module#anonymous? docs 
In later code examples, it is better to write how `Module#anonymous?`
works.
 2015-10-23 13:25:19 +09:00
Xavier Noria
b9d1e101b4 API guidelines reword re the Oxford comma [ci skip] 2015-10-22 20:56:50 +02:00
Xavier Noria
23eb2e1a99 Revert "[ci skip] removed extra comma" 
Reason: That one is an Oxford comma, as per our guidelines. See:

     http://edgeguides.rubyonrails.org/api_documentation_guidelines.html#comma

This reverts commit f184cd34f9ef35ddf85a23c2fb02cc05d3fb26b3.
 2015-10-22 20:48:54 +02:00