aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* show correct class name in migration inherited directly erroryuuji.yaginuma2017-01-242-3/+4
| | | | Follow up to 249f71a
* Merge pull request #27775 from domcleal/27774-format-resetEileen M. Uchitelle2017-01-232-0/+15
|\ | | | | Delete PATH_INFO after each controller test request
| * Delete PATH_INFO after each controller test requestDominic Cleal2017-01-232-0/+15
|/ | | | | | | | | | Prevents PATH_INFO from being used to infer the request format in later test requests when no explicit format is given. As the request PATH_INFO may be set before a request, it can't be deleted during pre-request scrubbing. Fixes #27774
* Bundler 1.14 compatMatthew Draper2017-01-231-1/+4
|
* Merge pull request #27771 from ↵Santiago Pastorino2017-01-232-1/+2
|\ | | | | | | | | y-yagi/do_not_run_git_init_when_specify_the_pretent_option do not run `git init` when specify the `pretend` option
| * do not run `git init` when specify the `pretend` optionyuuji.yaginuma2017-01-232-1/+2
|/ | | | | When specifying the `pretend` option, expect that no processing will be done, so do not execute `git init` as well.
* Merge two tests that needs to initialize Rails before accessing `Rails`Akira Matsuda2017-01-231-16/+1
| | | | | Fixes "NameError: uninitialized constant ApplicationTests::ConfigurationTests::CustomTest::Rails" when run individually
* Merge pull request #27766 from ↵Jon Moss2017-01-221-1/+1
|\ | | | | | | | | kenta-s/add-module-name-to-backtrace-cleaner-sample-code Add module name to BacktraceCleaner usage example [ci skip]
| * Add module name to BacktraceCleaner usage example [ci skip]kenta-s2017-01-221-1/+1
| |
* | Merge pull request #27768 from kirs/am-decimal-castGuillermo Iguaran2017-01-221-1/+2
|\ \ | | | | | | Make BigDecimal casting consistent on different platforms
| * | Make BigDecimal casting consistent on different platformsKir Shatrov2017-01-221-1/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now it behaves differently on JRuby: ``` --- expected +++ actual @@ -1 +1 @@ -#<BigDecimal:5f3c866c,'0.333333333333333333',18(20)> +#<BigDecimal:16e0afab,'0.3333333333333333',16(20)> ``` My initial PR (https://github.com/rails/rails/pull/27324) offered to let the precision to be decided by the platform and change the test expection, but other contributors suggested that we should change the default precision in Rails to be consistent of all platforms. The value (18) comes from the max default precision that comes from casting Rational(1/3) to BigDecimal.
* | Merge pull request #27763 from y-yagi/move_db_migrate_path_to_migration_moduleEileen M. Uchitelle2017-01-223-16/+8
|\ \ | | | | | | move `db_migrate_path` method to `Migration` module
| * | move `db_migrate_path` method to `Migration` moduleyuuji.yaginuma2017-01-223-16/+8
| |/ | | | | | | | | Since `Migration` module is included in both `MigrationGenerator` and `ModelGenerator`, no need to define a common method for each class.
* | Merge pull request #27764 from matrix9180/add_changelog_entry_for_27425Eileen M. Uchitelle2017-01-221-0/+6
|\ \ | |/ |/| Add changelog entry for #27425 [ci skip]
| * Add changelog entry for #27425 [ci skip]Chad Ingram2017-01-211-0/+6
|/
* Merge pull request #27760 from ↵Kasper Timm Hansen2017-01-211-2/+0
|\ | | | | | | | | kenta-s/remove-unnecessary-comments-in-cache_helper Remove unnecessary comments in cache_helper.rb [ci skip]
| * Remove unnecessary comments in cache_helper.rb [ci skip]kenta-s2017-01-211-2/+0
| |
* | Merge pull request #27761 from scottgonzalez/action-mailer-guideVipul A M2017-01-211-2/+2
|\ \ | | | | | | Clean up wording in Action Mailer Basics [ci skip]
| * | Clean up wording in Action Mailer Basics [ci skip]Scott González2017-01-211-2/+2
|/ /
* / Add examples for behaviour about redirection with and without options. Fixes ↵Vipul A M2017-01-211-0/+8
|/ | | | #27715 [ci skip] (#27730)
* Merge pull request #27751 from bogdanvlviv/add_missing_comment_outRafael França2017-01-201-1/+1
|\ | | | | add missing comment out [ci skip]
| * add missing comment out [ci skip]bogdanvlviv2017-01-201-1/+1
|/
* Merge pull request #27748 from y-yagi/add_missing_comment_outVipul A M2017-01-201-7/+7
|\ | | | | add missing comment out [ci skip]
| * add missing comment out [ci skip]yuuji.yaginuma2017-01-201-7/+7
| |
* | Merge pull request #27624 from elfassy/assert_enqueued_jobs_with_queue_levelGuillermo Iguaran2017-01-192-10/+45
|\ \ | | | | | | Specify the queue to be used with assert_enqueued_jobs
| * | assert_enqueued_jobs with queue optionMichael Elfassy2017-01-182-10/+45
| | |
* | | Merge pull request #27746 from kenta-s/add-missing-tests-for-template-textRafael França2017-01-191-0/+16
|\ \ \ | |_|/ |/| | Add missing tests for ActionView::Template::Text
| * | Add missing tests for ActionView::Template::Textkenta-s2017-01-201-0/+16
|/ /
* | Merge pull request #27742 from olivierlacan/patch-1Jon Moss2017-01-191-4/+6
|\ \ | | | | | | Mention ActiveRecord's config.example.yml
| * | Mention ActiveRecord's config.example.ymlOlivier Lacan2017-01-191-4/+6
|/ / | | | | | | This will help people figure out what credentials and tables are required to run ActiveRecord specs.
* | Merge pull request #27734 from y-yagi/update_create_table_statements_in_sqlite3Andrew White2017-01-191-2/+2
|\ \ | | | | | | update CREATE TABLE statements generated by `sqlite3` command
| * | update CREATE TABLE statements generated by `sqlite3` commandyuuji.yaginuma2017-01-191-2/+2
| | | | | | | | | | | | | | | | | | | | | From SQLite 3.16.0, `IF NOT EXISTS` set to CREATE TABLE statements. Ref: https://www.sqlite.org/src/info/c7021960f5c070fb Fixes #27635.
* | | Merge pull request #27733 from kenta-s/add-missing-argument-to-find_templatesAndrew White2017-01-191-2/+2
|\ \ \ | | | | | | | | `find_templates` should be able to handle 5 arguments
| * | | `find_templates` should be able to handle 5 argumentskenta-s2017-01-191-2/+2
| |/ /
* | | Merge pull request #27740 from kamipo/deprecate_internal_methodsAndrew White2017-01-196-13/+21
|\ \ \ | | | | | | | | Deprecate `initialize_schema_migrations_table` and `initialize_internal_metadata_table`
| * | | Deprecate `initialize_schema_migrations_table` and ↵Ryuta Kamizono2017-01-206-13/+21
| | | | | | | | | | | | | | | | | | | | | | | | `initialize_internal_metadata_table` These internal initialize methods are no longer used internally.
* | | | Merge pull request #27736 from Shopify/reduce-numeric-with-format-allocationsAndrew White2017-01-192-16/+19
|\ \ \ \ | |/ / / |/| | | Allocation free Integer#to_s
| * | | Allocation free Integer#to_sJean Boussier2017-01-192-16/+19
| | | |
* | | | Revert "Merge pull request #27718 from kamipo/remove_internal_public_methods"Matthew Draper2017-01-206-13/+18
| | | | | | | | | | | | | | | | | | | | This reverts commit 39c77eb1843f79925c7195e8869afc7cb7323682, reversing changes made to 9f6f51be78f8807e18fc6562c57af2fdbf8ccb56.
* | | | Merge pull request #27384 from matthewd/bigint-pk-tweaksMatthew Draper2017-01-205-9/+7
|\ \ \ \ | | | | | | | | | | Tweak bigint PK handling
| * | | | Tweak bigint PK handlingMatthew Draper2017-01-185-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Don't force PKs on tables that have explicitly opted out * All integer-like PKs are autoincrement unless they have an explicit default
* | | | | Make Yarn quieter during precompilation as that is typically run by a deploy ↵David Heinemeier Hansson2017-01-191-1/+1
| |/ / / |/| | | | | | | | | | | tool like Capistrano and we dont need the play-by-play
* | | | Merge pull request #27735 from kamipo/add_changelog_entry_for_24743Jon Moss2017-01-181-2/+6
|\ \ \ \ | |_|/ / |/| | | Add CHANGELOG entry for #24743
| * | | Add CHANGELOG entry for #24743Ryuta Kamizono2017-01-191-2/+6
|/ / /
* | | Merge pull request #27731 from maclover7/jm-fix-27719Jon Moss2017-01-181-8/+10
|\ \ \ | | | | | | | | Various style + grammar fixes for #27719
| * | | Various style + grammar fixes for #27719Jon Moss2017-01-181-8/+10
|/ / / | | | | | | | | | [ci skip]
* | | Use ActionDispatch::IntegrationTest http helper methodsAndrew White2017-01-181-45/+41
| | | | | | | | | | | | | | | | | | | | | | | | Mixing Rack::Test::Methods into ActionDispatch::IntegrationTest seems to trigger Ruby bug 13107[1]. By using our methods instead of rack-test we shouldn't trigger the bug in Forwardable. [1]: https://bugs.ruby-lang.org/issues/13107
* | | Merge pull request #27728 from y-yagi/only_enhance_when_task_is_definedEileen M. Uchitelle2017-01-181-1/+3
|\ \ \ | | | | | | | | only enhance when `assets:precompile` task is defined
| * | | only enhance when `assets:precompile` task is definedyuuji.yaginuma2017-01-181-1/+3
| | | |
* | | | Merge pull request #27727 from kenta-s/remove-todos-related-to-exceptronEileen M. Uchitelle2017-01-181-2/+0
|\ \ \ \ | | | | | | | | | | Remove TODOs related to Exceptron [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 15:19:29 +0000