aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | List assert_{,no_}changes in the testing guideGenadi Samokovarov2017-05-291-0/+2
| |/ / / / / /
* | | | | | | Merge pull request #29265 from koic/remove_redundant_test_assertionMatthew Draper2017-05-291-6/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove a redundant test assertionKoichi ITO2017-05-291-6/+0
| |/ / / / / /
* / / / / / / Ignore the encrypted secrets key file that is created by rails secrets:setupDavid Heinemeier Hansson2017-05-291-0/+3
|/ / / / / /
* | | | | | Merge pull request #29208 from kamipo/default_env_fall_back_to_default_env_wh...Guillermo Iguaran2017-05-283-2/+13
|\ \ \ \ \ \
| * | | | | | `DEFAULT_ENV` falls back to `default_env` when `RAILS_ENV` or `RACK_ENV` is a...Ryuta Kamizono2017-05-253-2/+13
* | | | | | | Merge pull request #29262 from kamipo/deprecate_passing_arguments_with_block_...Guillermo Iguaran2017-05-283-2/+36
|\ \ \ \ \ \ \
| * | | | | | | Deprecate passing arguments and block at the same time to `count` and `sum` i...Ryuta Kamizono2017-05-293-2/+36
|/ / / / / / /
* | | | | | | Merge pull request #29258 from koic/remove_redundant_command_recorder_testMatthew Draper2017-05-291-5/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove a redundant test case of command_recorder_testKoichi ITO2017-05-291-5/+0
* | | | | | | | Merge pull request #29257 from clupprich/remove-action-dispatch-callbacks-to-...Kasper Timm Hansen2017-05-281-3/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove mentions of deprecated callbacks on ActionDispatch::CallbacksChristoph Lupprich2017-05-281-3/+1
* | | | | | | | | Merge pull request #29146 from y-yagi/fix_29138Kasper Timm Hansen2017-05-282-2/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Correctly set user_supplied_options when there is no whitespace in option spe...yuuji.yaginuma2017-05-242-2/+15
* | | | | | | | | | Merge pull request #29108 from inopinatus/ujs-sgjs-ie9-supportKasper Timm Hansen2017-05-281-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix server-generated JS response processing on IE9 when using rails-ujs and r...Josh Goodall2017-05-171-1/+1
* | | | | | | | | | | Merge pull request #29074 from kamipo/remove_returning_true_in_internal_callb...Kasper Timm Hansen2017-05-283-13/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove returning true in internal callbacksRyuta Kamizono2017-05-143-13/+1
* | | | | | | | | | | | Merge pull request #28132 from mikeycgto/aead-encrypted-cookiesKasper Timm Hansen2017-05-2810-108/+295
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | AEAD encrypted cookies and sessionsMichael Coyne2017-05-2210-108/+295
* | | | | | | | | | | | | Merge pull request #29253 from kamipo/prevent_extra_queryMatthew Draper2017-05-292-6/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Prevent extra `current_database` query for `encoding`/`collation`/`ctype`Ryuta Kamizono2017-05-282-6/+12
* | | | | | | | | | | | | Merge pull request #28969 from kamipo/refactor_enum_to_use_value_instead_of_l...Matthew Draper2017-05-284-14/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Refactor enum to use `value` instead of `label` in the scopeRyuta Kamizono2017-05-074-14/+16
* | | | | | | | | | | | | | Merge pull request #29003 from kamipo/delegate_ast_and_locked_to_arel_explicitlyMatthew Draper2017-05-284-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Delegate `ast` and `locked` to `arel` explicitlyRyuta Kamizono2017-05-064-1/+13
* | | | | | | | | | | | | | Merge pull request #29097 from EilisHamilton/fix_uncountable_pluralization_lo...Matthew Draper2017-05-283-6/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix pluralization of uncountables when given a localeEilis Hamilton2017-05-193-6/+20
* | | | | | | | | | | | | | | Merge pull request #29197 from kamipo/enable_extending_even_if_scope_returns_nilMatthew Draper2017-05-282-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Enable extending even if scope returns nilRyuta Kamizono2017-05-242-7/+7
| | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #29250 from kamipo/remove_unused_association_interpolateMatthew Draper2017-05-281-8/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Remove unused `Association#interpolate`Ryuta Kamizono2017-05-281-8/+0
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #29255 from y-yagi/bring_back_delayed_job_to_integration_testKasper Timm Hansen2017-05-282-6/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Bring back delayed_job to test listyuuji.yaginuma2017-05-281-2/+1
| * | | | | | | | | | | | | | | Bump `delayed_job_active_record` gemyuuji.yaginuma2017-05-281-4/+4
* | | | | | | | | | | | | | | | Clear all current instances before a reload.Kasper Timm Hansen2017-05-282-2/+8
* | | | | | | | | | | | | | | | Make reset execution assertions easier to read.Kasper Timm Hansen2017-05-281-15/+11
* | | | | | | | | | | | | | | | Remove double Thread.current storage.Kasper Timm Hansen2017-05-281-5/+3
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #28895 from codeforkjeff/fix-session-keys-and-values-methodsMatthew Draper2017-05-282-0/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add lazy loading to #keys and #values methods in Sessioncodeforkjeff2017-04-262-0/+20
* | | | | | | | | | | | | | | | Merge pull request #29249 from bradleypriest/numericality-precision-regressionMatthew Draper2017-05-283-1/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix regression in Numericality validator where extra decimal places on Bradley Priest2017-05-273-1/+22
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #29251 from y-yagi/fix_29247Matthew Draper2017-05-282-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Includes namespace in system test skelton when namespace is specifiedyuuji.yaginuma2017-05-282-1/+6
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Use non-raising finder.Kasper Timm Hansen2017-05-271-1/+1
* | | | | | | | | | | | | | | [ci skip] Fix spelling that's a bit of an overreach.Kasper Timm Hansen2017-05-271-1/+1
* | | | | | | | | | | | | | | Use models to match the docs.Kasper Timm Hansen2017-05-271-1/+1
* | | | | | | | | | | | | | | Merge pull request #29246 from nihemak/fix-docs-take-firstMatthew Draper2017-05-271-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | [ci skip]fix wrong variable name in docsMakoto Nihei2017-05-271-3/+3
| | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #29245 from nihemak/fix-docs-findRichard Schneeman2017-05-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |