aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Don't require 'unscope' to be the same for both sides of a 'or' relation.Dan Sherson2017-06-152-1/+26
|
* Merge pull request #29442 from DmytroVasin/rails-ujs-docsVipul A M2017-06-151-0/+29
|\ | | | | Update `working with javascript` readme to support rails-ujs behaviour. [ci skip]
| * Updated `working with javascript` readme to support the behavior of rails-ujs.Dmytro Vasin2017-06-151-0/+29
| |
* | Merge pull request #29409 from eugeneius/skip_test_uuid_column_defaultRafael França2017-06-151-1/+2
|\ \ | | | | | | Allow `uuid_test.rb` to be loaded on all adapters
| * | Allow `uuid_test.rb` to be loaded on all adaptersEugene Kenny2017-06-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Running `bin/test` from the activerecord directory produces this error: test/cases/adapters/postgresql/uuid_test.rb:43:in `<class:PostgresqlUUIDTest>': undefined method `supports_pgcrypto_uuid?' for #<ActiveRecord::ConnectionAdapters::SQLite3Adapter:0x007fc405e72a68> (NoMethodError) The test only actually runs on the PostgreSQL adapter; we can avoid triggering the error on other adapters with this `respond_to?` guard.
* | | Merge pull request #29452 from kamipo/prevent_extra_sync_with_transaction_stateRafael França2017-06-151-5/+2
|\ \ \ | | | | | | | | Prevent extra `sync_with_transaction_state`
| * | | Prevent extra `sync_with_transaction_state`Ryuta Kamizono2017-06-151-5/+2
| | | | | | | | | | | | | | | | | | | | `sync_with_transaction_state` in `to_key` is unneeded because `id` also does.
* | | | Merge pull request #29451 from vipulnsward/29441-flatten-defaultRafael França2017-06-142-1/+2
|\ \ \ \ | |/ / / |/| | | Allow translate default option to accept an array similar to i18n.t
| * | | Allow translate default option to accept an array similar to i18n.t. Fixes ↵Vipul A M2017-06-152-1/+2
| | | | | | | | | | | | | | | | #29441
* | | | Merge pull request #29378 from kamipo/avoid_overwriting_id_attribute_methodsRafael França2017-06-144-19/+24
|\ \ \ \ | | | | | | | | | | Avoid overwriting the methods of `AttributeMethods::PrimaryKey`
| * | | | Avoid overwriting the methods of `AttributeMethods::PrimaryKey`Ryuta Kamizono2017-06-074-19/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the methods of `AttributeMethods::PrimaryKey` are overwritten by `define_attribute_methods`. It will be broken if a table that customized primary key has non primary key id column. It should not be overwritten if a table has any primary key. Fixes #29350.
* | | | | Merge pull request #29417 from ↵Matthew Draper2017-06-1521-26/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bogdanvlviv/use-require_relative-instead-of_require-with-full-path Use `require_relative` instead of `require` with full path
| * | | | | Use `require_relative` instead of `require` with full pathbogdanvlviv2017-06-1421-26/+26
|/ / / / /
* | | | | Merge pull request #29438 from koic/add_migration_compatibility_testRafael França2017-06-131-0/+15
|\ \ \ \ \ | |_|/ / / |/| | | | Add test for backward compatibility when using change_table
| * | | | Add test for backward compatibility when using change_tableKoichi ITO2017-06-131-0/+15
|/ / / /
* | | | Merge pull request #29435 from y-yagi/fix_formatting_of_action_dispatchRyuta Kamizono2017-06-131-7/+7
|\ \ \ \ | |_|_|/ |/| | | Fix formatting of AD::FileHandler and AD::Static doc [ci skip]
| * | | Fix formatting of AD::FileHandler and AD::Static doc [ci skip]yuuji.yaginuma2017-06-131-7/+7
|/ / /
* | | Merge pull request #29289 from vergenzt/patch-1Vipul A M2017-06-121-0/+3
|\ \ \ | | | | | | | | Add note to Railtie docs to use unique filenames
| * | | Add note to Railtie docs to use unique filenamesTim Vergenz2017-06-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fact that the names need to be globally unique was not obvious to me, so I thought it'd be worth documenting. This not being clear was the cause of both ctran/annotate_models#468 and instructure/outrigger#1. [ci skip]
* | | | Merge pull request #29425 from gsamokovarov/drop-the-irb-termGuillermo Iguaran2017-06-121-1/+1
|\ \ \ \ | | | | | | | | | | Drop IRB out of the web-console Gemfile comment
| * | | | Drop IRB out of the web-console Gemfile commentGenadi Samokovarov2017-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't provide exactly the same experience as IRB does, so let's not advertize it like that. We can say that it's an interactive console, without further references. I have also followed byebug's comment and changed the calling `console` part. Hopefully, this can hint that the invocation is not view specific and you can use it like the debugger statement. [ci skip]
* | | | | Add brakeman to guides/additional resources. Fixes #29383 [ci skip] (#29427)Vipul A M2017-06-121-3/+4
| | | | |
* | | | | Merge pull request #29422 from y-yagi/fix_default_message_encrypto_cipherRyuta Kamizono2017-06-121-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix `Message::Encryptor` default cipher [ci skip]
| * | | | | Fix `Message::Encryptor` default cipher [ci skip]yuuji.yaginuma2017-06-121-1/+1
|/ / / / / | | | | | | | | | | | | | | | Follow up of #29263
* | | | | [ci skip] Add changelog entry for 6d402c6Kasper Timm Hansen2017-06-111-0/+7
| | | | | | | | | | | | | | | | | | | | [ Assain Jaleel & Kasper Timm Hansen ]
* | | | | Merge pull request #29263 from assain/default_message_encryptor_to_gcmKasper Timm Hansen2017-06-115-5/+30
|\ \ \ \ \ | | | | | | | | | | | | Default Message Encryptor Cipher to AES-256-GCM From AES-256-CBC
| * | | | | set message_encryptor default cipher to aes-256-gcmAssain2017-06-125-5/+30
| | | | | | | | | | | | | | | | | | | | | | | | - Introduce a method to select default cipher, and maintain backward compatibility
* | | | | | Merge pull request #29412 from y-yagi/fix_29014Kasper Timm Hansen2017-06-114-18/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | Generate field ids in `collection_check_boxes` and `collection_radio_buttons`
| * | | | | | Generate field ids in `collection_check_boxes` and `collection_radio_buttons`yuuji.yaginuma2017-06-114-18/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes sure that the labels are linked up with the fields. Fixes #29014
* | | | | | | Missing dots [ci skip] (#29414)Vipul A M2017-06-111-4/+4
| | | | | | |
* | | | | | | Merge pull request #29268 from gsamokovarov/delegate-missing-to-guidesVipul A M2017-06-111-0/+21
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Document Module#delegate_missing_to in the guides [ci skip]
| * | | | | | Document Module#delegate_missing_to in the guidesGenadi Samokovarov2017-06-111-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a small section for it in the `Active Support Core Extensions` guide. [ci skip]
* | | | | | | Access EDITOR through Ruby's cross-platform ENV.Kasper Timm Hansen2017-06-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the mistake of not using Ruby's ENV hash from the get go and get windows support.
* | | | | | | Cache: test coverage for cleanup behavior with local cache strategyEugene Kenny2017-06-102-1/+16
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | No need to pass `#cleanup` options through to `LocalCache#clear`. Fixes #29081. References #25628.
* | | | | | Revert #25628. Incomplete change + needs a deprecation cycle.Jeremy Daer2017-06-103-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/rails/rails/issues/29067#issuecomment-301342084 for rationale. This reverts commit b76f82d714e590c20370e72fa36fa574c4f17650. Fixes #29067. Fixes #29081.
* | | | | | Merge pull request #29406 from y-yagi/remove_null_allowed_optionRyuta Kamizono2017-06-101-2/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Remove `null_allowed` option from doc [ci skip]
| * | | | | Remove `null_allowed` option from doc [ci skip]yuuji.yaginuma2017-06-101-2/+1
|/ / / / / | | | | | | | | | | | | | | | This option was added in b9fa354. But it does not seem to work.
* | | | | Split up the cache test suite so it's easier to understand and extend (#29404)Jeremy Daer2017-06-1020-1359/+1383
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split up the caching tests as prep for adding a new cache store. Slices the mega test/caching_test.rb into behavior modules, concrete store tests, and cross-cutting store tests. Considering moving cache store behavior modules into lib/ so they may be used for acceptance testing by third parties.
* | | | | Merge pull request #29403 from yasslab/add-backquote-to-counter-cacheRichard Schneeman2017-06-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] Add backquote to :counter_cache option
| * | | | | [ci skip] Add backquote to :counter_cache optionYohei Yasukawa2017-06-101-1/+1
|/ / / / /
* | | | | Make i18n test match the description of the testGuillermo Iguaran2017-06-091-1/+1
| | | | |
* | | | | Merge pull request #29361 from metaskills/sqlserversetup-take2Guillermo Iguaran2017-06-091-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Ensure MSSQL password uses real ENV var.
| * | | | | Ensure MSSQL password uses real ENV var.Ken Collins2017-06-051-2/+2
| | | | | |
* | | | | | Merge pull request #29398 from ydakuka/patch-1Richard Schneeman2017-06-091-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ci skip] Fix another link in active_record_postgresql.md
| * | | | | | [ci skip] Fix link in active_record_postgresql.mdYauheni Dakuka2017-06-091-1/+1
|/ / / / / /
* | | | | | Merge pull request #29397 from ydakuka/patch-1Vipul A M2017-06-091-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix link in active_record_postgresql.md [ci skip]
| * | | | | | Fix link in active_record_postgresql.mdYauheni Dakuka2017-06-091-1/+1
| | | | | | |
* | | | | | | Merge pull request #29396 from ydakuka/patch-2Vipul A M2017-06-091-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | remove the extra comma in association_basics.md [ci skip]
| * | | | | | remove the extra comma in association_basics.mdYauheni Dakuka2017-06-091-1/+1
|/ / / / / /
* | | | | | Don't rely on the @view_renderer being defined.Kasper Timm Hansen2017-06-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | That won't be true for Action Pack and Action Mailer.
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-12 15:55:50 +0000