aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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`
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some tests does not work for unprepared statements. Add `if ActiveRecord::Base.connection.prepared_statements` and fix a regex for fix tests failure with `prepared_statements: false`.
| * | | | Fix `NoMethodError: undefined method `preparable'`Ryuta Kamizono2016-02-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The error occurs with `prepared_statements: false`: ``` $ ARCONN=postgresql bundle exec ruby -w -Itest test/cases/associations_test.rb Using postgresql Run options: --seed 27753 ...E.................................... Finished in 0.713115s, 56.0919 runs/s, 91.1494 assertions/s. 1) Error: AssociationsTest#test_force_reload_is_uncached: NoMethodError: undefined method `preparable' for #<Arel::Visitors::PostgreSQL:0x007f8699702570> /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb:68:in `block in select_all' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb:83:in `cache_sql' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb:68:in `select_all' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/querying.rb:39:in `find_by_sql' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/relation.rb:699:in `exec_queries' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/association_relation.rb:32:in `exec_queries' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/relation.rb:580:in `load' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/relation.rb:260:in `records' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/relation.rb:256:in `to_a' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/associations/collection_association.rb:458:in `get_records' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/associations/collection_association.rb:473:in `find_target' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/associations/collection_association.rb:412:in `load_target' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/associations/collection_proxy.rb:45:in `load_target' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/associations/collection_proxy.rb:983:in `records' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/relation/delegation.rb:39:in `each' test/cases/associations_test.rb:116:in `block (2 levels) in test_force_reload_is_uncached' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb:32:in `cache' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/query_cache.rb:9:in `cache' test/cases/associations_test.rb:115:in `block in test_force_reload_is_uncached' /Users/kamipo/src/github.com/rails/rails/activesupport/lib/active_support/deprecation/reporting.rb:36:in `silence' /Users/kamipo/src/github.com/rails/rails/activesupport/lib/active_support/deprecation/instance_delegator.rb:19:in `silence' test/cases/associations_test.rb:114:in `test_force_reload_is_uncached' ```
* | | | | Merge pull request #23954 from kamipo/fix_undefined_method_fieldsRafael França2016-03-012-1/+19
|\ \ \ \ \ | | | | | | | | | | | | Fix `NoMethodError: undefined method `fields' for nil:NilClass`
| * | | | | Fix `NoMethodError: undefined method `fields' for nil:NilClass`Ryuta Kamizono2016-02-292-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently `exec_query` raises `NoMethodError` when executing no result queries (`INSERT`, `UPDATE`, `DELETE`, and all DDL) in mysql2 adapter. ``` irb(main):002:0> conn.execute("create table t(a int)") (43.3ms) create table t(a int) => nil irb(main):003:0> conn.execute("insert into t values (1)") (19.3ms) insert into t values (1) => nil irb(main):004:0> conn.exec_query("insert into t values (1)") SQL (28.6ms) insert into t values (1) NoMethodError: undefined method `fields' for nil:NilClass ```
* | | | | | Revert "Merge pull request #23927 from gaurish/jruby_ci_actionpack"Rafael Mendonça França2016-03-011-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ddb7be50e8a0946d29fbe66537f845b8369413b7, reversing changes made to ee4a1462e97f26bd480352468efab5b9c18aa8de. Reason: It is givin us a lot of timeouts in travis because JRuby 9.0.5.0 needs to be build in every run
* | | | | | Merge pull request #23935 from y-yagi/convert_cable_coffee_to_javascriptRafael França2016-03-016-13/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | convert cable.coffee to cable.js
| * | | | | | convert cable.coffee to cable.jsyuuji.yaginuma2016-02-286-13/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to eliminate the dependecy of CoffeeScript.
* | | | | | | Merge pull request #23936 from yui-knk/local_constants_to_be_publicRafael Mendonça França2016-03-015-26/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Deprecate `Module.local_constants`
| * | | | | | | Deprecate `Module.local_constants`yui-knk2016-03-015-26/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After Ruby 1.9, we can easily get the constants that have been defined locally by `Module.constants(false)`.
* | | | | | | | Merge pull request #23417 from sgringwe/masterRafael Mendonça França2016-03-015-9/+81
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Add option to error on ignored order or limit
| * | | | | | | | Add initial support for allowing an error on order or limit of queries being ↵Scott Ringwelski2016-02-025-9/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ignored in batches add some documentation and add 4 tests regarding error vs. warning behavior fix a typo when referring to the message go back to default in tests so that ordering is not important. use a constant instead of method. fix assert_nothing_raised call. use self.klass to allow per class configuration remove logger warn assets as that is tested elsewhere. pass error_on_ignore through find_each and find_in_batches also. add blocks to the finds so that the code is actually executed put the setting back to default in an ensure Add a changelog entry
* | | | | | | | | Merge pull request #23980 from rails/deprecate-controller-action-segmentsAndrew White2016-03-0132-213/+478
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Deprecate :controller and :action path parameters
| * | | | | | | | | Deprecate :controller and :action path parametersAndrew White2016-03-0132-213/+478
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allowing :controller and :action values to be specified via the path in config/routes.rb has been an underlying cause of a number of issues in Rails that have resulted in security releases. In light of this it's better that controllers and actions are explicitly whitelisted rather than trying to blacklist or sanitize 'bad' values.
* | | | | | | | | | 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` option
| * | | | | | | | | | do not set Action Cable's config when specify `--skip-action-cable` optionyuuji.yaginuma2016-03-011-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove duplicated `config.action_cable.url` config.
* | | | | | | | | | | Merge pull request #23986 from rubys/dedup-ctrlc-msgEileen M. Uchitelle2016-03-011-2/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Delete CTRL-C message as is duplicates Puma
| * | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | Publish AS::Executor and AS::Reloader APIs
| * | | | | | | | | | | 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
| | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-14 06:31:48 +0000