aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|/ / / /
* | | | 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
|\ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-26 07:44:13 +0000