aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Fix failing test using custom file watcherMatthew Erhard2015-12-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LoadingTest#test_does_not_reload_constants_on_development_if_custom_file_watcher_always_returns_false in railties/test/application/loading_test.rb is failing with: `NoMethodError: undefined method 'execute' for #<#<Class:0x00000002465a30>:0x00000001f79698>` The test creates an anonymous class to be used as a custom file watcher using `config.file_watcher=`. Per the Rails guides for Configuring, the class set to `config.file_watcher` “Must conform to ActiveSupport::FileUpdateChecker API”. Per the docs for ActiveSupport::FileUpdateChecker, the API depends on four methods: #initialize, #updated?, #execute, and #execute_if_updated. The custom file watcher in the failing test only implements the first two methods. This pull request adds #execute and #execute_if_updated to the custom file_watcher, conforming it to the ActiveSupport::FileUpdateChecker API, and passing the test.
* | | | | | | | Merge pull request #22471 from merhard/railties_tests_actually_fail_on_travisRafael França2015-12-021-21/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Revert "don't start a new process for every test file"
| * | | | | | | Revert "don't start a new process for every test file"Matthew Erhard2015-12-021-21/+8
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5a0e0e72995472e315738dcea5b5a12d6e3d3489. This commit causes railties tests on TravisCI to always return a 0 status (all tests passing), even when tests are failing. Reverting for now until a new solution can be found.
* | | | | | | don't rely on the columns hash to get defaults. follow-up to #17169.Yves Senn2015-12-022-7/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will also get the defaults from attribute definitions like: attribute :type, :string, default: "SomethingElse"
* | | | | | | add `ActiveRecord::Base.has_attribute?`Yves Senn2015-12-023-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `has_attribute?` method to check wether a given attribute has been defined.
* | | | | | | tests, pluralize singular table name.Yves Senn2015-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This solves the following error: ActiveRecord::StatementInvalid: Could not find table 'guitars' It seems that the table structure of the `Guitar` model has not been necessary until now. Due to the wrong table name the model was not correctly linked to the table.
* | | | | | | Merge pull request #17169 from kuldeepaggarwal/fix-STI-default-typeYves Senn2015-12-023-9/+47
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | STI cast new instances to `default type` on initialize.
| * | | | | | | STI cast new instances to `default type` on initialize.Kuldeep Aggarwal2015-12-023-0/+42
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | fixes #17121
* | | | | | | Merge pull request #22464 from pavlos/patch-1Claudio B2015-12-011-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update autoloading_and_reloading_constants.md
| * | | | | | | Update autoloading_and_reloading_constants.mdpavlos2015-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixed a typo
* | | | | | | | Ensure `Relation` responds to `shuffle`Sean Griffin2015-12-012-2/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | It appears that I missed this one when I delegated all the non-mutation array methods that were not on Enumerable
* | | | | | | Merge pull request #22343 from jeffminnear/patch-1Claudio B2015-12-011-2/+9
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Modify unscoped usage guide to include chaining [ci skip]
| * | | | | | Modify unscoped usage guide to include chainingJeff Minnear2015-11-301-2/+9
| | | | | | |
* | | | | | | Merge pull request #22449 from dnagir/database_connection_messageYves Senn2015-12-011-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Explain the connection pool error message better [ci skip]
| * | | | | | | Explain the connection pool error message betterDmytrii Nagirniak2015-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous message was misleading (especially for Ops guys) when diagnosing problems related to the database connection. The message was suggesting that the connection cannot be obtained which normally assumes the need to look at the database. But this isn't the case as the connection could not be retrieved from the application's internal connection pool. The new message should make it more explicit and remove the confusion.
* | | | | | | | Merge pull request #22361 from grosser/grosser/rescueArthur Nogueira Neves2015-11-301-26/+19
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | rescue memcached errors in a consistent way
| * | | | | | | rescue memcached errors in a consistent wayMichael Grosser2015-11-291-26/+19
| | | | | | | |
* | | | | | | | Merge pull request #22456 from ↵Sean Griffin2015-11-302-1/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | chriskottom/fix-minitest-plugin-with-minitest-rails-gem Allow use of minitest-rails gem with test runner
| * | | | | | | | allow use of minitest-rails gem with test runnerChris Kottom2015-11-302-1/+7
|/ / / / / / / /
* | | | | | | | Merge pull request #22345 from GUI/fix-multi-schema-structure-dumpYves Senn2015-11-303-4/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix rake db:structure:dump on Postgres when multiple schemas are used Conflicts: activerecord/CHANGELOG.md Closes #22346.
| * | | | | | | | Fix rake db:structure:dump on Postgres when multiple schemas are used.Nick Muerdter2015-11-193-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If postgresql is being used and there are multiple schemas listed on the `schema_search_path`, then `structure.sql` dumps (triggered by `rake db:structure:dump` or `config.active_record.schema_format = :sql`) began failing in Rails 4.2.5. This is due to the changes made in https://github.com/rails/rails/pull/17885 The problem is that multiple schemas were getting getting passed to `Kernel.system` as a single, space delimited string argument (for example, "--schema=foo --schema=bar"). However, with the updated array style of calling `Kernel.system`, these need to be passed as separate arguments (for example, "--schema=foo", "--schema=bar"). If they get passed as a single string, then the underlying pg_dump program isn't sure how to interpret that single argument and you'll get an error reporting: "pg_dump: No matching schemas were found"
* | | | | | | | | Merge pull request #22451 from kamipo/refactor_abstract_adapter_initializeKasper Timm Hansen2015-11-304-8/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Refactor `AbstractAdapter#initialize`
| * | | | | | | | | Refactor `AbstractAdapter#initialize`Ryuta Kamizono2015-11-304-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `pool` in args is unused anymore. And `config` is used in all adapters.
* | | | | | | | | | Merge pull request #22452 from kamipo/fix_indentationArun Agrawal2015-11-301-7/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix indentation in CHANGELOG.md [ci skip]
| * | | | | | | | | | Fix indentation in CHANGELOG.md [ci skip]Ryuta Kamizono2015-11-301-7/+7
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #22363 from yui-knk/mv_ar_test_caseYves Senn2015-11-302-91/+94
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Move some bind related test cases from finder_test.rb to sanitize_t…
| * | | | | | | | | | Remove some bind related test cases from finder_test.rb to sanitize_test.rbyui-knk2015-11-212-91/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `replace_named_bind_variables` and `replace_bind_variables` are definded in `sanitization.rb`, so it is reasonable these tests are on `sanitize_test.rb`.
* | | | | | | | | | | Merge pull request #22427 from eliotsykes/validation-message-proc-docYves Senn2015-11-301-1/+30
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document message validation option accepts Proc [ci skip]
| * | | | | | | | | | | Document message validation option accepts ProcEliot Sykes2015-11-271-1/+30
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #22373 from yui-knk/ad_constraintsYves Senn2015-11-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | Add `Routing` namespace to point appropriate constant
| * | | | | | | | | | Add `Routing` namespace to point appropriate constantyui-knk2015-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it clear we use `ActionDispatch::Routing::Endpoint`
* | | | | | | | | | | Merge pull request #18155 from bogdan/collection_association_double_element_fixSean Griffin2015-11-293-4/+20
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | Bugfix collection association #create method
| * | | | | | | | | | Bugfix collection association #create method …Bogdan Gusiev2015-11-233-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When same association is loaded in the model creation callback The new object is inserted into association twice
* | | | | | | | | | | Merge pull request #22444 from ↵Santiago Pastorino2015-11-293-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/connection_options_is_only_needed_for_mysql_adapter `connection_options` is only needed for `MysqlAdapter`
| * | | | | | | | | | | `connection_options` is only needed for `MysqlAdapter`Ryuta Kamizono2015-11-293-3/+3
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not needed for `Mysql2Adapter` and `AbstractMysqlAdapter`.
* | | | | | | | | | | Merge pull request #22443 from Wasserschlange/added_dollarsign_to_readmeXavier Noria2015-11-291-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | Added dollarsign to the README.md for consistancy [ci skip]
| * | | | | | | | | | Added dollarsign to the README.md for consistancyMichael H2015-11-281-4/+4
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #22283 from the-undefined/routes-error-singular-resourceArthur Nogueira Neves2015-11-281-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ci skip] add `controller:` argument to routing.md
| * | | | | | | | | | [ci skip] add `controller:` argument to routing.mdthe-undefined2015-11-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing a `Symbol` to the `to:` argument for a `get` route requires a `controller` argument to also be defined. The documentation is missing the `controller:` argument, which leaving out raises a routing exception: ```ruby get 'profile', to: :show ``` ``` $ rake routes ArgumentError: Missing :controller key on routes definition, please check your routes. ``` Adding the `controller:` argument maps the route correctly: ```ruby get 'profile', to: :show, controller: 'users' ``` ``` $ rake routes profile GET /profile(.:format) users#show ```
* | | | | | | | | | | Merge pull request #22315 from takatoshiono/fix-configuring-docArthur Nogueira Neves2015-11-281-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix set_autoload_paths and set_load_path document [ci skip]
| * | | | | | | | | | | Fix set_autoload_paths and set_load_path documentTakatoshi Ono2015-11-171-2/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #22371 from yui-knk/better_mount_errorArthur Nogueira Neves2015-11-282-7/+22
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Brush up errors of `ActionDispatch::Routing::Mapper#mount`
| * | | | | | | | | | | | Brush up errors of `ActionDispatch::Routing::Mapper#mount`yui-knk2015-11-282-7/+22
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Integrate to raise `ArgumentError` * Detailed error message when `path` is not defined * Add a test case, invalid rack app is passed
* | | | | | | | | | | | Merge pull request #22437 from yui-knk/changelog_ap2Kasper Timm Hansen2015-11-281-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Add author's name to CHANGELOG
| * | | | | | | | | | | | [ci skip] Add author's name to CHANGELOGyui-knk2015-11-281-0/+2
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #22313 from y-yagi/disable_minitest_plugin_in_pluginKasper Timm Hansen2015-11-287-7/+153
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | disable rails minitest extension in rails plugin
| * | | | | | | | | | | add `bin/test` script to rails pluginyuuji.yaginuma2015-11-287-7/+153
|/ / / / / / / / / / /
* | | | | | | | | | | Partially revert 14b20ceGodfrey Chan2015-11-272-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The failure have returned, so disabling the tests again. (The upgrade is fine to keep.)
* | | | | | | | | | | let the generated app Gemfile depend on listen 3.0.5Xavier Noria2015-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/rails/rails/commit/14b20ce9b38314943dcaf73b8dab7508b70ba487.
* | | | | | | | | | | Merge pull request #21241 from pdg137/masterArthur Nogueira Neves2015-11-264-1/+17
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | In url_for, never append ? when the query string is empty anyway.
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-22 23:49:16 +0000