aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Bump minitest; Use double quotesKasper Timm Hansen2017-07-152-2/+2
* Merge branch 'master' into unlock-minitestKasper Timm Hansen2017-07-151037-3778/+6367
|\
| * Added time helper method `freeze_time` which is an alias for `travel_to Time....प्रथमेश Sonpatki2017-07-103-0/+47
| * Merge pull request #29735 from y-yagi/make_sidekiq_and_resque_integration_tes...Kasper Timm Hansen2017-07-102-1/+9
| |\
| | * Make sidekiq and resque integration tests work in CIyuuji.yaginuma2017-07-102-1/+9
| |/
| * Merge pull request #29733 from kirs/frozen-activejobMatthew Draper2017-07-10102-0/+102
| |\
| | * Use frozen-string-literal in ActiveJobKir Shatrov2017-07-09102-0/+102
| |/
| * Merge pull request #29731 from castrodd/patch-1Kasper Timm Hansen2017-07-091-2/+2
| |\
| | * [ci skip] Updated language on validations.Daniel Castro2017-07-091-2/+2
| * | Merge pull request #29730 from bdewater/update-encryptor-docsKasper Timm Hansen2017-07-091-5/+6
| |\ \ | | |/ | |/|
| | * [ci skip] update MessageEncryptor example to use the key length as returned b...Bart de Water2017-07-091-5/+6
| * | Merge pull request #29721 from y-yagi/fix_29696Kasper Timm Hansen2017-07-092-2/+36
| |\ \
| | * | Treat secrets as binaryyuuji.yaginuma2017-07-092-2/+36
| * | | Merge pull request #29725 from y-yagi/fix_29717Kasper Timm Hansen2017-07-093-0/+73
| |\ \ \
| | * | | Load environment file in `dbconsole` commandyuuji.yaginuma2017-07-093-0/+73
| | |/ /
| * | | Merge pull request #29655 from kirs/frozen-friendly-ap-arMatthew Draper2017-07-1018-19/+37
| |\ \ \
| | * | | Prepare AP and AR to be frozen string friendlyKir Shatrov2017-07-0618-19/+37
| * | | | Merge pull request #29728 from kirs/frozen-activesupportMatthew Draper2017-07-09429-0/+434
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Use frozen-string-literal in ActiveSupportKir Shatrov2017-07-09429-0/+434
| | |/ /
| * | | Merge pull request #29715 from reverbdotcom/ptd/fix-invalid-uuidsMatthew Draper2017-07-092-2/+4
| |\ \ \
| | * | | Don't allow uuids with orphan curly bracespdebelak2017-07-072-2/+4
| * | | | Add backticks [ci skip]Ryuta Kamizono2017-07-091-2/+2
| * | | | Merge pull request #28867 from eugeneius/skip_query_cache_in_batchesMatthew Draper2017-07-0911-20/+224
| |\ \ \ \
| | * | | | Skip query cache for in_batches and friendsEugene Kenny2017-07-0610-20/+216
| * | | | | Merge pull request #29692 from fimmtiu/avoid-translating-non-database-exceptionsMatthew Draper2017-07-093-2/+31
| |\ \ \ \ \
| | * | | | | Remove driver-specific hard-coding in the tests.Dennis Taylor2017-07-071-9/+1
| | * | | | | Rename the StatementInvalid test method for clarity.Dennis Taylor2017-07-071-1/+1
| | * | | | | Fix changelog wording as suggested.Dennis Taylor2017-07-071-2/+2
| | * | | | | Use StandardError instead of RuntimeError.Dennis Taylor2017-07-061-2/+2
| | * | | | | Fix indentation style for private method.Dennis Taylor2017-07-051-5/+5
| | * | | | | Don't translate non-database exceptions.Dennis Taylor2017-07-053-2/+39
| | |/ / / /
| * | | | | Merge pull request #29297 from palkan/fix/action-cable-postgres-identifiers-l...Matthew Draper2017-07-093-3/+31
| |\ \ \ \ \
| | * | | | | [Fix #28751] Hash stream long stream identifiers when using Postgres adapterpalkan2017-07-063-3/+31
| | |/ / / /
| * | | | | Merge pull request #29495 from eugeneius/_write_attributeMatthew Draper2017-07-096-13/+19
| |\ \ \ \ \
| | * | | | | Rename raw_write_attribute to write_attribute_without_type_castEugene Kenny2017-07-073-8/+8
| | * | | | | Improve the performance of writing attributesEugene Kenny2017-06-184-8/+14
| * | | | | | Merge pull request #29695 from y-yagi/secrets_showMatthew Draper2017-07-094-1/+22
| |\ \ \ \ \ \
| | * | | | | | Add `rails secrets:show` commandyuuji.yaginuma2017-07-074-1/+22
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #29705 from y-yagi/do_not_update_secrets_yml_encMatthew Draper2017-07-092-1/+21
| |\ \ \ \ \ \
| | * | | | | | Do not update `secrets.yml.enc` when secretes do not changeyuuji.yaginuma2017-07-072-1/+21
| | |/ / / / /
| * | | | | | Merge pull request #29706 from kamipo/use_information_schema_to_extract_expre...Matthew Draper2017-07-092-2/+2
| |\ \ \ \ \ \
| | * | | | | | Use `information_schema` to extract `generation_expression` for MariaDBRyuta Kamizono2017-07-072-2/+2
| * | | | | | | Merge pull request #29708 from kamipo/fix_current_timestamp_for_mariadbMatthew Draper2017-07-091-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Fix default `CURRENT_TIMESTAMP` in schema dumping for MariaDB 10.2Ryuta Kamizono2017-07-071-2/+2
| | |/ / / / / /
| * | | | | | | Merge pull request #29718 from ragesoss/masterRichard Schneeman2017-07-081-2/+20
| |\ \ \ \ \ \ \
| | * | | | | | | Clarify i18n guide for how pluralization rules work by defaultSage Ross2017-07-071-2/+20
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Don't call register on custom driverseileencodes2017-07-082-5/+5
| * | | | | | | Merge pull request #29680 from koic/update_default_app_files_in_app_generator...Eileen M. Uchitelle2017-07-081-2/+40
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Update default app files in app_generator_testKoichi ITO2017-07-061-2/+40
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #29714 from jahfer/implement-errors-mergeRafael França2017-07-073-0/+28
| |\ \ \ \ \ \