aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Silence a warningRafael Mendonça França2016-10-071-1/+3
* | | | | | | | Undefine assings in IntegrationTestRafael Mendonça França2016-10-072-0/+10
* | | | | | | | Merge pull request #26730 from rails/explain-why-inverse_of-is-disabledXavier Noria2016-10-071-0/+4
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | explain why autosave= disables inverse_of [ci skip]Xavier Noria2016-10-071-0/+4
| |/ / / / / /
* / / / / / / Tweak a test so the queries matchMatthew Draper2016-10-081-1/+1
|/ / / / / /
* | | | | | Simplify serializable test to avoid mystery deadlockMatthew Draper2016-10-071-23/+21
* | | | | | Merge pull request #26714 from matthewd/close-raceMatthew Draper2016-10-076-15/+22
|\ \ \ \ \ \
| * | | | | | Wait for the socket to be closed asynchronouslyMatthew Draper2016-10-061-2/+10
| * | | | | | Use a branch of websocket-client-simple, to work around read/close raceMatthew Draper2016-10-063-12/+11
| * | | | | | Close the IO from the read loop threadMatthew Draper2016-10-062-1/+1
* | | | | | | Merge pull request #24963 from fertapric/recover-db-runtime-on-production-logsEileen M. Uchitelle2016-10-061-2/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix DB runtimes on production logFernando Tapia Rico2016-05-111-2/+1
* | | | | | | | Merge pull request #26631 from kamipo/remove_duplicate_conditionMatthew Draper2016-10-061-3/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove duplicated `unless current_adapter?(:SQLite3Adapter)` conditionRyuta Kamizono2016-09-271-3/+1
* | | | | | | | | Merge pull request #26633 from kamipo/text_too_big_should_be_textMatthew Draper2016-10-061-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | `:text_too_big` column should be `:text`, not `:integer`Ryuta Kamizono2016-09-271-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge pull request #25304 from kbrock/calculate_attributesMatthew Draper2016-10-061-6/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use attribute_names over column_namesKeenan Brock2016-10-041-6/+2
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #26359 from maclover7/jm-speed-up-timeMatthew Draper2016-10-061-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Speed up Time.zone.nowJon Moss2016-10-021-0/+2
* | | | | | | | | | Merge pull request #26710 from kenta-s/change-page-change-to-turbolinks-loadJon Moss2016-10-052-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Change page:change to turbolinks:load in README.md [ci skip]kenta-s2016-10-052-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #24571 from raimo/patch-1Sean Griffin2016-10-043-1/+24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Print the proper ::Float::INFINITY value when used as a default valueRaimo Tuisku2016-05-233-1/+24
* | | | | | | | | | Merge pull request #26684 from matthewd/executor-serialMatthew Draper2016-10-055-19/+87
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Avoid bumping the class serial when invoking executorMatthew Draper2016-10-035-19/+87
* | | | | | | | | | | Merge pull request #26686 from matthewd/deprecation-callerMatthew Draper2016-10-051-0/+13
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Correct caller tracking in delegated deprecation methodsMatthew Draper2016-10-031-0/+13
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #26693 from iainbeeston/consistently-use-activerecord-attr...Andrew White2016-10-048-9/+23
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Made ActiveRecord consistently use ActiveRecord::Type (notIain Beeston2016-10-038-9/+23
* | | | | | | | | | | Merge pull request #26701 from kamipo/restore_gemfile_lock_entriesAndrew White2016-10-041-0/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Restore missing Gemfile.lock entriesRyuta Kamizono2016-10-041-0/+2
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #26699 from Neodelf/request_idJon Moss2016-10-031-3/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | [ci-skip] Swap method and its alias, format docAndrey Molchanov2016-10-041-3/+4
* | | | | | | | | | | | Don't shut down adapters that haven't been setMatthew Draper2016-10-041-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #26695 from MentalPower/masterEileen M. Uchitelle2016-10-035-22/+27
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Allow the use of listen's 3.1.x branch.Esteban Santana Santana2016-10-035-22/+27
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #26555 from chriscarter90/unmatched-constraint-routing-mes...Andrew White2016-10-035-9/+23
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Show an "unmatched constraints" error for mismatching and present paramsChris Carter2016-10-035-9/+23
|/ / / / / / / / / /
* | | | | | | | | | Temporarily make ACa tests noiser and more predictableMatthew Draper2016-10-031-1/+1
* | | | | | | | | | Merge pull request #26425 from prathamesh-sonpatki/fix-nil-issueMatthew Draper2016-10-032-10/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix issue with `cache_key` when the named timestamp column has value nilPrathamesh Sonpatki2016-09-072-10/+19
* | | | | | | | | | | Shut down the worker pool - don't kill itMatthew Draper2016-10-031-1/+1
* | | | | | | | | | | Merge pull request #26620 from maclover7/jm-ac-pg-bugMatthew Draper2016-10-032-2/+39
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add tests for Server::Base#restartJon Moss2016-10-021-0/+33
| * | | | | | | | | | | Move behavior to Server::Base, and flush pubsubJon Moss2016-10-022-3/+6
| * | | | | | | | | | | Shutdown pubsub connection before classes are reloadedJon Moss2016-10-021-0/+1
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Cache to_time to improve performance when comparingAndrew White2016-10-021-1/+5
* | | | | | | | | | | Revert "Merge pull request #25880 from ryandv/fix_performance_regression_in_t...Andrew White2016-10-021-1/+1
* | | | | | | | | | | Revert "Merge pull request #26677 from tbalthazar/26644"Andrew White2016-10-023-30/+1
|/ / / / / / / / / /