aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Disable available locale checks in Action Test testyuuji.yaginuma2019-02-241-0/+3
* Merge pull request #35382 from janko/restore-io-copy-stream-compatibility-wit...George Claghorn2019-02-232-48/+62
|\
| * Restore UploadedFile compatibility with IO.copy_streamJanko Marohnić2019-02-232-3/+17
| * Test ActionDispatch::Http::UploadedFile with an actual TempfileJanko Marohnić2019-02-231-48/+48
* | Make this test strongerXavier Noria2019-02-231-0/+7
* | Add test case for `unscope` with unknown columnRyuta Kamizono2019-02-241-0/+11
* | More exercise tests for distinct count with group byRyuta Kamizono2019-02-241-2/+16
* | Let Zeitwerk autoloaders inflect with Active SupportXavier Noria2019-02-232-2/+32
|/
* Merge pull request #35379 from shivamvinsol/minor_grammar_fixRyuta Kamizono2019-02-241-1/+1
|\
| * minor grammar fix [ci skip]Shivam Jain2019-02-241-1/+1
|/
* Upgrade Zeitwerk to 1.3.1Xavier Noria2019-02-232-3/+3
* Merge pull request #35374 from rails/cache-inline-templatesAaron Patterson2019-02-223-1/+24
|\
| * Add a finalizer to inline templatesAaron Patterson2019-02-223-1/+24
* | Merge pull request #35375 from y-yagi/fix_test_select_with_subquery_in_from_u...Yuji Yaginuma2019-02-231-7/+2
|\ \ | |/ |/|
| * Make `test_select_with_subquery_in_from_uses_original_table_name` work with o...yuuji.yaginuma2019-02-231-7/+2
|/
* Merge pull request #35367 from abhaynikam/update-getting-started-doc-for-migr...Rafael França2019-02-221-2/+2
|\
| * [ci skip] Updated migration version to 6.0 in the getting started docsAbhay Nikam2019-02-221-2/+2
* | Merge pull request #35370 from shivamvinsol/fix_skip_callbacks_documentationRyuta Kamizono2019-02-231-3/+2
|\ \
| * | update callbacks skipping methods in guide [ci skip]Shivam Jain2019-02-231-3/+2
* | | Merge pull request #35371 from rails/always-have-a-formatAaron Patterson2019-02-224-7/+18
|\ \ \
| * | | Ensure that rendered templates always have a formatAaron Patterson2019-02-224-7/+18
* | | | Skip `test_select_with_subquery_in_from_uses_original_table_name` on CIRyuta Kamizono2019-02-231-1/+1
| |/ / |/| |
* | | Merge pull request #35369 from rails/fewer-lookup-context-callsAaron Patterson2019-02-222-6/+6
|\ \ \ | |_|/ |/| |
| * | Pass lookup context to the layout handlersAaron Patterson2019-02-222-6/+6
| |/
* | Skip `test_select_with_subquery_in_from_uses_original_table_name` on Buildkit...Ryuta Kamizono2019-02-221-2/+5
* | Merge pull request #35357 from abhaynikam/35351-allows-rich-text-area-to-have...George Claghorn2019-02-222-2/+52
|\ \
| * | Allows rich_text_area_tag to add I18n translated placeholder text if placehol...Abhay Nikam2019-02-222-2/+52
| |/
* | Prefer I18n.with_localeGeorge Claghorn2019-02-212-52/+37
* | Merge pull request #35363 from rails/zeitwerk-1.3.0Xavier Noria2019-02-215-12/+11
|\ \
| * | simplifies Rails.autoloaders.logger=Xavier Noria2019-02-212-4/+3
| * | simplify AS::Dependencies.verbose=Xavier Noria2019-02-212-5/+5
| * | bump ZeitwerkXavier Noria2019-02-212-3/+3
| |/
* | Merge pull request #35360 from kamipo/fix_select_and_pluck_with_fromRyuta Kamizono2019-02-222-1/+42
|\ \ | |/ |/|
| * Just skip `test_select_with_subquery_in_from_uses_original_table_name` on TravisRyuta Kamizono2019-02-221-0/+3
| * Fix `pluck` and `select` with `from` if `from` has original table nameRyuta Kamizono2019-02-222-1/+39
|/
* Should not pass extra args to `_update_record`Ryuta Kamizono2019-02-213-7/+13
* Merge pull request #35349 from rails/autoloaders.logger=Xavier Noria2019-02-212-0/+28
|\
| * Define Rails.autoloaders.logger=Xavier Noria2019-02-212-0/+28
* | Merge pull request #35336 from kamipo/dont_allow_non_numeric_string_matches_t...Ryuta Kamizono2019-02-215-9/+23
|\ \ | |/ |/|
| * Don't allow `where` with non numeric string matches to 0 valuesRyuta Kamizono2019-02-205-9/+23
* | Address "warning: in `column': the last argument was passed as a single Hash"Ryuta Kamizono2019-02-213-11/+12
* | Extract `default_uniqueness_comparison` to ease to handle mismatched collatio...Ryuta Kamizono2019-02-212-1/+7
* | Merge pull request #35345 from soartec-lab/fix_lint_activerecord_relationRyuta Kamizono2019-02-211-3/+3
|\ \
| * | Fix lint `ShadowingOuterLocalVariable`soartec-lab2019-02-211-3/+3
* | | Revert "Speed up integer casting from DB"Ryuta Kamizono2019-02-212-6/+1
* | | Merge pull request #35344 from eugeneius/active_storage_require_core_extGeorge Claghorn2019-02-201-0/+1
|\ \ \ | |/ / |/| |
| * | Add missing require to active_storage.rbEugene Kenny2019-02-201-0/+1
* | | Explains a detail re eager loading [ci skip]Xavier Noria2019-02-201-0/+3
|/ /
* | Merge pull request #35342 from alkesh26/actionview-typo-fixesVipul A M2019-02-212-2/+2
|\ \
| * | [ci skip] actionview typo fixes.alkesh262019-02-212-2/+2
|/ /