aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge pull request #28223 from mtsmfm/fix-random-fail-on-system-test-with-ajaxEileen M. Uchitelle2017-03-032-1/+29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix random failure on system test with ajaxFumiaki MATSUSHIMA2017-03-032-1/+29
* | | | | | | | | | Merge pull request #28204 from rails/deprecate-implicit-coercion-of-durationsAndrew White2017-03-036-8/+149
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Deprecate implicit coercion of `ActiveSupport::Duration`Andrew White2017-03-026-8/+149
* | | | | | | | | | Merge pull request #28260 from Erol/fix-upgrading-rails-guide-typoArun Agrawal2017-03-031-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix typo in Upgrading Ruby on Rails Guide [skip ci]Erol Fornoles2017-03-031-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #28255 from acrich/masterRyuta Kamizono2017-03-031-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | fixed suspected typo in sample sql queryShay2017-03-021-1/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | [ci skip] Add changelog entry for #28139.Kasper Timm Hansen2017-03-021-0/+16
* | | | | | | | | Inline CIPHER constant.Kasper Timm Hansen2017-03-021-6/+3
* | | | | | | | | Move key packing into encryptor.Kasper Timm Hansen2017-03-022-6/+4
* | | | | | | | | Add back yaml require.Kasper Timm Hansen2017-03-021-0/+1
* | | | | | | | | Merge pull request #28139 from stouset/update-secrets-to-use-modern-cryptoKasper Timm Hansen2017-03-022-17/+16
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Default Secrets to AES-128-GCM, using ActiveSupport::MessageEncryptorStephen Touset2017-03-012-17/+16
* | | | | | | | | Merge pull request #28245 from y-yagi/use_blank_instead_of_emptyKasper Timm Hansen2017-03-021-1/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Convert `ENV["EDITOR"]` to string before checkyuuji.yaginuma2017-03-021-1/+1
* | | | | | | | | Merge pull request #28242 from rails/add-fractional-support-to-datetime-changeAndrew White2017-03-024-17/+46
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Update `DateTime#change` to support usec and nsecAndrew White2017-03-024-17/+46
* | | | | | | | | Merge pull request #28220 from kamipo/valid_type_accept_only_supported_typesRafael França2017-03-015-42/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | `valid_type?` should accept only supported typesRyuta Kamizono2017-02-285-42/+10
* | | | | | | | | | [ci skip] Add changelog entry for encrypted secrets.Kasper Timm Hansen2017-03-011-0/+14
* | | | | | | | | | Put it to me straight: just say it.Kasper Timm Hansen2017-03-011-3/+3
* | | | | | | | | | Tell users how to assign a $EDITOR.Kasper Timm Hansen2017-03-012-0/+35
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #28239 from y-yagi/use_appropriate_type_for_test_framework...Kasper Timm Hansen2017-03-011-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use appropriate type for `test_framework` optionyuuji.yaginuma2017-03-011-1/+1
* | | | | | | | | | Merge pull request #28237 from lzap/default-cipher-dryKasper Timm Hansen2017-03-011-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use DEFAULT_CIPHER constant in MessageEncryptorLukas Zapletal2017-03-011-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Whitelist adapters that support aliases in `HAVING` clauseAndrew White2017-03-011-1/+1
* | | | | | | | | | Merge pull request #28230 from y-yagi/HOST_to_be_in_uppercaseRafael França2017-02-281-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | `HOST` must be all capital lettersyuuji.yaginuma2017-03-011-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #25296 from kamipo/use_inspect_for_type_cast_for_schemaRafael França2017-02-284-9/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use `inspect` in `type_cast_for_schema` for date/time and decimal valuesRyuta Kamizono2016-12-114-9/+14
* | | | | | | | | | | Merge pull request #28120 from vfonic/plugin-generator-skip-turbolinks-dummyRafael França2017-02-281-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Skip turbolinks for engine test applicationViktor Fonic2017-02-281-0/+1
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #28210 from cefigueiredo/improve_required_testRafael França2017-02-281-7/+35
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Ensure that tests will reset belongs_to_requierd_by_default configCarlos Figueiredo2017-02-271-23/+27
| * | | | | | | | | | Make required by default test for belongs_to association clearerCarlos Figueiredo2017-02-271-1/+25
* | | | | | | | | | | Merge pull request #28217 from kamipo/create_join_table_respects_reference_ke...Rafael França2017-02-282-8/+17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | `create_join_table` should respect `references` column typeRyuta Kamizono2017-02-282-8/+17
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #28063 from Erol/prioritize-callback-on-action-before-ifRafael França2017-02-282-1/+41
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Prioritize checking `:on` actions before `:if` for transaction callbacksErol Fornoles2017-02-212-1/+41
* | | | | | | | | | | | Revert "Dupping a CollectionProxy should dup the load_target"eileencodes2017-02-282-12/+0
* | | | | | | | | | | | Merge pull request #28214 from kamipo/use_tablesRafael França2017-02-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Use `tables` instead of `data_sources - views`Ryuta Kamizono2017-02-281-1/+1
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #28215 from y-yagi/take_failed_screenshot_before_reset_driverRafael França2017-02-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Take failed screenshot before reset driveryuuji.yaginuma2017-02-281-1/+1
* | | | | | | | | | | | | Merge pull request #28202 from baerjam/improve-testing-your-mailers-documenta...Rafael França2017-02-281-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Improve documentation for Testing Your Mailers [ci skip]James Baer2017-02-281-0/+4
* | | | | | | | | | | | | | Merge pull request #28222 from kenta-s/fix-railstutorial-urlVipul A M2017-02-282-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix http -> https [ci skip]kenta-s2017-02-282-2/+2
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |