aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | don't treat all associations with extensions as instance dependent.Yves Senn2016-03-034-1/+33
| |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #23934. This is a forward port of ac832a43b4d026dbad28fed196d2de69ec9928ac Previously the scope of all associations with extensions were wrapped in an instance dependent proc. This made it impossible to preload such associations.
* | | | | | | | | | | | Merge pull request #24027 from mechanicles/a-to-anXavier Noria2016-03-037-12/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Change 'a HTTP' to 'an HTTP' [ci skip]
| * | | | | | | | | | | | Change 'a HTTP' to 'an HTTP' [ci skip]Santosh Wadghule2016-03-037-12/+12
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #24024 from ↵Rafael França2016-03-031-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jonatack/niceify-dynamic-routes-deprecation-messages Niceify the dynamic routes deprecation messages
| * | | | | | | | | | | | Niceify the dynamic routes deprecation messagesJon Atack2016-03-031-2/+8
| | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow-up to #23980. - Fix grammar: "be remove" -> "be removed". - Wrap lines at 80 chars. Lurvely ;-)
* | | | | | | | | | | | Merge pull request #24025 from mechanicles/a-to-anJon Moss2016-03-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Change 'a HTML' to 'an HTML' [ci skip]
| * | | | | | | | | | | | 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 disconnect
| * | | | | | | | | | | | 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 [ci skip]
| * | | | | | | | | | | Changed behaviour of timestamps helper by create_table migration generator ↵Mehmet Emin İNAÇ2016-03-031-1/+1
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | Merge pull request #24011 from gsamokovarov/ar-persistence-api-docs-fixRafael França2016-03-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix a small template misrender in ActiveRecord::Persistence
| * | | | | | | | | | | Fix a small template misrender in ActiveRecord::PersistenceGenadi Samokovarov2016-03-021-1/+1
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See the end of [this] page. [ci skip] [this]: http://edgeapi.rubyonrails.org/classes/ActiveRecord/Persistence/ClassMethods.html#method-i-create
* | | | | | | | | | | Merge pull request #23086 from kamipo/deprecate_insert_update_delete_sqlRafael França2016-03-025-60/+17
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Deprecate `{insert|update|delete}_sql` in `DatabaseStatements`
| * | | | | | | | | | | Deprecate `{insert|update|delete}_sql` in `DatabaseStatements`Ryuta Kamizono2016-03-025-60/+17
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally, `{insert|update|delete}_sql` is protected methods. We can use the `{insert|update|delete}` public methods instead.
* | | | | | | | | | | Do not run app.executor callbacks in integration testsJorge Bejar and Santiago Pastorino2016-03-021-11/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts changes made to integration tests in PR #23807. The issue happens when using capybara with a driver that needs to start a server in a separate thread like (poltergeist, selenium, etc). Both threads the capybara server one and the test thread end running syncronize over the interlock.
* | | | | | | | | | | 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 tests
| * | | | | | | | | | | [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 by gsub when updating
| * | | | | | | | | | | 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.rb
| * | | | | | | | | | | | 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_render
| * | | | | | | | | | | | Fix typo in implicit_renderMax Woolf2016-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When trying to make a request and the request doesn't have a suitable template, the new error messages are really helpful but there's a small (and I mean, VERY small) typo that has been bugging me for the last few days. This adds the space and restores order to the universe. :heart:
* | | | | | | | | | | | | Merge pull request #23679 from kamipo/remove_not_needed_exec_insertYves Senn2016-03-021-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove not needed `exec_insert` in mysql2 adapter
| * | | | | | | | | | | | | Remove not needed `exec_insert` in mysql2 adapterRyuta Kamizono2016-03-021-4/+0
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simply it is sufficient to use the method in the super class.
* | | | | | | | | | | | | 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 …
| * | | | | | | | | | | | | [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 channel identifiers with no backslashes/escaping
| * | | | | | | | | | | | Accept JSON with no backslashes/escapingJon Moss2016-03-024-8/+27
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #22675 Allow channel identifiers and also data with no backslahes/escaping to be accepted by the subscription storer.
* | | | | | | | | | | | Merge pull request #23976 from danielrhodes/enhancement/ac-ping-to-message-typeMatthew Draper2016-03-027-19/+24
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | ActionCable: Add a "welcome" and "ping" message type
| * | | | | | | | | | | Make ping into a message typeDaniel Rhodes2016-03-016-15/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes ping into a message type, which makes the whole protocol a lot more consistent. Also fixes hacks on the client side to make this all work.
| * | | | | | | | | | | 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.rb
| * | | | | | | | | | | Remove requiring load_paths from tools/test.rbPrathamesh Sonpatki2016-03-021-1/+4
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Instead require and setup Bundler - `tools/test.rb` is used internally from all `bin/test` scripts inside component gems. - Followup of https://github.com/rails/rails/commit/2abcdfd978fdcd491576a237e8c6be04ddaf884d.
* | | | | | | | | | | Merge pull request #23991 from kamipo/fix_activesupport_reloaderMatthew Draper2016-03-021-4/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix `ActiveSupport::Reloader.check!`
| * | | | | | | | | | | Fix `ActiveSupport::Reloader.check!`Ryuta Kamizono2016-03-021-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test failure in `bug_report_templates/action_controller_master.rb` is due to `app.reloader.check` is `nil`.
* | | | | | | | | | | | Merge pull request #23932 from arthurnn/arthurnn/remove_load_pathsArthur Nogueira Neves2016-03-0115-43/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Remove load_paths file
| * | | | | | | | | | | | 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]
| * | | | | | | | | | | | 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 null
| * | | | | | | | | | | | Add a test for primary key should be not nullRyuta Kamizono2016-02-291-3/+4
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #23961 from ↵Rafael França2016-03-013-8/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/exclude_name_and_type_from_prepare_column_options Exclude `:name` and `:type` from `prepare_column_options`
| * | | | | | | | | | | | | Exclude `:name` and `:type` from `prepare_column_options`Ryuta Kamizono2016-02-293-8/+8
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Actually `:name` and `:type` are not column options.
* | | | | | | | | | | | | Merge pull request #23953 from ↵Rafael França2016-03-0112-136/+96
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/fix_tests_failure_with_prepared_statements_false Fix tests failure with `prepared_statements: false`
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-21 22:51:04 +0000