aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #29764 from georgeclaghorn/third-party-cache-store-configMatthew Draper2017-07-121-1/+1
|\
| * Fix configuring third-party cache stores such as ActiveSupport::Cache::RedisS...George Claghorn2017-07-121-1/+1
|/
* normalize_path used to be nil tolerantAkira Matsuda2017-07-122-0/+5
* Merge pull request #29746 from kamipo/extract_fake_klassRafael França2017-07-113-52/+38
|\
| * Extract `FakeKlass` in `relation_test.rb` and `relation/mutation_test.rb`Ryuta Kamizono2017-07-113-52/+38
* | Merge pull request #29748 from koic/enable_layout_empty_line_after_magic_commentRafael França2017-07-11547-0/+549
|\ \
| * | [Action Record] `rubocop -a --only Layout/EmptyLineAfterMagicComment`Koichi ITO2017-07-113-0/+3
| * | [Action View] `rubocop -a --only Layout/EmptyLineAfterMagicComment`Koichi ITO2017-07-113-0/+3
| * | [Action Pack] `rubocop -a --only Layout/EmptyLineAfterMagicComment`Koichi ITO2017-07-1116-0/+16
| * | [Active Job] `rubocop -a --only Layout/EmptyLineAfterMagicComment`Koichi ITO2017-07-11100-0/+100
| * | [Active Support] `rubocop -a --only Layout/EmptyLineAfterMagicComment`Koichi ITO2017-07-11424-0/+424
| * | Enable Layout/EmptyLineAfterMagicComment copKoichi ITO2017-07-111-0/+3
* | | Merge pull request #29756 from yuki24/fix-englishRobin Dupret2017-07-111-1/+1
|\ \ \
| * | | Fix english for the rescue_from warning [ci skip]Yuki Nishijima2017-07-111-1/+1
|/ / /
* | | Merge pull request #29752 from palkan/masterMatthew Draper2017-07-121-1/+1
|\ \ \ | |/ / |/| |
| * | Fix postgresql adapter setup for ActionCable testspalkan2017-07-111-1/+1
|/ /
* | Merge pull request #29745 from y-yagi/fix_typo_in_method_nameMatthew Draper2017-07-111-1/+1
|\ \ | |/ |/|
| * Fix typo in method nameyuuji.yaginuma2017-07-111-1/+1
|/
* :scissors:Ryuta Kamizono2017-07-111-1/+0
* Add backticks for class names in CHANGELOG [ci skip]Ryuta Kamizono2017-07-111-3/+3
* Merge pull request #29742 from lugray/default_protect_from_forgeryRafael França2017-07-1010-4/+79
|\
| * Add ActionController::Base.skip_forgery_protectionLisa Ugray2017-07-102-0/+39
| * Protect from forgery by defaultLisa Ugray2017-07-109-4/+40
* | Merge pull request #29572 from kaspth/test-runner-no-eager-requireKasper Timm Hansen2017-07-1015-275/+251
|\ \ | |/ |/|
| * * Don't eagerly require Rails' minitest plugin.Kasper Timm Hansen2017-07-1015-275/+251
|/
* 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