aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge pull request #31384 from rails/dont-override-serverGuillermo Iguaran2017-12-093-2/+24
|\ \ \
| * | | Change the system tests to set Puma as default server only when the user have...Guillermo Iguaran2017-12-093-2/+24
|/ / /
* | | Add secure `X-Download-Options` and `X-Permitted-Cross-Domain-Policies` to de...Guillermo Iguaran2017-12-094-4/+15
* | | Merge pull request #31379 from bogdanvlviv/ci-against-jruby_9_1_15Ryuta Kamizono2017-12-091-3/+3
|\ \ \
| * | | CI against JRuby 9.1.15.0bogdanvlviv2017-12-081-3/+3
* | | | Merge pull request #31354 from maciej-ka/docs-link_to-nil-name-exampleClaudio B2017-12-081-0/+5
|\ \ \ \
| * | | | docs: add example for a nil name in link_tomaciej-ka2017-12-071-0/+5
* | | | | Merge pull request #31355 from rails/fix-rails-env-with-rubyAaron Patterson2017-12-085-3/+82
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Set the Rails environment from an environment variableAaron Patterson2017-12-082-5/+2
| * | | | Revert "remove unnecessary `RAILS_ENV` setting"Aaron Patterson2017-12-082-0/+4
| * | | | Add failing test for wrong database connectionAaron Patterson2017-12-081-0/+17
| * | | | Fix Rails environment when running tests with RubyAaron Patterson2017-12-063-3/+64
* | | | | 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