aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Merge pull request #23992 from matthewd/em-optionMatthew Draper2016-03-0431-52/+229
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Support faye-websocket + EventMachine as an optionMatthew Draper2016-03-0231-52/+229
* | | | | | | | | | | don't treat all associations with extensions as instance dependent.Yves Senn2016-03-034-1/+33
| |_|_|_|_|/ / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #24027 from mechanicles/a-to-anXavier Noria2016-03-037-12/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Change 'a HTTP' to 'an HTTP' [ci skip]Santosh Wadghule2016-03-037-12/+12
* | | | | | | | | | | Merge pull request #24024 from jonatack/niceify-dynamic-routes-deprecation-me...Rafael França2016-03-031-2/+8
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Niceify the dynamic routes deprecation messagesJon Atack2016-03-031-2/+8
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #24025 from mechanicles/a-to-anJon Moss2016-03-031-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Change 'a HTML' to 'an HTML' [ci skip]Santosh Wadghule2016-03-031-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #24023 from danielrhodes/bug/ac-connection-monitor-disconnectMatthew Draper2016-03-042-0/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | ConnectionMonitor is once again notified of disconnectDaniel Rhodes2016-03-032-0/+2
| |/ / / / / / / / /
* / / / / / / / / / Prevent nested ExecutionWrapper calls even when using run! directlyMatthew Draper2016-03-042-9/+16
|/ / / / / / / / /
* | | | | | | | | Merge pull request #24015 from meinac/active_record_migrations_doc_changesRafael França2016-03-021-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Changed behaviour of timestamps helper by create_table migration generator [c...Mehmet Emin İNAÇ2016-03-031-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #24011 from gsamokovarov/ar-persistence-api-docs-fixRafael França2016-03-021-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix a small template misrender in ActiveRecord::PersistenceGenadi Samokovarov2016-03-021-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #23086 from kamipo/deprecate_insert_update_delete_sqlRafael França2016-03-025-60/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Deprecate `{insert|update|delete}_sql` in `DatabaseStatements`Ryuta Kamizono2016-03-025-60/+17
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Do not run app.executor callbacks in integration testsJorge Bejar and Santiago Pastorino2016-03-021-11/+2
* | | | | | | | | Fix CHANGELOG spacing [ci skip]Jeremy Daer2016-03-024-20/+20
* | | | | | | | | Add test to make sure the sprockets cache is not shared per environmentRafael Mendonça França2016-03-022-2/+22
* | | | | | | | | Merge pull request #24009 from yahonda/bundle_exec_activerecord_unittestRafael França2016-03-021-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ci skip] Add `bundle exec` for ActiveRecord unit testsYasuo Honda2016-03-021-3/+3
* | | | | | | | | | Merge pull request #24001 from 5t111111/fix-gsub-cookies_serializerRafael França2016-03-022-2/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix description in cookies_serializer.rb being corrupted when updatingHirofumi Wakasugi2016-03-022-2/+3
* | | | | | | | | | remove trailing whitespace.Yves Senn2016-03-021-1/+1
* | | | | | | | | | Merge pull request #24002 from 5t111111/fix-typo-in-app_generator_testRafael França2016-03-021-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix typo in app_generator_test.rbHirofumi Wakasugi2016-03-021-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #23999 from maxehmookau/patch-1Rafael França2016-03-021-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix typo in implicit_renderMax Woolf2016-03-021-1/+1
* | | | | | | | | | | Merge pull request #23679 from kamipo/remove_not_needed_exec_insertYves Senn2016-03-021-4/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove not needed `exec_insert` in mysql2 adapterRyuta Kamizono2016-03-021-4/+0
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #24003 from abhishekjain16/rails_routes_fixRafael França2016-03-021-9/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | [ci skip] Use rails routes instead of rake routes in inspector test descriptionAbhishek Jain2016-03-021-9/+9
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #23649 from maclover7/fix-22675David Heinemeier Hansson2016-03-024-8/+27
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Accept JSON with no backslashes/escapingJon Moss2016-03-024-8/+27
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #23976 from danielrhodes/enhancement/ac-ping-to-message-typeMatthew Draper2016-03-027-19/+24
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Make ping into a message typeDaniel Rhodes2016-03-016-15/+10
| * | | | | | | | | Added welcome message type and fix test hacksDaniel Rhodes2016-03-015-5/+14
* | | | | | | | | | Merge pull request #23998 from prathamesh-sonpatki/rm-load-pathsKasper Timm Hansen2016-03-021-1/+4
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Remove requiring load_paths from tools/test.rbPrathamesh Sonpatki2016-03-021-1/+4
|/ / / / / / / / /
* | | | | | | | | Merge pull request #23991 from kamipo/fix_activesupport_reloaderMatthew Draper2016-03-021-4/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix `ActiveSupport::Reloader.check!`Ryuta Kamizono2016-03-021-4/+3
* | | | | | | | | | Merge pull request #23932 from arthurnn/arthurnn/remove_load_pathsArthur Nogueira Neves2016-03-0115-43/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove load_paths fileArthur Neves2016-02-2715-43/+5
* | | | | | | | | | | Merge pull request #23990 from kamipo/remove_duplicated_test_prefixRafael França2016-03-012-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Remove duplicated `test_` prefix [ci skip]Ryuta Kamizono2016-03-022-2/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #23959 from kamipo/add_test_primary_key_should_be_not_nullRafael França2016-03-011-3/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add a test for primary key should be not nullRyuta Kamizono2016-02-291-3/+4
* | | | | | | | | | | Merge pull request #23961 from kamipo/exclude_name_and_type_from_prepare_colu...Rafael França2016-03-013-8/+8
|\ \ \ \ \ \ \ \ \ \ \