aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into make-reverse-merge-bang-order-consistentSean Griffin2017-07-171531-11616/+18098
|\
| * Merge pull request #29810 from kamipo/add_first_parameter_indentationMatthew Draper2017-07-176-30/+34
| |\
| | * Enable `Layout/FirstParameterIndentation` copRyuta Kamizono2017-07-176-30/+34
| * | Merge pull request #29821 from y-yagi/set_rails_env_before_load_application_fileKasper Timm Hansen2017-07-172-4/+36
| |\ \ | | |/ | |/|
| | * Set `RAILS_ENV` before load application fileyuuji.yaginuma2017-07-172-4/+36
| * | Merge pull request #29819 from kirs/frozen-activemodelMatthew Draper2017-07-17117-0/+232
| |\ \ | | |/ | |/|
| | * Use frozen string literal in activemodel/Kir Shatrov2017-07-16117-0/+232
| * | Merge pull request #29812 from kamipo/remove_unused_requiresKasper Timm Hansen2017-07-162-5/+0
| |\ \
| | * | Remove unused requiresRyuta Kamizono2017-07-162-5/+0
| * | | Merge pull request #29782 from y-yagi/follow_up_29699Kasper Timm Hansen2017-07-165-17/+50
| |\ \ \
| | * | | add helper method for explicit lazy loadyuuji.yaginuma2017-07-161-13/+18
| | * | | Set `represent_boolean_as_integer` via `configuration`yuuji.yaginuma2017-07-165-5/+33
| * | | | Merge pull request #29813 from kamipo/fix_create_with_multiparameter_attributesKasper Timm Hansen2017-07-162-16/+34
| |\ \ \ \
| | * | | | Fix `create_with` with multiparameter attributesRyuta Kamizono2017-07-162-16/+34
| | | |/ / | | |/| |
| * | | | Merge pull request #29814 from kamipo/dont_cache_scope_for_createKasper Timm Hansen2017-07-164-14/+6
| |\ \ \ \
| | * | | | Don't cache `scope_for_create`Ryuta Kamizono2017-07-164-14/+6
| | |/ / /
| * | | | Merge pull request #29358 from robin850/dbconsole-connectionKasper Timm Hansen2017-07-166-19/+128
| |\ \ \ \
| | * | | | Properly expand the environment's nameRobin Dupret2017-07-166-7/+22
| | * | | | Deprecate environment as an argument for dbconsole and consoleRobin Dupret2017-07-164-12/+44
| | * | | | Allow to pass a connection to the `dbconsole` commandRobin Dupret2017-07-163-2/+64
| | |/ / /
| * | | / Fix root not being defined on Travis.Kasper Timm Hansen2017-07-161-1/+6
| | |_|/ | |/| |
| * | | explain why require_relative is not used here [ci skip]Xavier Noria2017-07-161-0/+2
| * | | Fix code formatting for QueryMethods#selectRobin Dupret2017-07-161-2/+3
| * | | Merge pull request #29817 from koic/replace_erubis_with_erubi_in_guideRyuta Kamizono2017-07-161-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Replace Erubis with Erubi in a part of guide [ci skip]Koichi ITO2017-07-161-1/+1
| | |/
| * | Merge pull request #29809 from kamipo/remove_unused_ivarsKasper Timm Hansen2017-07-161-2/+1
| |\ \ | | |/ | |/|
| | * Remove unused `@last`, `@order_clause`, and `@join_dependency`Ryuta Kamizono2017-07-161-2/+1
| * | Merge pull request #29771 from kamipo/fix_create_with_using_both_string_and_s...Kasper Timm Hansen2017-07-169-22/+24
| |\ \ | | |/ | |/|
| | * Fix `create_with` using both string and symbolRyuta Kamizono2017-07-169-18/+20
| | * Use `where(id: 10)` rather than `where(relation.table[:id].eq(10))`Ryuta Kamizono2017-07-161-5/+5
| |/
| * Merge pull request #29645 from y-yagi/check_component_when_run_app_updateKasper Timm Hansen2017-07-165-23/+60
| |\
| | * Do not generate unused components contents in `app:update` taskyuuji.yaginuma2017-07-165-23/+60
| * | Merge pull request #29806 from yhirano55/remove_blank_line_in_setupKasper Timm Hansen2017-07-161-2/+3
| |\ \ | | |/ | |/|
| | * Remove blank lines in setupYoshiyuki Hirano2017-07-161-2/+3
| * | Merge pull request #29679 from kamipo/add_test_case_for_27724Kasper Timm Hansen2017-07-152-0/+12
| |\ \
| | * | Add a test case for overwriting existing condition on associationsRyuta Kamizono2017-07-072-0/+12
| * | | Merge pull request #29769 from kamipo/remove_extra_order_for_firstKasper Timm Hansen2017-07-152-32/+28
| |\ \ \
| | * | | 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
| |/ / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 13:26:19 +0000