aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * | | | | | In url_for, never append ? when the query string is empty anyway.Paul Grayson2015-10-294-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It used to behave like this: url_for(controller: 'x', action: 'y', q: {}) # -> "/x/y?" We previously avoided empty query strings in most cases by removing nil values, then checking whether params was empty. But as you can see above, even non-empty params can yield an empty query string. So I changed the code to just directly check whether the query string ended up empty. (To make everything more consistent, the "removing nil values" functionality should probably move to ActionPack's Hash#to_query, the place where empty hashes and arrays get removed. However, this would change a lot more behavior.)
* | | | | | | Merge pull request #22420 from ↵Sean Griffin2015-11-266-152/+154
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rails/revert-22415-prepared_statements_for_mysql2_adapter Revert "Add prepared statements support for `Mysql2Adapter`"
| * | | | | | | Revert "Add prepared statements support for `Mysql2Adapter`"Sean Griffin2015-11-266-152/+154
|/ / / / / / /
* | | | | | | Upgrade to listen 3.0.5, re-enable testsGodfrey Chan2015-11-264-16/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In listen 3.0.4 and below, the `#stop` method on the notification backends are a no-op, meaning that we are leaking them per test. This ended up triggering another bug in Ruby that causes our builds to fail randomly on CI. listen bug: https://github.com/guard/listen/issues/353 ruby bug: https://bugs.ruby-lang.org/issues/11744
* | | | | | | Merge pull request #22415 from kamipo/prepared_statements_for_mysql2_adapterSean Griffin2015-11-266-154/+152
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add prepared statements support for `Mysql2Adapter`
| * | | | | | | Add prepared statements support for `Mysql2Adapter`Ryuta Kamizono2015-11-266-154/+152
| | | | | | | |
* | | | | | | | Merge pull request #22263 from mastahyeti/csrf-origin-checkRafael França2015-11-265-4/+81
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add option to verify Origin header in CSRF checks [Jeremy Daer + Rafael Mendonça França]
| * | | | | | | | Add option to verify Origin header in CSRF checksBen Toews2015-11-255-4/+81
| | | | | | | | |
* | | | | | | | | Merge pull request #22411 from jaredbeck/doc_ar_joinsYves Senn2015-11-261-2/+22
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Docs: ActiveRecord::QueryMethods#joins [ci skip]
| * | | | | | | | | Docs: ActiveRecord::QueryMethods#joinsJared Beck2015-11-251-2/+22
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* / | | | | | | | Only run listen tests in isolation, for nowGodfrey Chan2015-11-262-1/+21
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a known issue with the listen tests that casuses files to be incorrectly GC'ed even when they are still in-use. The current is to only run them in isolation to avoid randomly failing our test suite.
* | | | | | | | Merge pull request #22401 from cllns/remove-br-from-scaffoldKasper Timm Hansen2015-11-252-3/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove <br> from scaffold form, in favor of using CSS
| * | | | | | | | Remove <br> from scaffold, in favor of using CSSSean Collins2015-11-252-3/+7
| | | | | | | | |
* | | | | | | | | Merge pull request #22290 from y-yagi/donot_show_test_unit_jobEileen M. Uchitelle2015-11-251-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | do not show Active Job test generator
| * | | | | | | | do not show Active Job test generatoryuuji.yaginuma2015-11-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Like the other generator, for also Active Job, I think that there is no need to display for test generator.
* | | | | | | | | Merge pull request #22399 from wjessop/remove_unused_codeEileen M. Uchitelle2015-11-241-4/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove unused code
| * | | | | | | | | Remove unused codeWill Jessop2015-11-241-4/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Looking at the history of this file it seems this code was never actually used.
* | | | | | | | | Merge pull request #22348 from kv109/22233_without_deprecationAndrew White2015-11-241-1/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix wrong timezone mapping for Switzerland (no deprecation warn) [22233]
| * | | | | | | | | Fix wrong timezone mapping for Switzerland [22233]Kacper Walanus2015-11-151-1/+2
| | | | | | | | | |
* | | | | | | | | | Merge pull request #22370 from yui-knk/remove_blank_lineAndrew White2015-11-241-1/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Remove a blank line from a template for plugin `routes.rb`
| * | | | | | | | | | Remove a blank line from a template for plugin `routes.rb`yui-knk2015-11-221-1/+0
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #22304 from ↵Yves Senn2015-11-244-104/+161
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/schema_dumping_support_for_postgresql_geometric_types Add schema dumping support for PostgreSQL geometric data types
| * | | | | | | | | | Add schema dumping support for PostgreSQL geometric data typesRyuta Kamizono2015-11-243-11/+77
| | | | | | | | | | |
| * | | | | | | | | | Move `migration/postgresql_geometric_types_test.rb` in ↵Ryuta Kamizono2015-11-242-93/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `adapters/postgresql/geometric_test.rb`
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 18:04:59 +0000