aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | Merge pull request #29778 from yui-knk/fix_charset_docप्रथमेश Sonpatki2017-07-131-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | `Response#charset=` uses `default_charset` when `nil` is passedyui-knk2017-07-131-1/+1
| |/ / / / / / / / / / /
| * | | | | | | | | | | Merge pull request #29699 from lugray/represent_boolean_as_integerMatthew Draper2017-07-1212-8/+148
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Change sqlite3 boolean serialization to use 1 and 0Lisa Ugray2017-07-1112-8/+148
| * | | | | | | | | | | | 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
| |/ / / / / / /
* | | | | | | | Merge pull request #29995 from y-yagi/fix_test_runner_outputKasper Timm Hansen2017-07-302-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix test runner's outputyuuji.yaginuma2017-07-302-2/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #29823 from y-yagi/fix_record_not_unique_errorKasper Timm Hansen2017-07-171-20/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | Move `reset_pk_sequence!` test to `AdapterTestWithoutTransaction`yuuji.yaginuma2017-07-171-20/+20
|/ / / / / / / /
* | | | | | | | Merge pull request #29808 from y-yagi/reset_colun_information_after_schema_ch...Kasper Timm Hansen2017-07-161-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Reset column information after schema changedyuuji.yaginuma2017-07-161-0/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #29380 from y-yagi/insert_environment_value_to_table_befor...Kasper Timm Hansen2017-07-151-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Insert environment value to `InternalMetadata` after recreating the tableyuuji.yaginuma2017-06-091-0/+4
* | | | | | | | | Stupid empty line added after merge.Kasper Timm Hansen2017-07-151-1/+0
* | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \