aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Dump index options to pretty formatRyuta Kamizono2016-10-105-12/+10
* Merge pull request #26735 from kamipo/prevent_to_create_blank_commentRafael França2016-10-093-6/+8
|\
| * Prevent to create blank commentRyuta Kamizono2016-10-083-6/+8
* | Merge pull request #26738 from bogdanvlviv/travisRafael França2016-10-091-1/+0
|\ \
| * | Don't allow tests ac:integration to failurebogdanvlviv2016-10-081-1/+0
* | | Merge pull request #26740 from y-yagi/update_retry_on_exampleJon Moss2016-10-081-2/+2
|\ \ \ | |/ / |/| |
| * | correct exception class in `retry_on` example [ci skip]yuuji.yaginuma2016-10-091-2/+2
* | | Revert "Temporarily make ACa tests noiser and more predictable"Matthew Draper2016-10-081-1/+1
* | | Merge pull request #26732 from matthewd/fixnum-warningMatthew Draper2016-10-085-8/+8
|\ \ \ | |/ / |/| |
| * | Fixnum and Bignum are deprecated in Ruby trunkMatthew Draper2016-10-085-8/+8
* | | Merge pull request #26729 from rails/bump-sdocRafael França2016-10-072-8/+6
|\ \ \
| * | | Include sdoc 1.0.0.beta2 which includes updated rdoc w/o hard json depZachary Scott2016-10-072-7/+6
| * | | Bump sdoc to 1.0.0.beta1 which includes fix to support Ruby 2.4Zachary Scott2016-10-072-4/+3
* | | | 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
|/ / / / / / /