aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge pull request #25372 from kamipo/remove_assert_date_from_dbSean Griffin2016-06-132-5/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary `assert_date_from_db`
| * | | | | | | | | | | Remove unnecessary `assert_date_from_db`Ryuta Kamizono2016-06-122-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `assert_date_from_db` was added at 6a2104d for SQL Server. But latest sqlserver adapter work to pass expected behavior since 8e4624b.
* | | | | | | | | | | | Add codeclimate and rubocop config filesSean Griffin2016-06-132-0/+54
| |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're going to be experimenting with a new bot for them. This will not cause anything to start affecting new PRs yet, but it will have data sent to them so they can do "dry run" stuff on their end. The rubocop file is based on our documented style guide. I've only included rules which are either already consistently applied throughout the entire codebase, or where added lines should be following the guideline regardless of the surrounding code (such as hash syntax)
* | | | | | | | | | | Merge pull request #25380 from gsamokovarov/drop-unused-blank-requireKasper Timm Hansen2016-06-131-2/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove an unused require in ActiveSupport::TestCase
| * | | | | | | | | | | Remove an unused require in ActiveSupport::TestCaseGenadi Samokovarov2016-06-131-2/+0
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to have `assert_blank` and `assert_presence`. [ci skip]
* | | | | | | | | | | Merge pull request #25378 from nikhilthombare/patch-1प्रथमेश Sonpatki2016-06-121-11/+11
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | Changed ActiveJob::Base to ApplicationJob in the Active Job guide [ci…
| * | | | | | | | | | Changed ActiveJob::Base to ApplicationJob in the Active Job guide [ci skip] Nikhil Thombare2016-06-131-11/+11
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | @prathamesh-sonpatki
* | | | | | | | | | Merge pull request #25362 from maclover7/jm-rm-ar-requireEileen M. Uchitelle2016-06-121-2/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary model requires
| * | | | | | | | | | Remove unnecessary model requiresJon Moss2016-06-101-2/+0
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #25371 from kamipo/remove_outdated_commentEileen M. Uchitelle2016-06-121-12/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove outdated comments [ci skip]
| * | | | | | | | | | | Remove outdated comments [ci skip]Ryuta Kamizono2016-06-121-12/+0
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These comments were added at dd257a3ccb30ab181cd48d3d81bc7f23bb45f36f but outdated since #2086.
* | | | | | | | | | | Merge pull request #25004 from ↵Eileen M. Uchitelle2016-06-125-0/+44
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | y-yagi/generate_mailer_layout_files_if_it_does_not_already_exist generate mailer layout files if it does not already exist
| * | | | | | | | | | generate mailer layout files if it does not already existyuuji.yaginuma2016-05-155-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, if `ApplicationMailer` does not exist, it is generated when run the mailer generator, but layouts files does not generate. However, because it uses the layouts in `ApplicationMailer`, layouts are required. Follow up to #24161
* | | | | | | | | | | Merge pull request #25366 from prathamesh-sonpatki/update-release-notes-2Rafael França2016-06-111-1/+19
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add missing things to Rails 5.0 release notes [ci skip]
| * | | | | | | | | | | Add missing things to Rails 5.0 release notes [ci skip]Prathamesh Sonpatki2016-06-111-1/+19
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - https://github.com/rails/rails/pull/18288. - https://github.com/rails/rails/commit/da9038e. - https://github.com/rails/rails/commit/78dab2a8569408658542e462a957ea5a35aa4679. - https://github.com/rails/rails/pull/9065. - https://github.com/rails/rails/pull/18314. - https://github.com/rails/rails/pull/13434.
* | | | | | | | | | | Merge pull request #25367 from ↵Rafael França2016-06-112-1/+26
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stephenminded/active_job_test_helper_custom_queue_adapter Provide the ability to override the queue adapter used by jobs under test
| * | | | | | | | | | | Provide the ability to override the queue adapter used by jobs underSteve Lounsbury2016-06-112-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test. This PR adds a method called `queue_adapter_for_test` to `ActiveJob::TestHelper`. This method is expected to provide the queue adapter to be used for jobs under test. It maintains the current behaviour by defaulting to an instance of `ActiveJob::QueueAdapter::TestAdapter`. Tests that include `ActiveJob::TestHelper` or extend from `ActiveJob::TestCase` can provide a custom queue adapter by overriding `queue_adapter_for_test` in their class.
* | | | | | | | | | | | Merge pull request #25368 from frodsan/patch-1Rafael França2016-06-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | Fix typo
| * | | | | | | | | | | Fix typoFrancesco Rodriguez2016-06-121-1/+1
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | Merge pull request #25363 from kamipo/fix_or_result_sqlVipul A M2016-06-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | Fix `or` result SQL [ci skip]
| * | | | | | | | | | Fix `or` result SQL [ci skip]Ryuta Kamizono2016-06-111-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #25361 from maclover7/jm-rm-stuffSean Griffin2016-06-101-11/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Remove `_run_class_setup`
| * | | | | | | | | | Remove `_run_class_setup`Jon Moss2016-06-101-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should have been removed by 3073c531983de243219fb55be93fbcebfdd9c44e.
* | | | | | | | | | | Merge pull request #25321 from prathamesh-sonpatki/update-release-notes-1Rafael França2016-06-101-10/+33
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | Add missing things to release notes [ci skip]
| * | | | | | | | | | Add missing things to release notes [ci skip]Prathamesh Sonpatki2016-06-071-10/+33
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - https://github.com/rails/rails/pull/18721 - https://github.com/rails/rails/pull/11898 - https://github.com/rails/rails/pull/18194 - https://github.com/rails/rails/pull/18225 - https://github.com/rails/rails/pull/18244 - https://github.com/rails/rails/commit/edc2b7718725016e988089b5fb6d6fb9d6e16882 - https://github.com/rails/rails/pull/19686
* | | | | | | | | | Make sure the yielded variable is the loggerRafael Mendonça França2016-06-102-4/+6
| | | | | | | | | |
* | | | | | | | | | Merge pull request #25351 from kmcphillips/asset-default-config-quietRafael França2016-06-101-0/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add config.assets.quiet = true as default for generator
| * | | | | | | | | | Add config.assets.quiet = true as default valueKevin McPhillips2016-06-101-0/+3
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #25341 from kmcphillips/masterRafael França2016-06-103-34/+124
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Broadcast #silence on ActiveSupport::Logger
| * | | | | | | | | | | Be explicit about what Logger class is expectedKevin McPhillips2016-06-091-3/+3
| | | | | | | | | | | |
| * | | | | | | | | | | Broadcast #silence on logger. Rewrite tests.Kevin McPhillips2016-06-092-31/+121
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #25352 from Shopify/optimized-delegateRafael França2016-06-101-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Replace Kernel#caller by the faster Kernel#caller_locations
| * | | | | | | | | | | | Replace Kernel#caller by the faster Kernel#caller_locationsJean Boussier2016-06-101-2/+2
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #25342 from Edouard-chin/callbacks-wrong-method-nameVipul A M2016-06-101-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | [ci skip] `define_model_callbacks` only exist in active model
| * | | | | | | | | | | [ci skip] `define_model_callbacks` only exist in active model:Edouard CHIN2016-06-101-1/+6
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Also added a note when calling multiple time `define_callbacks`
* | | | | | | | | | | Merge pull request #25348 from alexcameron89/masterJon Moss2016-06-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | Fix typo in ActionController::Renderer [ci skip]
| * | | | | | | | | | Fix typo in ActionController::Renderer [ci skip]Alex Kitchens2016-06-101-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #25338 from jwworth/fix_typo_sucker_punch_1465507047Jon Moss2016-06-091-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | Fix Typo in `SuckerPunchAdapter`
| * | | | | | | | | Fix typo, `of of` -> `of` [ci skip]Jake Worth2016-06-091-1/+1
|/ / / / / / / / /
* | | | | | | | | Remove dead code from testsSean Griffin2016-06-091-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code was added in 81286f858770e0b95e15af37f19156b044ec6a95, but was not used by that commit and does not appear to have ever been used.
* | | | | | | | | render_to_string Regression Outside of Real Requests in Rails 5.0.0.rc1 (#25308)Brandon Medenwald2016-06-092-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Restore the functionality of PR#14129, but do so with not nil to better indicate the purpose of the conditional * Add a test when render_to_string called on ActionController::Base.new()
* | | | | | | | | Merge pull request #25329 from ↵Sean Griffin2016-06-091-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | yahonda/allow_oracle_bind_value_syntax_in_loj_test Allow Oracle bind parameter syntax `:a1` in test_join_conditions_added_to_join_clause
| * | | | | | | | | Allow Oracle bind parameter syntax `:a1`Yasuo Honda2016-06-081-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #25334 from abhishekjain16/doc_fixSean Griffin2016-06-091-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix typo
| * | | | | | | | | | Fix typoAbhishek Jain2016-06-091-2/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #25335 from y-yagi/remove_deprecated_prefix_optionVipul A M2016-06-081-2/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | remove deprecated `:prefix` option from doc [ci skip]
| * | | | | | | | | | | remove deprecated `:prefix` option from doc [ci skip]yuuji.yaginuma2016-06-091-2/+0
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The option was deprecated in #21191.
* | | | | | | | | | | Merge pull request #25332 from abhishekjain16/test_fixRafael França2016-06-092-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | existant => existent
| * | | | | | | | | | existant => existentAbhishek Jain2016-06-092-3/+3
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #25315 from schneems/schneems/inclusion-docRichard Schneeman2016-06-081-3/+9
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ci skip] Expand information on message options
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 22:58:05 +0000