aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | We're not calling hooks here since 9e4c41c903e8e58721f2c41776a8c60ddba7a0a9Akira Matsuda2016-11-251-1/+0
* | | Merge pull request #27140 from supercaracal/fix-force-ssl-if-session-store-di...Rafael França2016-11-253-2/+20
|\ \ \
| * | | Remove aggressive unit test with mock. And add integration level test.Taishi Kasuga2016-11-243-25/+19
| * | | Fix a force ssl redirection bug that occur when session store disabled.Taishi Kasuga2016-11-222-1/+25
* | | | Merge pull request #23675 from kachick/activemodel-errors-indifferentRafael França2016-11-253-5/+19
|\ \ \ \
| * | | | Allow indifferent access in ActiveModel::ErrorsKenichi Kamiya2016-11-223-5/+19
* | | | | Merge pull request #27165 from prathamesh-sonpatki/followup-uuid-extension-ch...Rafael França2016-11-252-6/+16
|\ \ \ \ \
| * | | | | Followup of UUID default extension in the docs [ci skip]Prathamesh Sonpatki2016-11-242-6/+16
* | | | | | Merge pull request #26874 from tgxworld/fix_broadcast_loggerMatthew Draper2016-11-252-5/+21
|\ \ \ \ \ \
| * | | | | | `Broadcast#silence` breaks custom loggers that does not include `LoggerSilence`.Guo Xiang Tan2016-10-242-5/+21
* | | | | | | Merge pull request #27174 from kamipo/fix_require_dependency_message_formatMatthew Draper2016-11-252-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix `require_dependency` message formatRyuta Kamizono2016-11-252-2/+2
* | | | | | | | Merge pull request #27173 from kamipo/fix_warning_method_redefinedMatthew Draper2016-11-251-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix warning: method redefined; discarding old fieldsRyuta Kamizono2016-11-251-1/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #27172 from kamipo/should_test_change_column_defaultMatthew Draper2016-11-251-13/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Should test `test_change_column_default` in `PostgresqlUUIDTest`Ryuta Kamizono2016-11-251-13/+13
|/ / / / / / /
* | | | | | | Merge pull request #27171 from kamipo/suppress_migration_messageMatthew Draper2016-11-251-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Suppress migration message in the testRyuta Kamizono2016-11-251-0/+4
* | | | | | | | Merge pull request #27170 from kamipo/remove_blank_else_blockMatthew Draper2016-11-251-1/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Remove blank else blockRyuta Kamizono2016-11-251-1/+0
|/ / / / / / /
* | | | | | | Merge pull request #27108 from matthewd/allocate-connections-after-blockingMatthew Draper2016-11-252-25/+17
|\ \ \ \ \ \ \
| * | | | | | | Distribute connections to previously blocked threads when we're doneMatthew Draper2016-11-252-25/+17
* | | | | | | | Merge pull request #26718 from domcleal/5-0-stable-ids-writer-exceptionMatthew Draper2016-11-255-8/+40
|\ \ \ \ \ \ \ \
| * | | | | | | | Add test for collection *_ids= setter when association primary key setDominic Cleal2016-11-244-1/+23
| * | | | | | | | Restore RecordNotFound when *_ids= can't find records by IDDominic Cleal2016-11-244-7/+17
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #27166 from mtsmfm/rename-minitestKasper Timm Hansen2016-11-241-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | [ci skip] `MiniTest` -> `Minitest`Fumiaki MATSUSHIMA2016-11-241-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #25395 from yawboakye/use_gen_random_uuid_from_pgcrypto_ex...Rafael França2016-11-246-22/+86
|\ \ \ \ \ \ \
| * | | | | | | For `PostgreSQL >= 9.4` use `gen_random_uuid()`Yaw Boakye2016-11-226-22/+86
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | [ci skip] Add changelog entry for 86754a8fKasper Timm Hansen2016-11-231-0/+11
* | | | | | | [ci skip] Explain only :json is shipped by default.Kasper Timm Hansen2016-11-231-1/+2
* | | | | | | Use accept header instead of mangling request path.Kasper Timm Hansen2016-11-233-24/+44
|/ / / / / /
* | | | | | Merge pull request #27113 from rails/remove-jqueryGuillermo Iguaran2016-11-228-18/+34
|\ \ \ \ \ \
| * | | | | | Add rails-ujs as dependency in the rails GemfileGuillermo Iguaran2016-11-212-0/+9
| * | | | | | Add CHANGELOG entryGuillermo Iguaran2016-11-211-0/+5
| * | | | | | Don't add jQuery by default in new apps and use rails-ujs as UJS adapter insteadGuillermo Iguaran2016-11-215-18/+20
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #27133 from rails/reload_singular_associationsYves Senn2016-11-225-1/+51
|\ \ \ \ \ \
| * | | | | | Introduce `reload_<association>` reader for singular associations.Yves Senn2016-11-225-1/+51
|/ / / / / /
* | | | | | Merge pull request #27143 from sachin21/fix-permissionMatthew Draper2016-11-221-0/+0
|\ \ \ \ \ \
| * | | | | | Fix a wrong permissionSatoshi Ohmori2016-11-221-0/+0
* | | | | | | CI against 2.3.3Akira Matsuda2016-11-221-2/+2
* | | | | | | Merge pull request #27139 from ota42y/ota42y/form_helper_typo_fixप्रथमेश Sonpatki2016-11-221-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | form_helper typo fix [ci skip]ota42y2016-11-221-1/+1
|/ / / / / /
* | | | | | Merge pull request #26929 from elorest/is_deep_symbolize_secretsGuillermo Iguaran2016-11-213-2/+22
|\ \ \ \ \ \
| * | | | | | deep symbolize keys on secrets.ymlIsaac Sloan2016-11-213-2/+22
|/ / / / / /
* | | | | | [ci skip] Mention `form_with` and `fields` in changelog.Kasper Timm Hansen2016-11-211-0/+30
* | | | | | Add form_with to unify form_tag/form_for. (#26976)Kasper Timm Hansen2016-11-212-2/+2475
* | | | | | Merge pull request #27135 from tjai89/patch-1Rafael França2016-11-211-2/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Update RELEASING_RAILS.mdKirill Zhuravlov2016-11-211-2/+2
|/ / / / /
* | | | | update bin/test scripts to prevent double runs.Yves Senn2016-11-217-12/+2