aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | Remove extra `.merge!(order: "id")` for `Relation#first` in testsRyuta Kamizono2017-07-132-32/+28
* | | | | | | | | | | | | | Merge pull request #29770 from y-yagi/fix_boolean_column_migration_scriptKasper Timm Hansen2017-07-153-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix boolean column migration scriptyuuji.yaginuma2017-07-133-3/+3
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #29802 from EmmaB/masterKasper Timm Hansen2017-07-151-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Remove redundant instances of the word 'simply' from documentation, on the ba...Emma Barnes2017-07-151-4/+4
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #29798 from kamipo/remove_useless_aliased_table_nameKasper Timm Hansen2017-07-154-18/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Remove useless `aliased_table_name` in `JoinDependency`Ryuta Kamizono2017-07-154-18/+1
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #29800 from koic/remove_encoding_utf8_magic_commentKasper Timm Hansen2017-07-152-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove encoding utf-8 magic commentKoichi ITO2017-07-152-2/+0
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #29797 from y-yagi/fix_doc_format_for_time_helpersRyuta Kamizono2017-07-151-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix doc format for `ActiveSupport::Testing::TimeHelpers` [ci skip]yuuji.yaginuma2017-07-151-2/+2
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #29786 from willnet/remove-javascript_link_tag-optionsRyuta Kamizono2017-07-141-32/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | [ci skip]Remove options of javascript_link_tag and stylesheet_link_tag in guideswillnet2017-07-141-32/+0
|/ / / / / / / / / / /
| | | | * | | | | | | Add CHANGELOG entry [skip ci]Erol Fornoles2017-03-061-0/+4
| | | | * | | | | | | Use method from HashErol Fornoles2017-03-061-1/+1
| | | | * | | | | | | Make the order of Hash#reverse_merge! consistent with HashWithIndifferentAccessErol Fornoles2017-03-062-4/+6
| | | | | | | | | * | Bugfix: unscope(where: [columns]) would not remove the correct binds sometimesMaxime Lapointe2017-07-133-2/+34
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #29772 from y-yagi/allow_to_edit_secrets_in_mutiple_applic...Kasper Timm Hansen2017-07-131-1/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Allow to edit secrets in mutiple apps at the same timeyuuji.yaginuma2017-07-131-1/+2
| |/ / / / / / / / /
* | | | | | | | | | 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
|/ / / / / /
* | | | | | 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
|\ \ \ \ \ \