aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into activestorage-guideJeffrey Guenther2017-12-0890-363/+1175
|\
| * Swap raw video width and height if angle is 90 or 270 degreesGeorge Claghorn2017-12-082-3/+15
| * SQLite: Fix `copy_table` with composite primary keysRyuta Kamizono2017-12-082-6/+35
| * Merge pull request #30780 from JackMc/fix-chrome-referrer-invalidauthenticity...Sean Griffin2017-12-072-0/+23
| |\
| | * Add a better error message when a "null" Origin header occursJack McCracken2017-11-032-0/+23
| * | Fix customizing Content-Type via GCS service URLsGeorge Claghorn2017-12-072-1/+21
| * | Merge pull request #31365 from bogdanvlviv/add-headless_firefox-driver-to-sys...Eileen M. Uchitelle2017-12-077-4/+42
| |\ \
| | * | Add headless firefox driver to System Testsbogdanvlviv2017-12-077-4/+42
| * | | Fix `scope_for_create` to do not lose polymorphic associationsRyuta Kamizono2017-12-083-3/+26
| |/ /
| * | Merge pull request #31327 from aellispierce/custom-id-change-table-sqliteEileen M. Uchitelle2017-12-072-1/+23
| |\ \
| | * | Fix sqlite migrations with custom primary keysAshley Ellis Pierce2017-12-062-1/+23
| * | | Merge pull request #31358 from yhirano55/made_example_codes_inherit_applicati...Andrew White2017-12-071-5/+5
| |\ \ \
| | * | | [ci skip] Make Todo classes inherit ApplicationRecordYoshiyuki Hirano2017-12-071-5/+5
| * | | | Merge pull request #31350 from ptolts/correct_test_spellingYuji Yaginuma2017-12-071-1/+1
| |\ \ \ \
| | * | | | Correct routing test spelling mistake.Philip Tolton2017-12-061-1/+1
| |/ / / /
| * | | | Merge pull request #31344 from kamipo/use_string_instead_of_textRyuta Kamizono2017-12-072-32/+43
| |\ \ \ \
| | * | | | Address `ActiveRecord::NotNullViolation: OCIError: ORA-01400` for Oracle data...Yasuo Honda2017-12-071-6/+14
| | * | | | Use `:string` instead of `:text` for `JsonAttributeTest`Ryuta Kamizono2017-12-062-5/+10
| | * | | | Revert "Merge pull request #31341 from yahonda/skip_json_attribute_test"Ryuta Kamizono2017-12-061-24/+22
| * | | | | Merge pull request #27790 from domcleal/ac-params-each-yieldsRafael França2017-12-062-1/+17
| |\ \ \ \ \
| | * | | | | Yield array from AC::Parameters#each for block with one argDominic Cleal2017-12-062-1/+17
| |/ / / / /
| * | | | | Merge pull request #31345 from yhirano55/add_assert_in_epsilon_to_testing_guideEileen M. Uchitelle2017-12-061-0/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Add `assert_in_epsilon` to Testing guide [ci skip]Yoshiyuki Hirano2017-12-061-0/+2
| * | | | | Merge pull request #31341 from yahonda/skip_json_attribute_testSean Griffin2017-12-051-22/+24
| |\ \ \ \ \
| | * | | | | Execute `JsonAttributeTest` only if `supports_json?` returns `true`Yasuo Honda2017-12-051-22/+24
| * | | | | | Merge pull request #31339 from lostapathy/speedup_travisGeorge Claghorn2017-12-051-4/+1
| |\ \ \ \ \ \
| | * | | | | | only install ffmpeg and mupdf on activestorage buildsJoe Francis2017-12-051-4/+1
| * | | | | | | Merge pull request #31335 from ttanimichi/more-tests-for-webpack-optionGuillermo Iguaran2017-12-051-3/+24
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Add more tests for the `--webpack` optionTsukuru Tanimichi2017-12-051-0/+19
| | * | | | | | Modify `test_webpack_option`Tsukuru Tanimichi2017-12-051-3/+5
| * | | | | | | Add missing requireyuuji.yaginuma2017-12-051-0/+2
| | |_|_|/ / / | |/| | | | |
| * | | | | | Merge pull request #31334 from yhirano55/fix_example_code_in_active_jobRyuta Kamizono2017-12-051-4/+10
| |\ \ \ \ \ \
| | * | | | | | Fix example code in ActiveJob::Core [ci skip]Yoshiyuki Hirano2017-12-051-4/+10
| | |/ / / / /
| * / / / / / Fix CSP copy boolean directives (#31326)Simon Dawson2017-12-052-5/+10
| |/ / / / /
| * | | | | Merge pull request #31279 from ttanimichi/tests-for-webpack-optionGuillermo Iguaran2017-12-041-0/+14
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Add tests for the `--webpack` optionTsukuru Tanimichi2017-12-041-0/+14
| * | | | | `current_version` should catch `NoDatabaseError` from `get_all_versions`Ryuta Kamizono2017-12-041-12/+5
| * | | | | Merge pull request #31322 from bogdanvlviv/update-active_record_querying-guideSean Griffin2017-12-031-9/+9
| |\ \ \ \ \
| | * | | | | Update "Active Record Query Interface" guide [ci skip]bogdanvlviv2017-12-041-9/+9
| * | | | | | Embrace the instantiation in loving parens <3Kasper Timm Hansen2017-12-031-1/+2
| * | | | | | Merge pull request #31146 from mikeycgto/actiondispatch-cookie-store-test-upd...Kasper Timm Hansen2017-12-031-41/+83
| |\ \ \ \ \ \
| | * | | | | | Update cookie_store_test to use encrypted cookiesMichael Coyne2017-11-271-41/+83
| * | | | | | | Merge pull request #31311 from y-yagi/ignore_no_database_error_when_loading_s...Kasper Timm Hansen2017-12-034-3/+43
| |\ \ \ \ \ \ \
| | * | | | | | | Make `Migrator.current_version` work without a current databaseyuuji.yaginuma2017-12-034-3/+43
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Fix instrumention name: delete_prefixed like the others.Kasper Timm Hansen2017-12-031-1/+1
| * | | | | | | SQLite3 valid integer value should be 8 bytes (64-bit signed integer) (#28379)Ryuta Kamizono2017-12-032-5/+18
| * | | | | | | Emulate JSON types for SQLite3 adapter (#29664)Ryuta Kamizono2017-12-036-13/+9
| * | | | | | | `change_column_default` should be executed after type changingRyuta Kamizono2017-12-033-16/+20
| * | | | | | | Purge variants with their blobsGeorge Claghorn2017-12-0210-31/+107
| * | | | | | | Merge pull request #31314 from claudiob/fix-typoYuji Yaginuma2017-12-031-1/+1
| |\ \ \ \ \ \ \