| Commit message (Expand) | Author | Age | Files | Lines |
* | [ci skip]Remove options of javascript_link_tag and stylesheet_link_tag in guides | willnet | 2017-07-14 | 1 | -32/+0 |
* | Merge pull request #29772 from y-yagi/allow_to_edit_secrets_in_mutiple_applic... | Kasper Timm Hansen | 2017-07-13 | 1 | -1/+2 |
|\ |
|
| * | Allow to edit secrets in mutiple apps at the same time | yuuji.yaginuma | 2017-07-13 | 1 | -1/+2 |
* | | Merge pull request #29778 from yui-knk/fix_charset_doc | प्रथमेश Sonpatki | 2017-07-13 | 1 | -1/+1 |
|\ \
| |/
|/| |
|
| * | `Response#charset=` uses `default_charset` when `nil` is passed | yui-knk | 2017-07-13 | 1 | -1/+1 |
|/ |
|
* | Merge pull request #29699 from lugray/represent_boolean_as_integer | Matthew Draper | 2017-07-12 | 12 | -8/+148 |
|\ |
|
| * | Change sqlite3 boolean serialization to use 1 and 0 | Lisa Ugray | 2017-07-11 | 12 | -8/+148 |
* | | Merge pull request #29764 from georgeclaghorn/third-party-cache-store-config | Matthew Draper | 2017-07-12 | 1 | -1/+1 |
|\ \ |
|
| * | | Fix configuring third-party cache stores such as ActiveSupport::Cache::RedisS... | George Claghorn | 2017-07-12 | 1 | -1/+1 |
|/ / |
|
* | | normalize_path used to be nil tolerant | Akira Matsuda | 2017-07-12 | 2 | -0/+5 |
* | | Merge pull request #29746 from kamipo/extract_fake_klass | Rafael França | 2017-07-11 | 3 | -52/+38 |
|\ \ |
|
| * | | Extract `FakeKlass` in `relation_test.rb` and `relation/mutation_test.rb` | Ryuta Kamizono | 2017-07-11 | 3 | -52/+38 |
* | | | Merge pull request #29748 from koic/enable_layout_empty_line_after_magic_comment | Rafael França | 2017-07-11 | 547 | -0/+549 |
|\ \ \ |
|
| * | | | [Action Record] `rubocop -a --only Layout/EmptyLineAfterMagicComment` | Koichi ITO | 2017-07-11 | 3 | -0/+3 |
| * | | | [Action View] `rubocop -a --only Layout/EmptyLineAfterMagicComment` | Koichi ITO | 2017-07-11 | 3 | -0/+3 |
| * | | | [Action Pack] `rubocop -a --only Layout/EmptyLineAfterMagicComment` | Koichi ITO | 2017-07-11 | 16 | -0/+16 |
| * | | | [Active Job] `rubocop -a --only Layout/EmptyLineAfterMagicComment` | Koichi ITO | 2017-07-11 | 100 | -0/+100 |
| * | | | [Active Support] `rubocop -a --only Layout/EmptyLineAfterMagicComment` | Koichi ITO | 2017-07-11 | 424 | -0/+424 |
| * | | | Enable Layout/EmptyLineAfterMagicComment cop | Koichi ITO | 2017-07-11 | 1 | -0/+3 |
| | |/
| |/| |
|
* | | | Merge pull request #29756 from yuki24/fix-english | Robin Dupret | 2017-07-11 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | Fix english for the rescue_from warning [ci skip] | Yuki Nishijima | 2017-07-11 | 1 | -1/+1 |
|/ / / |
|
* | | | Merge pull request #29752 from palkan/master | Matthew Draper | 2017-07-12 | 1 | -1/+1 |
|\ \ \
| |/ /
|/| | |
|
| * | | Fix postgresql adapter setup for ActionCable tests | palkan | 2017-07-11 | 1 | -1/+1 |
|/ / |
|
* | | Merge pull request #29745 from y-yagi/fix_typo_in_method_name | Matthew Draper | 2017-07-11 | 1 | -1/+1 |
|\ \
| |/
|/| |
|
| * | Fix typo in method name | yuuji.yaginuma | 2017-07-11 | 1 | -1/+1 |
|/ |
|
* | :scissors: | Ryuta Kamizono | 2017-07-11 | 1 | -1/+0 |
* | Add backticks for class names in CHANGELOG [ci skip] | Ryuta Kamizono | 2017-07-11 | 1 | -3/+3 |
* | Merge pull request #29742 from lugray/default_protect_from_forgery | Rafael França | 2017-07-10 | 10 | -4/+79 |
|\ |
|
| * | Add ActionController::Base.skip_forgery_protection | Lisa Ugray | 2017-07-10 | 2 | -0/+39 |
| * | Protect from forgery by default | Lisa Ugray | 2017-07-10 | 9 | -4/+40 |
* | | Merge pull request #29572 from kaspth/test-runner-no-eager-require | Kasper Timm Hansen | 2017-07-10 | 15 | -275/+251 |
|\ \
| |/
|/| |
|
| * | * Don't eagerly require Rails' minitest plugin. | Kasper Timm Hansen | 2017-07-10 | 15 | -275/+251 |
|/ |
|
* | Added time helper method `freeze_time` which is an alias for `travel_to Time.... | प्रथमेश Sonpatki | 2017-07-10 | 3 | -0/+47 |
* | Merge pull request #29735 from y-yagi/make_sidekiq_and_resque_integration_tes... | Kasper Timm Hansen | 2017-07-10 | 2 | -1/+9 |
|\ |
|
| * | Make sidekiq and resque integration tests work in CI | yuuji.yaginuma | 2017-07-10 | 2 | -1/+9 |
|/ |
|
* | Merge pull request #29733 from kirs/frozen-activejob | Matthew Draper | 2017-07-10 | 102 | -0/+102 |
|\ |
|
| * | Use frozen-string-literal in ActiveJob | Kir Shatrov | 2017-07-09 | 102 | -0/+102 |
|/ |
|
* | Merge pull request #29731 from castrodd/patch-1 | Kasper Timm Hansen | 2017-07-09 | 1 | -2/+2 |
|\ |
|
| * | [ci skip] Updated language on validations. | Daniel Castro | 2017-07-09 | 1 | -2/+2 |
* | | Merge pull request #29730 from bdewater/update-encryptor-docs | Kasper Timm Hansen | 2017-07-09 | 1 | -5/+6 |
|\ \
| |/
|/| |
|
| * | [ci skip] update MessageEncryptor example to use the key length as returned b... | Bart de Water | 2017-07-09 | 1 | -5/+6 |
* | | Merge pull request #29721 from y-yagi/fix_29696 | Kasper Timm Hansen | 2017-07-09 | 2 | -2/+36 |
|\ \ |
|
| * | | Treat secrets as binary | yuuji.yaginuma | 2017-07-09 | 2 | -2/+36 |
* | | | Merge pull request #29725 from y-yagi/fix_29717 | Kasper Timm Hansen | 2017-07-09 | 3 | -0/+73 |
|\ \ \ |
|
| * | | | Load environment file in `dbconsole` command | yuuji.yaginuma | 2017-07-09 | 3 | -0/+73 |
| |/ / |
|
* | | | Merge pull request #29655 from kirs/frozen-friendly-ap-ar | Matthew Draper | 2017-07-10 | 18 | -19/+37 |
|\ \ \ |
|
| * | | | Prepare AP and AR to be frozen string friendly | Kir Shatrov | 2017-07-06 | 18 | -19/+37 |
* | | | | Merge pull request #29728 from kirs/frozen-activesupport | Matthew Draper | 2017-07-09 | 429 | -0/+434 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | Use frozen-string-literal in ActiveSupport | Kir Shatrov | 2017-07-09 | 429 | -0/+434 |
| |/ / |
|
* | | | Merge pull request #29715 from reverbdotcom/ptd/fix-invalid-uuids | Matthew Draper | 2017-07-09 | 2 | -2/+4 |
|\ \ \ |
|