aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | 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
|\ \ \ \ \
| * | | | | Exclude `:name` and `:type` from `prepare_column_options`Ryuta Kamizono2016-02-293-8/+8
| |/ / / /
* | | | | Merge pull request #23953 from kamipo/fix_tests_failure_with_prepared_stateme...Rafael França2016-03-0112-136/+96
|\ \ \ \ \
| * | | | | Remove unnecessary namespaces in `explain_test.rb`Ryuta Kamizono2016-02-293-40/+28
| * | | | | Fix tests failure with `prepared_statements: false`Ryuta Kamizono2016-02-2910-97/+69
| * | | | | Fix `NoMethodError: undefined method `preparable'`Ryuta Kamizono2016-02-291-1/+1
* | | | | | Merge pull request #23954 from kamipo/fix_undefined_method_fieldsRafael França2016-03-012-1/+19
|\ \ \ \ \ \
| * | | | | | Fix `NoMethodError: undefined method `fields' for nil:NilClass`Ryuta Kamizono2016-02-292-1/+19
* | | | | | | Revert "Merge pull request #23927 from gaurish/jruby_ci_actionpack"Rafael Mendonça França2016-03-011-5/+0
* | | | | | | Merge pull request #23935 from y-yagi/convert_cable_coffee_to_javascriptRafael França2016-03-016-13/+17
|\ \ \ \ \ \ \
| * | | | | | | convert cable.coffee to cable.jsyuuji.yaginuma2016-02-286-13/+17
* | | | | | | | Merge pull request #23936 from yui-knk/local_constants_to_be_publicRafael Mendonça França2016-03-015-26/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Deprecate `Module.local_constants`yui-knk2016-03-015-26/+17
* | | | | | | | | Merge pull request #23417 from sgringwe/masterRafael Mendonça França2016-03-015-9/+81
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add initial support for allowing an error on order or limit of queries being ...Scott Ringwelski2016-02-025-9/+81
* | | | | | | | | | Merge pull request #23980 from rails/deprecate-controller-action-segmentsAndrew White2016-03-0132-213/+478
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Deprecate :controller and :action path parametersAndrew White2016-03-0132-213/+478
* | | | | | | | | | | Merge pull request #23981 from y-yagi/do_not_set_action_cable_configRafael França2016-03-011-4/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | do not set Action Cable's config when specify `--skip-action-cable` optionyuuji.yaginuma2016-03-011-4/+3
* | | | | | | | | | | | Merge pull request #23986 from rubys/dedup-ctrlc-msgEileen M. Uchitelle2016-03-011-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Delete CTRL-C message as is duplicates PumaSam Ruby2016-03-011-2/+0
* | | | | | | | | | | | Merge pull request #23807 from matthewd/executorMatthew Draper2016-03-0247-337/+897
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Don't reference Rails.application from inside a componentMatthew Draper2016-03-022-10/+8
| * | | | | | | | | | | Use AS::Reloader to support reloading in ActiveJobMatthew Draper2016-03-024-2/+23
| * | | | | | | | | | | Use AS::Executor / AS::Reloader to support reloading in ActionCableMatthew Draper2016-03-029-30/+96
| * | | | | | | | | | | Publish AS::Executor and AS::Reloader APIsMatthew Draper2016-03-0233-307/+782
* | | | | | | | | | | | Merge pull request #23598 from brchristian/activerecord_second_to_lastMatthew Draper2016-03-022-4/+83
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | default second_to_last to primary_key index if no order suppliedBrian Christian2016-02-271-1/+7