aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Stick with the RUBY_VERSION check on stopgap_13632Matthew Draper2017-09-152-3/+1
* Bump Travis to new Ruby releasesMatthew Draper2017-09-152-11/+11
* Inline the lone add_master_key_file_silently use.Kasper Timm Hansen2017-09-141-5/+1
* Merge pull request #30582 from y-yagi/do_no_add_master_key_and_credentialsKasper Timm Hansen2017-09-141-0/+4
|\
| * Do not add master key and credentials when `pretend` option is specifiedyuuji.yaginuma2017-09-121-0/+4
* | Merge pull request #30581 from y-yagi/do_not_add_master_key_twice_to_gitignoreKasper Timm Hansen2017-09-144-17/+45
|\ \
| * | Make master key added to gitignore the same value as when creating appplicationyuuji.yaginuma2017-09-144-17/+45
| |/
* | Avoid making HTTP requests to generate signed URLs for GCS objectsGeorge Claghorn2017-09-131-3/+3
* | Remove unused explicit delegation to `klass` in `relation`Ryuta Kamizono2017-09-143-8/+2
* | Don't use `collection.table_name` in `collection_cache_key`Ryuta Kamizono2017-09-142-1/+19
* | Merge pull request #30598 from yhirano55/update_activejob_basicsRyuta Kamizono2017-09-141-0/+1
|\ \
| * | Update Active Job Basics [ci skip]Yoshiyuki Hirano2017-09-141-0/+1
* | | Don't use `quoted_table_name` in `limited_ids_for`Ryuta Kamizono2017-09-142-2/+8
* | | Merge pull request #30596 from yahonda/address_test_or_with_bind_params_failureRyuta Kamizono2017-09-141-1/+1
|\ \ \
| * | | Address random `test_or_with_bind_params` failuresYasuo Honda2017-09-131-1/+1
* | | | `quoted_table_name` doesn't respect table aliasRyuta Kamizono2017-09-142-1/+12
|/ / /
* | | Make `in_batches` queries to preparableRyuta Kamizono2017-09-141-3/+10
* | | [ci skip] Prefer credentials to secrets in docs.Kasper Timm Hansen2017-09-138-80/+45
* | | Merge pull request #30591 from yhirano55/update_getting_startedVipul A M2017-09-131-0/+2
|\ \ \ | |/ / |/| |
| * | Update Getting Started with Rails [ci skip]Yoshiyuki Hirano2017-09-141-0/+2
|/ /
* | Merge pull request #30568 from starknx/fix-active-storage-firefoxJavan Makhmali2017-09-133-1/+3
|\ \
| * | Fix activestorage direct upload on firefox_N_I_X_O_N_2017-09-123-1/+3
* | | Merge pull request #30587 from ydakuka/fix-created-atप्रथमेश Sonpatki2017-09-131-1/+1
|\ \ \ | |/ / |/| |
| * | Fix created_at [ci skip]Yauheni Dakuka2017-09-131-1/+1
|/ /
* | Use escaped character in regexpyhirano552017-09-111-1/+1
* | Rename activestorage/test/service/configurations.yml to activestorage/test/se...George Claghorn2017-09-111-0/+0
* | Ignore activestorage/test/service/configurations.ymlGeorge Claghorn2017-09-111-0/+1
|/
* Add credentials using a generic EncryptedConfiguration class (#30067)David Heinemeier Hansson2017-09-1128-123/+678
* Merge pull request #30564 from tgxworld/fix_incorrect_memoizationRyuta Kamizono2017-09-111-1/+5
|\
| * PERF: Incorrect memoization in `ActiveRecord::Associations::Preloader::Associ...Guo Xiang Tan2017-09-111-1/+5
|/
* Merge pull request #30563 from y-yagi/remove_not_used_gems_by_defaultRyuta Kamizono2017-09-111-2/+0
|\
| * Remove not used gems by default [ci skip]yuuji.yaginuma2017-09-111-2/+0
|/
* Use v3 of the AWS SDKYuji Yaginuma2017-09-093-10/+15
* Merge pull request #30552 from y-yagi/remove_needless_silence_warningsRyuta Kamizono2017-09-093-17/+3
|\
| * Remove needless `silence_warnings`yuuji.yaginuma2017-09-093-17/+3
|/
* Merge pull request #30536 from y-yagi/reorganize_secrets_testMatthew Draper2017-09-082-18/+20
|\
| * Remove unused `fork` arg for `rails`yuuji.yaginuma2017-09-081-4/+2
| * Reorganize secrets test to use only `isolation/abstract_unit`yuuji.yaginuma2017-09-071-14/+18
* | Merge pull request #30540 from y-yagi/do_not_install_unused_gemRyuta Kamizono2017-09-082-9/+1
|\ \
| * | Do not install unused gemyuuji.yaginuma2017-09-082-9/+1
| |/
* | Merge pull request #30524 from tgxworld/recover_plucK_performanceSean Griffin2017-09-071-14/+17
|\ \
| * | PERF: Recover `ActiveRecord::pluck` performance.Guo Xiang Tan2017-09-061-14/+17
* | | Remove unnecessary `join_type` in `AssociationScope`Ryuta Kamizono2017-09-081-5/+1
* | | Remove duplicated `klass` method in `AssociationReflection`Ryuta Kamizono2017-09-081-16/+11
* | | Remove unused `primary_key_type` and `quoted_table_name` in `Reflection`Ryuta Kamizono2017-09-081-8/+0
* | | Add an extra assertion to ensure dumping schema default as expectedRyuta Kamizono2017-09-081-1/+4
* | | Fix `quote_default_expression` for UUID with array defaultRyuta Kamizono2017-09-082-1/+11
* | | Merge pull request #30538 from koic/ci_against_jruby_9_1_13_0Guillermo Iguaran2017-09-061-3/+3
|\ \ \
| * | | CI against JRuby 9.1.13.0Koichi ITO2017-09-071-3/+3
|/ / /
* | | Don't pass `table` to `last_chain_scope` and `next_chain_scope`Ryuta Kamizono2017-09-072-19/+17