aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge pull request #27941 from y-yagi/prevent_multiple_values_being_set_to_ru...Kasper Timm Hansen2017-02-205-10/+34
|\ \ \ \ \
| * | | | | Prevent multiple values being set to `run_via`yuuji.yaginuma2017-02-185-10/+34
* | | | | | Revert "Merge pull request #27925 from robin850/hwia-removal"Kasper Timm Hansen2017-02-204-49/+4
| |/ / / / |/| | | |
* | | | | Merge pull request #27863 from robin850/api-improvementsMatthew Draper2017-02-215-16/+51
|\ \ \ \ \
| * | | | | Properly nest core classes under a "Core Extensions" labelRobin Dupret2017-02-202-9/+33
| * | | | | Avoid documenting private or external classesRobin Dupret2017-02-074-7/+18
* | | | | | Merge pull request #25877 from kamipo/delegate_to_scope_rather_than_mergeMatthew Draper2017-02-215-34/+29
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Define `respond_to_missing?` instead of `respond_to?`Ryuta Kamizono2017-02-211-4/+4
| * | | | | Cache target scope for collection proxyRyuta Kamizono2016-12-252-3/+4
| * | | | | No need to cache collection proxies separatelyRyuta Kamizono2016-12-253-17/+1
| * | | | | Delegate to `scope` rather than `merge!` for collection proxyRyuta Kamizono2016-12-252-14/+24
* | | | | | Merge pull request #28079 from ck3g/rename-osx-to-macosRobin Dupret2017-02-205-9/+9
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | [ci skip] Update Guides to use macOS instead of Mac OS XVitali Tatarintev2017-02-205-9/+9
|/ / / / /
* | | | | Merge pull request #27925 from robin850/hwia-removalKasper Timm Hansen2017-02-204-4/+49
|\ \ \ \ \
| * | | | | Deprecate the top-level `HashWithIndifferentAccess` contantRobin Dupret2017-02-194-4/+49
* | | | | | Import rails-ujs v0.1.0 from rails/rails-ujsGuillermo Iguaran2017-02-2011-255/+35
* | | | | | Merge pull request #28059 from y-yagi/do_not_run_git_init_inside_test_dummyGuillermo Iguaran2017-02-202-1/+2
|\ \ \ \ \ \
| * | | | | | Do not run `git init` in dummy applicationyuuji.yaginuma2017-02-182-1/+2
* | | | | | | Merge pull request #28070 from kamipo/improve_create_table_force_trueGuillermo Iguaran2017-02-201-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Improve `create_table force: true`Ryuta Kamizono2017-02-201-2/+2
* | | | | | | | Merge pull request #28073 from bogdanvlviv/routes-in-testsGuillermo Iguaran2017-02-204-9/+8
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Set correct "routes" in tests casesbogdanvlviv2017-02-203-7/+7
| * | | | | | | Add assertion to polymorphic_routes_test.rbbogdanvlviv2017-02-201-2/+1
|/ / / / / / /
* | | | | | | Merge pull request #28013 from iguchi1124/fix-missing-namespace-wrapperGodfrey Chan2017-02-192-2/+8
|\ \ \ \ \ \ \
| * | | | | | | Add test for generate namespaced integration testShota Iguchi2017-02-161-2/+6
| * | | | | | | Add missing module namespacing wrapperShota Iguchi2017-02-151-0/+2
* | | | | | | | Merge pull request #28069 from st0012/change-back-frozen-stringMatthew Draper2017-02-202-2/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Unfreeze interpolated string because it's useless.Stan Lo2017-02-192-2/+2
|/ / / / / / /
* | | | | | | Share the common implementation between apps and engines.Kasper Timm Hansen2017-02-181-12/+7
* | | | | | | Merge pull request #28058 from y-yagi/follow_up_to_27608Jon Moss2017-02-172-23/+1
|\ \ \ \ \ \ \
| * | | | | | | Remove deprecate passing string to `:if` and `:unless` conditional options [c...yuuji.yaginuma2017-02-182-23/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #28049 from notapatch/masterJon Moss2017-02-171-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Change engines guide to demonstrate maintained forumRichard2017-02-171-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #28053 from kamipo/remove_docAkira Matsuda2017-02-181-5/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Remove `:doc:` for `NumericalityValidator` [ci skip]Ryuta Kamizono2017-02-171-5/+5
|/ / / / / /
* | | | | | Merge pull request #28047 from Erol/fix-i18n-documentation-typoYves Senn2017-02-171-1/+1
|\ \ \ \ \ \
| * | | | | | Fix typo in I18n Guide [ci skip]Erol Fornoles2017-02-171-1/+1
|/ / / / / /
* | | | | | Merge pull request #28040 from kenta-s/fix-doc-in-multibyte-charsJon Moss2017-02-161-4/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix doc in Multibyte::Chars [ci skip]kenta-s2017-02-171-4/+5
|/ / / / /
* | | | | Merge pull request #28026 from Sen-Zhang/fix_some_typos_in_commentsJon Moss2017-02-1511-11/+11
|\ \ \ \ \
| * | | | | change ActiveModel::Validation to ActiveModel::Validations in commentsSen Zhang2017-02-1511-11/+11
|/ / / / /
* | | | | Merge pull request #28016 from kenta-s/fix-docs-of-deprecated_method_warningJon Moss2017-02-151-3/+3
|\ \ \ \ \
| * | | | | Remove redundant namespaces from sample code of `deprecated_method_warning` [...kenta-s2017-02-151-3/+3
| |/ / / /
* | | | | Merge pull request #27993 from koic/fix_test_ar_value_too_long_using_oracleEileen M. Uchitelle2017-02-151-2/+2
|\ \ \ \ \
| * | | | | Fix a tests of AR::ValueTooLong when using OracleAdapterKoichi ITO2017-02-141-2/+2
* | | | | | Merge pull request #28018 from frewsxcv/patch-1Eileen M. Uchitelle2017-02-151-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Indicate units of 'limit' in 'Integer' error message.Corey Farwell2017-02-151-1/+1
|/ / / / /
* | | | | Merge pull request #27605 from mtsmfm/fix-generator-command-for-nested-rails-...Godfrey Chan2017-02-143-3/+27
|\ \ \ \ \
| * | | | | Fix generator command for nested (namespaced) rails engine (take 2)Fumiaki MATSUSHIMA2017-01-073-3/+27
* | | | | | Merge pull request #28000 from kamipo/remove_unused_ddl_helperRafael França2017-02-141-2/+0
|\ \ \ \ \ \