| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | | | | | | Merge pull request #28077 from Erol/make-reverse-merge-bang-order-consistent | Sean Griffin | 2017-07-17 | 4 | -5/+11 | |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| | * | | | | | | | | | Merge branch 'master' into make-reverse-merge-bang-order-consistent | Sean Griffin | 2017-07-17 | 1531 | -11616/+18098 | |
| | |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Merge pull request #29810 from kamipo/add_first_parameter_indentation | Matthew Draper | 2017-07-17 | 6 | -30/+34 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | Enable `Layout/FirstParameterIndentation` cop | Ryuta Kamizono | 2017-07-17 | 6 | -30/+34 | |
| * | | | | | | | | | | | Merge pull request #29821 from y-yagi/set_rails_env_before_load_application_file | Kasper Timm Hansen | 2017-07-17 | 2 | -4/+36 | |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | Set `RAILS_ENV` before load application file | yuuji.yaginuma | 2017-07-17 | 2 | -4/+36 | |
| * | | | | | | | | | | | Merge pull request #29819 from kirs/frozen-activemodel | Matthew Draper | 2017-07-17 | 117 | -0/+232 | |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | Use frozen string literal in activemodel/ | Kir Shatrov | 2017-07-16 | 117 | -0/+232 | |
| * | | | | | | | | | | | Merge pull request #29812 from kamipo/remove_unused_requires | Kasper Timm Hansen | 2017-07-16 | 2 | -5/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Remove unused requires | Ryuta Kamizono | 2017-07-16 | 2 | -5/+0 | |
| * | | | | | | | | | | | | Merge pull request #29782 from y-yagi/follow_up_29699 | Kasper Timm Hansen | 2017-07-16 | 5 | -17/+50 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | add helper method for explicit lazy load | yuuji.yaginuma | 2017-07-16 | 1 | -13/+18 | |
| | * | | | | | | | | | | | | Set `represent_boolean_as_integer` via `configuration` | yuuji.yaginuma | 2017-07-16 | 5 | -5/+33 | |
| * | | | | | | | | | | | | | Merge pull request #29813 from kamipo/fix_create_with_multiparameter_attributes | Kasper Timm Hansen | 2017-07-16 | 2 | -16/+34 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Fix `create_with` with multiparameter attributes | Ryuta Kamizono | 2017-07-16 | 2 | -16/+34 | |
| | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Merge pull request #29814 from kamipo/dont_cache_scope_for_create | Kasper Timm Hansen | 2017-07-16 | 4 | -14/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Don't cache `scope_for_create` | Ryuta Kamizono | 2017-07-16 | 4 | -14/+6 | |
| | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | Merge pull request #29358 from robin850/dbconsole-connection | Kasper Timm Hansen | 2017-07-16 | 6 | -19/+128 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Properly expand the environment's name | Robin Dupret | 2017-07-16 | 6 | -7/+22 | |
| | * | | | | | | | | | | | | | Deprecate environment as an argument for dbconsole and console | Robin Dupret | 2017-07-16 | 4 | -12/+44 | |
| | * | | | | | | | | | | | | | Allow to pass a connection to the `dbconsole` command | Robin Dupret | 2017-07-16 | 3 | -2/+64 | |
| | |/ / / / / / / / / / / / | ||||||
| * | | / / / / / / / / / / | Fix root not being defined on Travis. | Kasper Timm Hansen | 2017-07-16 | 1 | -1/+6 | |
| | |_|/ / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | explain why require_relative is not used here [ci skip] | Xavier Noria | 2017-07-16 | 1 | -0/+2 | |
| * | | | | | | | | | | | | Fix code formatting for QueryMethods#select | Robin Dupret | 2017-07-16 | 1 | -2/+3 | |
| * | | | | | | | | | | | | Merge pull request #29817 from koic/replace_erubis_with_erubi_in_guide | Ryuta Kamizono | 2017-07-16 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Replace Erubis with Erubi in a part of guide [ci skip] | Koichi ITO | 2017-07-16 | 1 | -1/+1 | |
| | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge pull request #29809 from kamipo/remove_unused_ivars | Kasper Timm Hansen | 2017-07-16 | 1 | -2/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | Remove unused `@last`, `@order_clause`, and `@join_dependency` | Ryuta Kamizono | 2017-07-16 | 1 | -2/+1 | |
| * | | | | | | | | | | | Merge pull request #29771 from kamipo/fix_create_with_using_both_string_and_s... | Kasper Timm Hansen | 2017-07-16 | 9 | -22/+24 | |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | Fix `create_with` using both string and symbol | Ryuta Kamizono | 2017-07-16 | 9 | -18/+20 | |
| | * | | | | | | | | | | Use `where(id: 10)` rather than `where(relation.table[:id].eq(10))` | Ryuta Kamizono | 2017-07-16 | 1 | -5/+5 | |
| |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | Merge pull request #29645 from y-yagi/check_component_when_run_app_update | Kasper Timm Hansen | 2017-07-16 | 5 | -23/+60 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | Do not generate unused components contents in `app:update` task | yuuji.yaginuma | 2017-07-16 | 5 | -23/+60 | |
| * | | | | | | | | | | | Merge pull request #29806 from yhirano55/remove_blank_line_in_setup | Kasper Timm Hansen | 2017-07-16 | 1 | -2/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | Remove blank lines in setup | Yoshiyuki Hirano | 2017-07-16 | 1 | -2/+3 | |
| | | |_|_|/ / / / / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | | Merge pull request #29679 from kamipo/add_test_case_for_27724 | Kasper Timm Hansen | 2017-07-15 | 2 | -0/+12 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | Add a test case for overwriting existing condition on associations | Ryuta Kamizono | 2017-07-07 | 2 | -0/+12 | |
| * | | | | | | | | | | | Merge pull request #29769 from kamipo/remove_extra_order_for_first | Kasper Timm Hansen | 2017-07-15 | 2 | -32/+28 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Remove extra `.merge!(order: "id")` for `Relation#first` in tests | Ryuta Kamizono | 2017-07-13 | 2 | -32/+28 | |
| * | | | | | | | | | | | | Merge pull request #29770 from y-yagi/fix_boolean_column_migration_script | Kasper Timm Hansen | 2017-07-15 | 3 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | Fix boolean column migration script | yuuji.yaginuma | 2017-07-13 | 3 | -3/+3 | |
| * | | | | | | | | | | | | | Merge pull request #29802 from EmmaB/master | Kasper Timm Hansen | 2017-07-15 | 1 | -4/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Remove redundant instances of the word 'simply' from documentation, on the ba... | Emma Barnes | 2017-07-15 | 1 | -4/+4 | |
| |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | Merge pull request #29798 from kamipo/remove_useless_aliased_table_name | Kasper Timm Hansen | 2017-07-15 | 4 | -18/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Remove useless `aliased_table_name` in `JoinDependency` | Ryuta Kamizono | 2017-07-15 | 4 | -18/+1 | |
| | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Merge pull request #29800 from koic/remove_encoding_utf8_magic_comment | Kasper Timm Hansen | 2017-07-15 | 2 | -2/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Remove encoding utf-8 magic comment | Koichi ITO | 2017-07-15 | 2 | -2/+0 | |
| |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Merge pull request #29797 from y-yagi/fix_doc_format_for_time_helpers | Ryuta Kamizono | 2017-07-15 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Fix doc format for `ActiveSupport::Testing::TimeHelpers` [ci skip] | yuuji.yaginuma | 2017-07-15 | 1 | -2/+2 | |
| | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge pull request #29786 from willnet/remove-javascript_link_tag-options | Ryuta Kamizono | 2017-07-14 | 1 | -32/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |