aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge pull request #26416 from prathamesh-sonpatki/fix-select-exampleRafael França2016-10-224-7/+22
|\ \ \ \ \
| * | | | | Fix regression caused due to removal of select method from CollectionAssociationPrathamesh Sonpatki2016-10-224-7/+22
|/ / / / /
* | | | | Merge pull request #26843 from denisovlev/strptime_timestampsRafael França2016-10-223-11/+40
|\ \ \ \ \
| * | | | | Fix `ActiveSupport::TimeZone#strptime` cannot parse timestamps (%Q, %s)denisovlev2016-10-213-11/+40
* | | | | | Merge pull request #26826 from claudiob/add-requireClaudio B2016-10-211-0/+1
|\ \ \ \ \ \
| * | | | | | Add missing requireclaudiob2016-10-191-0/+1
* | | | | | | Merge pull request #26862 from headius/lazy_load_blade_for_testsGuillermo Iguaran2016-10-211-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Lazy-load blade for actioncable tests; no blade on JRuby.Charles Oliver Nutter2016-10-211-1/+2
* | | | | | | | Merge pull request #26860 from headius/soft_ordering_in_yaml_dumpKasper Timm Hansen2016-10-221-6/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Soften this test since YAML.dump may produce keys in other orders.Charles Oliver Nutter2016-10-211-6/+4
| |/ / / / / / /
* | | | | | | | Use `on_load` to trigger commandline processing codeAaron Patterson2016-10-213-5/+10
* | | | | | | | Prevent the test framework from being loaded in production modeAaron Patterson2016-10-213-6/+14
* | | | | | | | Merge pull request #26859 from headius/mask_use_of_rubyvm_on_jrubyAaron Patterson2016-10-211-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Skip test that depends on RubyVM when it is not available (JRuby).Charles Oliver Nutter2016-10-211-0/+2
|/ / / / / / /
* | | | | | | Revert "Undefine assings in IntegrationTest"Rafael Mendonça França2016-10-212-10/+0
* | | | | | | Merge pull request #26819 from lastgabs/add-examples-active-job-test-helperRafael França2016-10-211-0/+24
|\ \ \ \ \ \ \
| * | | | | | | Add examples of queue_adapter and perform_enqueued jobs to API Docs.Gabi Stefanini2016-10-211-0/+24
* | | | | | | | Merge pull request #26050 from bogdanvlviv/optimistic_lockingAaron Patterson2016-10-215-20/+157
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Added ability update locking_column valuebogdanvlviv2016-10-214-7/+90
| * | | | | | | Fixed: Optimistic locking does not work well with null in the databasebogdanvlviv2016-10-214-15/+69
|/ / / / / / /
* | | | | | | Merge pull request #26855 from headius/explicit_order_callback_argsAaron Patterson2016-10-211-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Additional fix for argument-splat ordering differences.Charles Oliver Nutter2016-10-211-2/+2
* | | | | | | | Merge pull request #26854 from headius/explicit_order_callback_argsAaron Patterson2016-10-211-4/+4
|\| | | | | | |
| * | | | | | | Explicitly unpack the expanded args to avoid execution order diff.Charles Oliver Nutter2016-10-211-4/+4
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #26853 from zegomesjf/feature/skip_active_recordGuillermo Iguaran2016-10-212-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | don't create db directory when skip active_recordJosé Gomes Júnior2016-10-212-0/+2
|/ / / / / /
* | | | | | Merge pull request #26839 from renuo/fix-missing-nsec-transferAndrew White2016-10-213-2/+10
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix copy_time_to: Copy nsec instead of usecJosua Schmid2016-10-203-2/+10
| |/ / / /
* | | | | doc, hide non-public methods form the api docs. [ci skip]Yves Senn2016-10-201-2/+2
* | | | | guides, include note about modifiers when using the CLI.Yves Senn2016-10-201-0/+2
* | | | | remove trailing whitespace [ci skip]Yves Senn2016-10-201-8/+8
* | | | | Merge pull request #26846 from brunofacca/patch-1Rafael França2016-10-201-4/+4
|\ \ \ \ \
| * | | | | [ci skip] Fix return values of Hash Extensions examplesBruno Facca2016-10-201-4/+4
|/ / / / /
* | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-10-202-4/+4
|\ \ \ \ \
| * | | | | Corrected comments referring to documentation inIain Beeston2016-10-031-3/+3
| * | | | | Corrected comments referring to ActiveModel::AttributesIain Beeston2016-10-031-1/+1
* | | | | | Use old typecasting method if no type casted binds are passed inAaron Patterson2016-10-202-2/+45
* | | | | | Merge pull request #26830 from headius/mask_forking_fsevent_test_on_jrubyRafael Mendonça França2016-10-201-0/+2
* | | | | | render_bind should be privateAaron Patterson2016-10-191-10/+10
* | | | | | Merge pull request #26829 from headius/wait_for_events_in_listen_testsAaron Patterson2016-10-191-0/+18
* | | | | | Merge pull request #26825 from orhantoy/fix-doc-code-indentationJon Moss2016-10-191-4/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix indentation of code examplesOrhan Toy2016-10-191-4/+4
|/ / / / /
* | | | | Merge pull request #26821 from y-yagi/update_doc_about_change_column_defaultप्रथमेश Sonpatki2016-10-191-2/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | update doc about `change_column_default` [ci skip]yuuji.yaginuma2016-10-191-2/+4
|/ / / /
* | | | Merge pull request #26809 from alexcameron89/contributing_guide_typoJon Moss2016-10-171-1/+1
|\ \ \ \
| * | | | [ci skip] Fix typo in Guides: ContributingAlex Kitchens2016-10-171-1/+1
|/ / / /
* | | | /s/integrations/integration [ci skip] (#26801)प्रथमेश Sonpatki2016-10-161-1/+1
* | | | Merge pull request #26800 from prathamesh-sonpatki/bump-bundlerGuillermo Iguaran2016-10-161-0/+1
|\ \ \ \
| * | | | Bump bundler version in the before_install hook of travisPrathamesh Sonpatki2016-10-161-0/+1
|/ / / /
* | | | Merge pull request #26786 from codeodor/patch-1Eileen M. Uchitelle2016-10-153-1/+16
|\ \ \ \