aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix recursive templatesAaron Patterson2016-02-162-22/+43
|
* pull template check up to match existing behaviorAaron Patterson2016-02-162-14/+14
| | | | also remove the EMPTY node since we won't need it
* introduce a `tree` factory method for creating the dep treeAaron Patterson2016-02-162-0/+62
| | | | also add an EMPTY sentinel node
* Merge pull request #23661 from meinac/add_gzip_mime_typeRichard Schneeman2016-02-163-1/+6
|\ | | | | application/gzip added as default mime type into mime type list
| * application/gzip added as default mime type into mime type listMehmet Emin İNAÇ2016-02-133-1/+6
| |
* | Merge pull request #23705 from chi6rag/masterVipul A M2016-02-171-1/+5
|\ \ | | | | | | [ci skip] Updating edge rails guides to include `on_weekday?` on Date, Time and DateTime
| * | [ci skip] Updating edge rails guides to include `on_weekday?` on Date, Time ↵Chirag Aggarwal2016-02-171-1/+5
|/ / | | | | | | | | | | and DateTime [ci skip] Adding `on_weekend?` method in edge rails guides
* | Merge pull request #23203 from vipulnsward/22979-show-tags-on-exceptionRichard Schneeman2016-02-163-12/+16
|\ \ | | | | | | WIP: Errors in logs should show log tags as well.
| * | WIP: Errors in logs should show log tags as well.Vipul A M2016-02-123-12/+16
| | | | | | | | | | | | | | | | | | | | | - Changed formatted_code_for to return array of logs to be tagged for each line - Changed some render tests to match new behaviour of return Fixes #22979
* | | Merge pull request #23630 from akshaymohite/correct-test-name-api-onlyYves Senn2016-02-161-1/+1
|\ \ \ | | | | | | | | Correct config option from only_api to api_only in test
| * | | Correct config option from only_api to api_only in testAkshay2016-02-121-1/+1
| |/ /
* | | fix class name typo.Yves Senn2016-02-162-3/+3
| | |
* | | Merge pull request #23614 from georgemillo/foreign_keyYves Senn2016-02-163-2/+23
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Let t.foreign_key use the same `to_table` twice Conflicts: activerecord/CHANGELOG.md
| * | | Let t.foreign_key use the same `to_table` twiceGeorge Millo2016-02-153-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously if you used `t.foreign_key` twice within the same `create_table` block using the same `to_table`, all statements except the final one would fail silently. For example, the following code: def change create_table :flights do |t| t.integer :from_id, index: true, null: false t.integer :to_id, index: true, null: false t.foreign_key :airports, column: :from_id t.foreign_key :airports, column: :to_id end end Would only create one foreign key, on the column `from_id`. This commit allows multiple foreign keys to the same table to be created within one `create_table` block.
* | | | reset `ActionMailer::Base.deliveries` in `ActionDispatch::IntegrationTest`.Yves Senn2016-02-165-4/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever you are sending emails in integration tests using the `:test` delivery method you need to make sure that `ActionMailer::Base.deliveries` is reset after every test. This piece of boilerplate code is present in all my applications that send emails. Let's have `ActionDispatch::IntegrationTest` reset the deliveries automatically.
* | | | Merge pull request #23692 from abhishekjain16/docsYves Senn2016-02-163-3/+3
|\ \ \ \ | | | | | | | | | | Use a URL instead of an URL everywhere
| * | | | Use a URL instead of an URL everywhereAbhishek Jain2016-02-153-3/+3
| | | | |
* | | | | Merge pull request #23706 from vipulnsward/add-changelog-for-regressionYves Senn2016-02-161-2/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Add missing CHANGELOG for regression fix in #18155 which fixes #13387
| * | | | | Add missing CHANGELOG for regression fix in #18155 which fixes #13387Vipul A M2016-02-161-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Remove unused test controller actionAndrew White2016-02-161-5/+0
| | | | | |
* | | | | | Merge pull request #22828 from ma2gedev/should-escape-cookieAndrew White2016-02-162-1/+21
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | A cookie value is incorrect if value contains an escapable string in Rails 5 ActionController::TestCase
| * | | | | Join values using '; ' as per RFC specAndrew White2016-02-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiple cookie values should be separated by '; ' according to RFC 6265, section 5.4.4[1]. [1]: https://tools.ietf.org/html/rfc6265#section-5.4
| * | | | | Add require and move escape to private methodAndrew White2016-02-161-1/+6
| | | | | |
| * | | | | Move test for #22828 into it's own testAndrew White2016-02-161-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `cookies` hash isn't updated with the value generated by the output from `to_header` so it wasn't testing anything. Rendering the cookie value in the controller makes sure that the escaping is actually working.
| * | | | | Merge branch 'should-escape-cookie' of https://github.com/ma2gedev/rails ↵Andrew White2016-02-162-1/+8
|/| | | | | | | | | | | | | | | | | | | | | | | into ma2gedev-should-escape-cookie
| * | | | | Escape cookie's key and value in ActionController::TestCaseTakayuki Matsubara2015-12-302-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get an incorrect cookie value in controller action method if cookie value contains an escapable string.
* | | | | | fix more failing tests due to 07e422f ... :pray:Yves Senn2016-02-151-2/+2
| | | | | |
* | | | | | fixing the build take II. :sweat:Yves Senn2016-02-151-1/+1
| | | | | |
* | | | | | fix build broken by 07e422f58d61da0.Yves Senn2016-02-151-1/+1
| | | | | |
* | | | | | Merge pull request #23631 from y-yagi/generate_mailer_views_in_apiYves Senn2016-02-154-4/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | generate mailer views in Rails API
| * | | | | | generate mailer views in Rails APIyuuji.yaginuma2016-02-154-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | View files is necessary to send mail, it should be generated even Rails API. Fixes #23617
* | | | | | | test runner, relay minitest information about the error location.Yves Senn2016-02-152-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow-up to ea70c29 to bring back the assertion error location information provided by minitest.
* | | | | | | Revert "Prefer Minitest's location for test failures."Yves Senn2016-02-152-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0db310586ac3e15be95d2ef27ff40cfa24c05c10. Closes #23686. Conflicts: railties/test/application/test_runner_test.rb It's possible that the `result.location` returned by minitest is outside the test file itself. For example in the case of mocha. This resulted in bad rerun snipptets: ``` bin/rails test app/models/deliveries/delivery.rb:103 ``` Let's always use the first line of the failed test-case in our rerun snippet. We can display the line number of the assertion error elsewhere.
* | | | | | | Merge pull request #23688 from meinac/guide_typo_fixEileen M. Uchitelle2016-02-153-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix small typo in i18n guide [ci skip]
| * | | | | | | Fix small typo in Rails guides [ci skip]Mehmet Emin İNAÇ2016-02-153-3/+3
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #23687 from vipulnsward/add-on-weekdayDavid Heinemeier Hansson2016-02-154-1/+24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add `#on_weekday?` method to `Date`, `Time`, and `DateTime`.
| * | | | | | | Add `#on_weekday?` method to `Date`, `Time`, and `DateTime`.Vipul A M2016-02-154-1/+24
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #23684 from vs4vijay/masterEileen M. Uchitelle2016-02-151-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Corrected secret_key_base
| * | | | | | Corrected secret_key_basevs4vijay2016-02-151-1/+1
|/ / / / / /
* | | | | | Merge pull request #23569 from Gaurav2728/no_doc_of_some_railtie_methodsVipul A M2016-02-151-4/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | mark as #:nodoc: [ci skip]
| * | | | | | mark as #:nodoc: [ci skip]Gaurav Sharma2016-02-151-4/+7
| | | | | | | | | | | | | | | | | | | | | can’t be instantiate directly or may be no need for doc.
* | | | | | | Merge pull request #23664 from y-yagi/remove_test_order_from_environment_fileYves Senn2016-02-151-3/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | remove `active_support.test_order` from environment file
| * | | | | | | remove `active_support.test_order` from environment fileyuuji.yaginuma2016-02-141-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default test order has been changed to `:random` in 5f777e4b5ee2e3e8e6fd0e2a208ec2a4d25a960d. Therefore, it is no more need to be specified in the environment file.
* | | | | | | | Merge pull request #23667 from meinac/remove_override_methodYves Senn2016-02-151-13/+0
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Remove the method already overridden by private method
| * | | | | | | Remove the method already overridden by private methodMehmet Emin İNAÇ2016-02-141-13/+0
| |/ / / / / /
* | | | | | | Merge pull request #23670 from yui-knk/update_dalliYves Senn2016-02-151-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update dalli gem
| * | | | | | | Update dalli gemyui-knk2016-02-141-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dalli 2.7.6 fixed deprecation warning caused by using `Rack::Session::Abstract::ID`. This commit suppress warnings on ActionPack tests. See: https://github.com/petergoldstein/dalli/commit/9874a7c3ad67eb1e31cafba0a51966db4f0c7e42
* | | | | | | Merge pull request #23678 from kamipo/remove_deprecated_never_unpermitted_paramsEileen M. Uchitelle2016-02-142-16/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove `const_missing` which fallback to deprecated `NEVER_UNPERMITTED_PARAMS`
| * | | | | | | Remove `const_missing` which fallback to deprecated `NEVER_UNPERMITTED_PARAMS`Ryuta Kamizono2016-02-152-16/+0
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | `NEVER_UNPERMITTED_PARAMS` is deprecated in Rails 4.2. See #15933.
* | | | | | | Merge pull request #23505 from kaspth/inject-rails-config-through-railtieKasper Timm Hansen2016-02-146-54/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Inject Rails related configuration through Railtie
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-06 10:15:42 +0000