aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #22054 from tgxworld/jruby_issue_fixedMatthew Draper2015-10-241-4/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove skip on tests that have been fixed.
| * | | | | | | Remove skip on tests that have been fixed.Guo Xiang Tan2015-10-241-4/+0
|/ / / / / / /
* | | | | | | Merge pull request #22033 from jmccartie/jm/uuid_nilRafael Mendonça França2015-10-238-19/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Guard clause for id_kind in generator
| * | | | | | | Stop aligning the argumentsRafael Mendonça França2015-10-231-4/+4
| | | | | | | |
| * | | | | | | Use thor class_option to make the primary_key_type option workRafael Mendonça França2015-10-236-16/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also move the method to the right class
| * | | | | | | Move default uuid generation to active_recordJon McCartie2015-10-235-11/+16
|/ / / / / / /
* | | | | | | Merge pull request #22052 from piton4eg/patch-10Arthur Nogueira Neves2015-10-231-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix punctuation [ci skip]
| * | | | | | | Fix punctuation [ci skip]Markov Alexey2015-10-231-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #21990 from greysteil/invalid-utf8-querystringsKasper Timm Hansen2015-10-234-7/+37
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Catch invalid UTF-8 querystring values and respond with BadRequest
| * | | | | | | Catch invalid UTF-8 querystring values and respond with BadRequestGrey Baker2015-10-234-7/+37
|/ / / / / / /
* | | | | | | Merge pull request #22038 from ↵Kasper Timm Hansen2015-10-231-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tgxworld/fix_random_error_when_running_tests_with_jruby FIX: Randomly failing test when running without GIL.
| * | | | | | | FIX: Randomly failing test when running without GIL.Guo Xiang Tan2015-10-231-0/+6
| | | | | | | |
* | | | | | | | Merge pull request #22037 from kamipo/remove_no_need_binds_emptySean Griffin2015-10-231-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove no need `binds.empty?` checking
| * | | | | | | | Remove no need `binds.empty?` checkingRyuta Kamizono2015-10-231-3/+3
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `#exec_stmt` is private method and only called in `#exec_query`. it means `binds` is provided always. No need `binds.empty?` checking.
* | | | | | | | Merge pull request #22041 from ↵Richard Schneeman2015-10-232-1/+14
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | y-yagi/remove_unnecessary_files_indummy_application remove unnecessary readme in dummy application
| * | | | | | | remove unnecessary readme in dummy applicationyuuji.yaginuma2015-10-232-1/+14
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | `README` it is changed to `README.rdoc` in 6b126e2, it has been changed to` README.md` further 89a12c9.
* | | | | | | Merge pull request #22035 from yui-knk/update_doc_anonymousYves Senn2015-10-231-2/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | [ci skip] Add more code examples for `Module#anonymous?` docs
| * | | | | | [ci skip] Add more code examples for `Module#anonymous?` docsyui-knk2015-10-231-2/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | In later code examples, it is better to write how `Module#anonymous?` works.
* | | | | | API guidelines reword re the Oxford comma [ci skip]Xavier Noria2015-10-221-3/+4
| | | | | |
* | | | | | Revert "[ci skip] removed extra comma"Xavier Noria2015-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge pull request #22034 from hemalijain/patch-2Rafael Mendonça França2015-10-221-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ci skip] removed extra comma
| * | | | | | [ci skip] removed extra commahemali jain2015-10-231-1/+1
|/ / / / / /
* | | | | | `config.generators` should be docummented since it is public APIRafael Mendonça França2015-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge pull request #22029 from yui-knk/fixup_content_type_regexpRafael Mendonça França2015-10-221-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use sufficient a regexp anchor to check `@response.content_type.to_s`
| * | | | | | Use sufficient a regexp anchor to check `@response.content_type.to_s`yui-knk2015-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit follows up of ea9bc06c9a47b839d5e2db94ba6bf7e29c8f0ae9. To check `@response.content_type.to_s` is ended with `"xml"`, to use `\z` is sufficient.
* | | | | | | Merge pull request #21918 from bogdan/refactor-preloaderSean Griffin2015-10-221-42/+30
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Refactored association preloader for performance
| * | | | | | | Refactored association preloader for performanceBogdan Gusiev2015-10-221-42/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * less arrays created * less complexity with only one level of nesting in loop
* | | | | | | | Merge pull request #19327 from rousisk/masterSean Griffin2015-10-223-3/+19
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Change Integer#year to return a Fixnum instead of a Float to improve consistency
| * | | | | | | Change Integer#year to return a Fixnum instead of a Float to improve consistencyKonstantinos Rousis2015-10-223-3/+19
| | | | | | | |
* | | | | | | | Merge pull request #22028 from yui-knk/suppress_deprecated_warning_testKasper Timm Hansen2015-10-221-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Suppress warnings (warnings about AD::IntegrationTest HTTP request)
| * | | | | | | Suppress warnings (warnings about AD::IntegrationTest HTTP request)yui-knk2015-10-221-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | These warings have been appeared from ea9bc06c9a47b839d5e2db94ba6bf7e29c8f0ae9.
* | | | | | | Merge pull request #21950 from ↵Andrew White2015-10-224-11/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rafaelsales/issues/21922-fix-ar-group-by-attribute-lookup Fix generated projection fields in group by query
| * | | | | | | Refactor Calculations#execute_grouped_calculation and clean AR test caseRafael Sales2015-10-222-11/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * When tried to use `Company#accounts` test/models/company.rb I got: ``` ActiveRecord::StatementInvalid: SQLite3::SQLException: no such column: accounts.company_id: SELECT COUNT(*) AS count_all, "companies"."firm_id" AS companies_firm_id FROM "companies" INNER JOIN "accounts" ON "accounts"."company_id" = "companies"."id" GROUP BY "companies"."firm_id" ``` * The refactor on Calculations class was just to simplify the code
| * | | | | | | Fix generated projection fields in group by queryRafael Sales2015-10-223-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #21922 Let `Book(id, author_id)`, `Photo(id, book_id, author_id)` and `Author(id)` Running `Book.group(:author_id).joins(:photos).count` will produce: * Rails 4.2 - conflicts `author_id` in both projection and group by: ```sql SELECT COUNT(*) AS count_all, author_id AS author_id FROM "books" INNER JOIN "photos" ON "photos"."book_id" = "books"."id" GROUP BY author_id ``` * Master (9d02a25) - conflicts `author_id` only in projection: ```sql SELECT COUNT(*) AS count_all, author_id AS author_id FROM "books" INNER JOIN "photos" ON "photos"."book_id" = "books"."id" GROUP BY "books"."author_id" ``` * With this fix: ```sql SELECT COUNT(*) AS count_all, "books"."author_id" AS books_author_id FROM "books" INNER JOIN "photos" ON "photos"."book_id" = "books"."id" GROUP BY "books"."author_id" ```
* | | | | | | | Merge pull request #22011 from kamipo/remove_unused_args_againAndrew White2015-10-224-24/+14
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Remove `#tables` extra args again
| * | | | | | | Remove `#tables` extra args againRyuta Kamizono2015-10-224-24/+14
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This issue was resolved by #21687 already. But re-add args by #18856. `#tables` extra args was only using by `#table_exists?`. This is for internal API. This commit will remove these extra args again.
* | | | | | | Merge pull request #22019 from timoschilling/patch-2Sean Griffin2015-10-211-1/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | remove unnecessary forwardable require
| * | | | | | | remove unnecessary forwardable requireTimo Schilling2015-10-211-1/+0
|/ / / / / / / | | | | | | | | | | | | | | `Forwardable` has been used in the past
* | | | | | | Merge pull request #22018 from jbranchaud/move-getter-to-attr-readerAndrew White2015-10-211-5/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Extract native getter to attr_reader.
| * | | | | | | Extract native getter to attr_reader.jbranchaud2015-10-211-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The getter is doing nothing more than returning the ivar, so it can be extracted to an attr_reader.
* | | | | | | | Merge pull request #20026 from rails/remove-possible-singleton-methodAndrew White2015-10-213-4/+32
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fix warnings in multiple application tests
| * | | | | | | Add Module#remove_possible_singleton_methodAndrew White2015-10-213-4/+32
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is primarily to fix method redefinition warnings in class_attribute but may be of use in other places where we define singleton methods.
* | | | | | | move documentation of column options to `add_column`. Closes #20400.Yves Senn2015-10-212-79/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] It's been a source of confusion that the lower-level `add_column` referenced the higher level `column` method for available options. `column` supports additional functionality like `index: true` that is not present on `add_column`. This patch moves common option documentation to `add_column` and only documents the additional options in `column`.
* | | | | | | Merge pull request #22013 from NelsonScott/patch-1Yves Senn2015-10-211-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | typo
| * | | | | | typoScott Nelson2015-10-201-1/+1
|/ / / / / /
* | | | | | Really fix test failures caused by #19851Sean Griffin2015-10-201-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ok, this explains why the branch showed as green. We don't run files in isolation for PRs, only for master. Active Support monkeypatches `BigDecimal#to_s`, so the generated error message was different depending on if the file was run in isolation
* | | | | | Fix test failures caused by #19851Sean Griffin2015-10-201-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The error message when asserting `greater_than: BigDecimal.new` will give an error message based on how BigDecimal displays itself. Big decimal appears to always use scientific notation. This might not be the best error message for the general case, but the general case wouldn't use big decimal for the validation. And if they do, they likely need this level of precision.
* | | | | | Merge pull request #22008 from rails/revert-19898-common-secretsSean Griffin2015-10-201-16/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Revert " Added an example to show how common secrets can be shared ac…
| * | | | | | Revert " Added an example to show how common secrets can be shared across ↵Sean Griffin2015-10-201-16/+0
|/ / / / / / | | | | | | | | | | | | | | | | | | multiple environments in secrets.yml"
* | | | | | Merge pull request #19851 from repinel/numericality-validation2Sean Griffin2015-10-202-13/+47
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use the post-type-cast version of the attribute to validate numericality
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-19 05:51:21 +0000