aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #20758 from xijo/action_mailer_message_delivery_respects_i...Kasper Timm Hansen2015-07-054-9/+25
|\ \ \ \ \ \ \
| * | | | | | | ActionMailer::MessageDelivery respects current I18n.localeJohannes Opper2015-07-054-9/+25
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #20782 from kaspth/fix-controller-caching-testMatthew Draper2015-07-061-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix the random caching test failure.Kasper Timm Hansen2015-07-051-0/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #20748 from robin850/reserved-namesEileen M. Uchitelle2015-07-054-4/+8
|\ \ \ \ \ \ \
| * | | | | | | Display a more human readable list of reserved namesRobin Dupret2015-07-014-4/+8
* | | | | | | | Refactor cookie_jar to decouple it from request objecteileencodes2015-07-051-7/+3
* | | | | | | | Add gemfile entry for GlobalID until a new release is cut.Kasper Timm Hansen2015-07-052-3/+12
* | | | | | | | Merge pull request #19877 from fny/job-global-id-error-improvementKasper Timm Hansen2015-07-052-7/+21
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Improve error message when serializing unsaved records for jobsFaraz Yashar2015-06-282-7/+21
* | | | | | | | Merge pull request #20780 from y-yagi/action_view_overview_guideRobin Dupret2015-07-051-8/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | remove reference to `country_options_for_select` and `country_select` from gu...yuuji.yaginuma2015-07-051-8/+0
|/ / / / / / /
* | | | | | | Merge pull request #20764 from maurogeorge/mailer_imageVijay Dev2015-07-041-0/+18
|\ \ \ \ \ \ \
| * | | | | | | Create Adding images in Action Mailer Views on guidesMauro George2015-07-031-0/+18
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #20773 from jonatack/distinct-instead-of-deprecated-uniqKasper Timm Hansen2015-07-031-2/+3
|\ \ \ \ \ \ \
| * | | | | | | [skip ci] #distinct instead of #uniqJon Atack2015-07-031-2/+3
|/ / / / / / /
* | | | | | | Merge pull request #20766 from trosborn/diversityRafael Mendonça França2015-07-022-8/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | changes names in guides to better reflect diversity [ci-skip]Thomas Osborn2015-07-022-8/+8
|/ / / / / /
* | | | | | Fix spelling of `Thoughtleadering`eileencodes2015-07-021-1/+1
* | | | | | Use default model enum in fixtures if not definedeileencodes2015-07-023-1/+14
* | | | | | Merge pull request #20760 from claudiob/remove-true-false-classXavier Noria2015-07-021-6/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | [ci skip] Don't use TrueClass, FalseClass in docsclaudiob2015-07-021-6/+0
|/ / / / /
* | | | | Merge pull request #20631 from repinel/improve-url-for-docsRobin Dupret2015-07-011-3/+19
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | [ci skip] Improve the url_for documentationRoque Pinel2015-07-011-3/+19
|/ / / /
* | | | Separate the constraint and other options [ci skip]Robin Dupret2015-07-011-3/+8
* | | | Merge pull request #20747 from pwnall/fix_minitest_railsKasper Timm Hansen2015-07-011-3/+3
|\ \ \ \
| * | | | Avoid crashing when minitest-rails is loaded.Victor Costan2015-07-011-3/+3
|/ / / /
* | | | Correct through associations using scopesSean Griffin2015-06-304-6/+16
* | | | follow-up to 2183caa, always reenable the task. #20743Yves Senn2015-06-301-3/+3
* | | | `dump_schema_after_migration` applies migration tasks other than db:migrateYves Senn2015-06-303-15/+27
* | | | tests, railties tests should use `bin/` executables when possible.Yves Senn2015-06-309-121/+121
* | | | Merge pull request #20741 from radar/integration_tool_docRafael Mendonça França2015-06-301-1/+1
|\ \ \ \
| * | | | integration_tool defaults to :test_unitRyan Bigg2015-06-301-1/+1
* | | | | Merge pull request #20734 from srikanthps/masterRafael Mendonça França2015-06-291-1/+2
|\ \ \ \ \
| * | | | | To fix #20644Srikanth Shreenivas2015-06-301-1/+2
* | | | | | Merge pull request #20739 from jordondornbos/patch-1Rafael Mendonça França2015-06-291-1/+1
|\ \ \ \ \ \
| * | | | | | fix pluralization in doc [ci skip]Jordon Dornbos2015-06-291-1/+1
|/ / / / / /
* | | | | | Merge pull request #20735 from vngrs/minor_addition_to_getting_startedSean Griffin2015-06-291-2/+2
|\ \ \ \ \ \
| * | | | | | Minor addition to getting started guide for foreign_key description of refere...Mehmet Emin İNAÇ2015-06-291-2/+2
|/ / / / / /
* | | | | | docs, nodoc `NullPreloader` and `AlreadyLoaded`.Yves Senn2015-06-291-2/+2
* | | | | | Merge pull request #20724 from y-yagi/fix_scaffold_in_full_engineYves Senn2015-06-297-3/+36
|\ \ \ \ \ \
| * | | | | | fix NoMethodError that occurs when generating scaffold inside full mode engineyuuji.yaginuma2015-06-287-3/+36
* | | | | | | Merge pull request #20669 from akolomiychuk/image-pathYves Senn2015-06-293-0/+11
|\ \ \ \ \ \ \
| * | | | | | | Add nil check in asset_pathAnton Kolomiychuk2015-06-292-0/+7
* | | | | | | | Merge pull request #20538 from repinel/fix-render-caching-issueKasper Timm Hansen2015-06-294-16/+36
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Fix cache issue when different partials use the same collectionRoque Pinel2015-06-284-16/+36
|/ / / / / / /
* | | | | | | Merge pull request #20726 from yui-knk/fix/doc_controllerClaudio B.2015-06-281-1/+1
|\ \ \ \ \ \ \
| * | | | | | | [ci skip] Fix action_controller_overviewyui-knk2015-06-281-1/+1
|/ / / / / / /
* | | | | | | updates a migration example in the Getting Started guide [ci skip]Xavier Noria2015-06-281-5/+3
* | | | | | | Revert the behavior of association names and `where` to be closer to 4.2Sean Griffin2015-06-271-1/+1