aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #22692 from ryohashimoto/22669_api_generatorDavid Heinemeier Hansson2015-12-212-1/+33
|\ | | | | Action Cable channel generator doesn't create JS assets if options[:rails][:assets] is false
| * Action Cable channel generator should not create JS assets in --api modeRyo Hashimoto2015-12-192-1/+33
| |
* | Merge pull request #22698 from y-yagi/display_detail_info_on_inline_reportKasper Timm Hansen2015-12-215-7/+19
|\ \ | | | | | | display detailed information in inline reporting
| * | display detailed information in inline reportingyuuji.yaginuma2015-12-215-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The errors message only was not displayed, as if it did not use the inline reporting, modified to also information the method name and the like in error are displayed. ``` # before Failed assertion, no message given. bin/rails test test/models/user_test.rb:5 ``` ``` # after Failure: UserTest#test_the_truth: Failed assertion, no message given. bin/rails test test/models/user_test.rb:5 ```
* | | Revert "Merge pull request #22486 from ↵Yves Senn2015-12-213-26/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | methyl/fix-includes-for-groupped-association" This reverts commit 537ac7d6ade61e95f2b70685ff2236b7de965bab, reversing changes made to 9c9c54abe08d86967efd3dcac1d65158a0ff74ea. Reason: The way we preload associations will change the meaning of GROUP BY operations. This is illustrated in the SQL generated by the added test (failing on PG): Association Load: D, [2015-12-21T12:26:07.169920 #26969] DEBUG -- : Post Load (0.7ms) SELECT "posts".* FROM "posts" LEFT JOIN comments ON comments.post_id = posts.id WHERE "posts"."author_id" = $1 GROUP BY posts.id ORDER BY SUM(comments.tags_count) [["author_id", 1]] Preload: D, [2015-12-21T12:26:07.128305 #26969] DEBUG -- : Post Load (1.3ms) SELECT "posts".* FROM "posts" LEFT JOIN comments ON comments.post_id = posts.id WHERE "posts"."author_id" IN (1, 2, 3) GROUP BY posts.id ORDER BY SUM(comments.tags_count)
* | | Merge pull request #22719 from akshay-vishnoi/fix-docsYves Senn2015-12-211-3/+3
|\ \ \ | | | | | | | | [ci skip] `rails new project` generates README.md now
| * | | [ci skip] `rails new project` generates README.md nowAkshay Vishnoi2015-12-211-3/+3
| | | |
* | | | Merge pull request #22718 from gsamokovarov/fix-changelogsYves Senn2015-12-218-25/+1
|\ \ \ \ | | | | | | | | | | No more no changes entries in the CHANGELOGs [ci skip]
| * | | | No more no changes entries in the CHANGELOGsGenadi Samokovarov2015-12-218-25/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During the `5.0.0.beta1` release, the CHANGELOGs got an entry like the following: ``` * No changes. ``` It is kinda confusing as there are indeed changes after it. Not a biggie, just a small pass over the CHANGELOGs. [ci skip]
* | | | Merge pull request #22581 from hirocaster/fix-expect-sample-codeYves Senn2015-12-211-4/+5
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | [ci skip] Change output timming of sample code
| * | | Change output timming of sample codehirocaster2015-12-141-2/+2
| | | | | | | | | | | | | | | | - Expect returns "new value 1" but, retuns nil, because output at thread is not finished. Move val_1 output to finished thread.
* | | | Merge pull request #22486 from methyl/fix-includes-for-groupped-associationYves Senn2015-12-213-1/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass group values when including association Conflicts: activerecord/CHANGELOG.md
| * | | | Pass SQL group by values when including scoped associationLucjan Suski2015-12-153-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes problem when added `group()` in association scope was lost in eager loaded association.
* | | | | Merge pull request #22706 from habermann24/fix_mattr_accessor_docsYves Senn2015-12-211-6/+6
|\ \ \ \ \ | | | | | | | | | | | | Fix documentation for mattr_accessor methods [ci skip]
| * | | | | Fix documentation for mattr_accessor methodsJan Habermann2015-12-201-6/+6
| | | | | |
* | | | | | Merge pull request #22716 from mattreduce/mattreduce-getting-started-guideMatthew Draper2015-12-211-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update README extension in Getting Started guide
| * | | | | | Update README extension in Getting Started guideMatthew Conway2015-12-201-1/+1
|/ / / / / / | | | | | | | | | | | | Generated Rails app READMEs are Markdown as of 9739f07d763e29b1c5d71cabf1ca8cfa4421e653
* | | | | | Merge pull request #22712 from jonatack/update-changelogsRafael França2015-12-201-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add missing @claudiob credit to change log [skip ci]
| * | | | | | Add missing @claudiob credit to change log [skip ci]Jon Atack2015-12-201-0/+1
| | | | | | |
* | | | | | | Merge pull request #22715 from kamipo/remove_mysql_adapterSean Griffin2015-12-2013-98/+87
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Remove legacy mysql adapter
| * | | | | | Remove legacy mysql adapterRyuta Kamizono2015-12-2113-98/+87
|/ / / / / / | | | | | | | | | | | | | | | | | | Follow up to #22642.
* | | | | | Merge pull request #22711 from ↵Kasper Timm Hansen2015-12-201-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | jonatack/add-missing-period-in-upgrading-rails-guide Upgrade Guide: Add missing period, :scissors: whitespace [skip ci]
| * | | | | | Upgrade Guide: Add missing period, :scissors: whitespace [skip ci]Jon Atack2015-12-201-2/+2
|/ / / / / /
* | | | | | Merge pull request #22704 from rajcybage/mysql_fixSean Griffin2015-12-203-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | mysql2 adapter instead of mysql [ci skip]
| * | | | | | mysql2 adapter instead of mysql [ci skip]Rajarshi Das2015-12-203-4/+4
| |/ / / / /
* | | | | | Merge pull request #22707 from yui-knk/fix_warningRichard Schneeman2015-12-201-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Suppress warning ambiguous first argument
| * | | | | | Suppress warning ambiguous first argumentyui-knk2015-12-201-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Suppress warning (warning: ambiguous first argument; put parentheses or a space even after `/' operator)
* | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-12-203-5/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | remove extra spaces in fixtures doc partGaurav Sharma2015-12-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` Every time when a fixture generate, it’s also generating improper doc. one: {} # column: value # two: {} # column: value ```
| * | | | | Add missing punctuation mark [ci skip]Gaurav Sharma2015-11-182-3/+3
| | | | | |
* | | | | | Add a commend about deprecation of ActiveSupport::OrderedHashRafael Mendonça França2015-12-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is in the code to provides backward compatibility for people that have this class serialized as YAML in some storage. Closes #22681
* | | | | | Merge pull request #22697 from kamipo/remove_unused_mysql_specific_schemaYves Senn2015-12-191-62/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove unused `test/schema/mysql_specific_schema.rb`
| * | | | | | Remove unused `test/schema/mysql_specific_schema.rb`Ryuta Kamizono2015-12-191-62/+0
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Follow up to #22642.
* | | | | | docs, follow up to #22699. [ci skip]Yves Senn2015-12-191-2/+2
| | | | | |
* | | | | | Merge pull request #22699 from omotenko/patch-1Kasper Timm Hansen2015-12-191-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Update README.md
| * | | | | Update README.mdOleg Motenko2015-12-191-1/+1
|/ / / / /
* | | | | Deprecation warning now targets at 5.1Akira Matsuda2015-12-192-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Also, added a test case to make sure that the default deprecation horizon is always bigger than the current Rails version.
* | | | | Merge pull request #22695 from sachin21/remove_ds_storeGuillermo Iguaran2015-12-191-0/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove .DS_Store
| * | | | | Remove .DS_StoreSatoshi Ohmori2015-12-191-0/+0
|/ / / / /
* | | | | Merge pull request #22479 from RobinClowers/fix-cache-notification-orderKasper Timm Hansen2015-12-192-20/+24
|\ \ \ \ \ | | | | | | | | | | | | Fix cache fetch miss notification order
| * | | | | Fix cache fetch miss notification orderRobin Clowers2015-12-022-20/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/rails/rails/issues/22477. When I improved the caching instrumentation in edd33c08d98723ae9bb89cf7f019277117ed6414, I inadvertently changed the order of AS notifications when there is a cache miss.
* | | | | | Merge pull request #22683 from ↵Richard Schneeman2015-12-182-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | gwincr11/No-Doc-Rails__Generators__Actions__CreateMigration Add No Doc
| * | | | | | Add No DocCory Gwin2015-12-182-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In reference to rails/rail#22403 add a :nodoc:
* | | | | | | Merge pull request #22690 from claudiob/remove-blank-lineRichard Schneeman2015-12-181-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove blank line generated in config.ru
| * | | | | | | Remove blank line generated in config.ruclaudiob2015-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow the lines of the other `.tt` files ([example](https://github.com/rails/rails/blob/1611ab4db173a7596a7a94c58dabf1483f070304/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt#L26)) that have the space after the condition to avoid too many white lines in the resulted file.
* | | | | | | | Merge pull request #22678 from akshay-vishnoi/base_test_caseGuillermo Iguaran2015-12-181-14/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ActionCable] declare asset_logged private
| * | | | | | | | [ActionCable] declare asset_logged privateAkshay Vishnoi2015-12-191-14/+14
| | | | | | | | |
* | | | | | | | | Merge pull request #22688 from claudiob/doc-cookie-serializerGuillermo Iguaran2015-12-181-0/+2
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | Explain what initializer/config_serializer does
| * | | | | | | | Explain what initializer/config_serializer doesclaudiob2015-12-181-0/+2
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In line with the other initializers, add a short comment that explains what happens when you change the value of the initializer. [ci skip]
* | | | | | | | Merge pull request #22687 from claudiob/doc-cookie-serializerClaudio B2015-12-181-1/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | initializers/cookies_serializer is not new to 5.0
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 04:45:54 +0000