aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Decrease string allocations in apply_inflectionsschneems2015-07-292-5/+36
* Decrease string allocations on AR#respond_to?schneems2015-07-291-1/+9
* Merge pull request #21065 from rails/schneems/fix-assets_testRichard Schneeman2015-07-292-0/+2
|\
| * Fix rake/notes_testschneems2015-07-291-0/+1
| * Fix reported regression rails/sprockets-rails#265schneems2015-07-291-0/+1
|/
* Merge pull request #21056 from yui-knk/fix/deprecation_silenceRafael Mendonça França2015-07-291-1/+4
|\
| * Make silence a warning inserted by commit #4b3f8acyui-knk2015-07-301-1/+4
* | Merge pull request #21054 from yui-knk/fix/doc_field_error_procClaudio B.2015-07-291-1/+1
|\ \ | |/ |/|
| * [ci skip] `field_error_proc` is used in `ActionView::Helpers::ActiveModelInst...yui-knk2015-07-291-1/+1
|/
* Merge pull request #21049 from y-yagi/fix_i18n_validation_testCarlos Antonio da Silva2015-07-281-1/+1
|\
| * pass the correct argument to mock on a test of `validates_length_of`yuuji.yaginuma2015-07-281-1/+1
|/
* Tiny documentation edits [ci skip]Robin Dupret2015-07-283-6/+8
* Merge pull request #21048 from yui-knk/fix/guide_about_action_pack2Yves Senn2015-07-281-1/+1
|\
| * [ci skip] Add a link to action_controller_overview.htmlyui-knk2015-07-281-1/+1
|/
* Merge pull request #21047 from yui-knk/fix/guide_about_action_packRobin Dupret2015-07-281-1/+1
|\
| * [ci skip] Now Action View is completely separated from Action Packyui-knk2015-07-281-1/+1
|/
* Add `:nodoc:` for internal testing methods [ci skip]Robin Dupret2015-07-285-9/+9
* Merge pull request #20590 from vngrs/set_default_charsetRafael Mendonça França2015-07-272-6/+13
|\
| * Document, refactor and create test case for ActionDispatch::Response#charset=...Mehmet Emin İNAÇ2015-06-172-6/+13
* | Merge pull request #20849 from vngrs/misleading_nested_exceptionsRafael Mendonça França2015-07-275-8/+36
|\ \
| * | Fix misleading errors for has_one through relationsMehmet Emin İNAÇ2015-07-225-8/+36
* | | Merge pull request #20759 from vngrs/fix_wrong_docRafael Mendonça França2015-07-271-2/+2
|\ \ \
| * | | Change wrong usage in documentation about autoload_paths [ci skip]Mehmet Emin İNAÇ2015-07-021-2/+2
* | | | Merge pull request #21031 from vngrs/fix_params_wrapper_docRafael Mendonça França2015-07-271-3/+3
|\ \ \ \
| * | | | Fix params_wrapper doc [ci skip]Mehmet Emin İNAÇ2015-07-261-3/+3
* | | | | Merge pull request #20904 from kaspth/wildcard-template-dependenciesKasper Timm Hansen2015-07-279-12/+121
|\ \ \ \ \
| * | | | | Add wildcard template dependencies.Kasper Timm Hansen2015-07-269-12/+121
* | | | | | Merge pull request #21040 from aditya-kapoor/fix-typoArthur Nogueira Neves2015-07-271-1/+1
|\ \ \ \ \ \
| * | | | | | [ci skip] it should be protect_from_forgeryAditya Kapoor2015-07-271-1/+1
* | | | | | | Merge pull request #21003 from robin850/api-pluginsRafael Mendonça França2015-07-275-9/+84
|\ \ \ \ \ \ \
| * | | | | | | Enable the `api_only` option for API plugins' generatorsRobin Dupret2015-07-232-0/+27
| * | | | | | | Generate an API dummy application for API pluginsRobin Dupret2015-07-232-0/+9
| * | | | | | | Make ApplicationController inherit from AC::API for API pluginsRobin Dupret2015-07-232-1/+9
| * | | | | | | Skip assets, helpers and views generation for API pluginsRobin Dupret2015-07-232-8/+27
| * | | | | | | Add the `--api` option for the plugin generatorRobin Dupret2015-07-232-0/+12
* | | | | | | | Merge pull request #21035 from radar/ryan-bigg-has-changed-jobsGodfrey Chan2015-07-261-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Ryan Bigg has changed jobs.Ryan Bigg2015-07-271-1/+1
* | | | | | | | | Merge pull request #21030 from yahonda/mysql2_20969Kasper Timm Hansen2015-07-261-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Remove @connection instance variable only when definedYasuo Honda2015-07-261-2/+2
|/ / / / / / / /
* | | | | | | | Properly allow uniqueness validations on primary keys.Sean Griffin2015-07-253-1/+28
* | | | | | | | Merge pull request #21007 from clayton-shopify/fix-mailto-encodingRafael Mendonça França2015-07-242-1/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Encode the email address as prescribed in RFC 6068 section 2.Clayton Smith2015-07-232-1/+9
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | `destroy` shouldn't raise when child associations fail to saveSean Griffin2015-07-244-1/+48
* | | | | | | | Merge pull request #20256 from arunagw/aa-remove-unused-rule-and-task-activer...Sean Griffin2015-07-241-9/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove unused rule and task from activerecordArun Agrawal2015-05-221-9/+0
* | | | | | | | | Merge pull request #20928 from matthewd/unload-interlockMatthew Draper2015-07-245-35/+385
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Small tweaks to mainly lock-ordering tests.thedarkone2015-07-221-21/+58
| * | | | | | | | | Handle thread death during lock acquisitionMatthew Draper2015-07-212-4/+27
| * | | | | | | | | Adjust expectations around purpose/compatibility optionsMatthew Draper2015-07-212-9/+36
| * | | | | | | | | Add some meta-assertions for the custom assertionsMatthew Draper2015-07-211-11/+63