Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | `connection_options` is only needed for `MysqlAdapter` | Ryuta Kamizono | 2015-11-29 | 3 | -3/+3 |
* | Merge pull request #22443 from Wasserschlange/added_dollarsign_to_readme | Xavier Noria | 2015-11-29 | 1 | -4/+4 |
|\ | |||||
| * | Added dollarsign to the README.md for consistancy | Michael H | 2015-11-28 | 1 | -4/+4 |
|/ | |||||
* | Merge pull request #22283 from the-undefined/routes-error-singular-resource | Arthur Nogueira Neves | 2015-11-28 | 1 | -2/+2 |
|\ | |||||
| * | [ci skip] add `controller:` argument to routing.md | the-undefined | 2015-11-13 | 1 | -2/+2 |
* | | Merge pull request #22315 from takatoshiono/fix-configuring-doc | Arthur Nogueira Neves | 2015-11-28 | 1 | -2/+2 |
|\ \ | |||||
| * | | Fix set_autoload_paths and set_load_path document | Takatoshi Ono | 2015-11-17 | 1 | -2/+2 |
* | | | Merge pull request #22371 from yui-knk/better_mount_error | Arthur Nogueira Neves | 2015-11-28 | 2 | -7/+22 |
|\ \ \ | |||||
| * | | | Brush up errors of `ActionDispatch::Routing::Mapper#mount` | yui-knk | 2015-11-28 | 2 | -7/+22 |
* | | | | Merge pull request #22437 from yui-knk/changelog_ap2 | Kasper Timm Hansen | 2015-11-28 | 1 | -0/+2 |
|\ \ \ \ | |||||
| * | | | | [ci skip] Add author's name to CHANGELOG | yui-knk | 2015-11-28 | 1 | -0/+2 |
* | | | | | Merge pull request #22313 from y-yagi/disable_minitest_plugin_in_plugin | Kasper Timm Hansen | 2015-11-28 | 7 | -7/+153 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | add `bin/test` script to rails plugin | yuuji.yaginuma | 2015-11-28 | 7 | -7/+153 |
|/ / / / | |||||
* | | | | Partially revert 14b20ce | Godfrey Chan | 2015-11-27 | 2 | -2/+13 |
* | | | | let the generated app Gemfile depend on listen 3.0.5 | Xavier Noria | 2015-11-26 | 1 | -1/+1 |
* | | | | Merge pull request #21241 from pdg137/master | Arthur Nogueira Neves | 2015-11-26 | 4 | -1/+17 |
|\ \ \ \ | |||||
| * | | | | In url_for, never append ? when the query string is empty anyway. | Paul Grayson | 2015-10-29 | 4 | -1/+17 |
* | | | | | Merge pull request #22420 from rails/revert-22415-prepared_statements_for_mys... | Sean Griffin | 2015-11-26 | 6 | -152/+154 |
|\ \ \ \ \ | |||||
| * | | | | | Revert "Add prepared statements support for `Mysql2Adapter`" | Sean Griffin | 2015-11-26 | 6 | -152/+154 |
|/ / / / / | |||||
* | | | | | Upgrade to listen 3.0.5, re-enable tests | Godfrey Chan | 2015-11-26 | 4 | -16/+5 |
* | | | | | Merge pull request #22415 from kamipo/prepared_statements_for_mysql2_adapter | Sean Griffin | 2015-11-26 | 6 | -154/+152 |
|\ \ \ \ \ | |||||
| * | | | | | Add prepared statements support for `Mysql2Adapter` | Ryuta Kamizono | 2015-11-26 | 6 | -154/+152 |
* | | | | | | Merge pull request #22263 from mastahyeti/csrf-origin-check | Rafael França | 2015-11-26 | 5 | -4/+81 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add option to verify Origin header in CSRF checks | Ben Toews | 2015-11-25 | 5 | -4/+81 |
* | | | | | | | Merge pull request #22411 from jaredbeck/doc_ar_joins | Yves Senn | 2015-11-26 | 1 | -2/+22 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Docs: ActiveRecord::QueryMethods#joins | Jared Beck | 2015-11-25 | 1 | -2/+22 |
| | |/ / / / / | |/| | | | | | |||||
* / | | | | | | Only run listen tests in isolation, for now | Godfrey Chan | 2015-11-26 | 2 | -1/+21 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #22401 from cllns/remove-br-from-scaffold | Kasper Timm Hansen | 2015-11-25 | 2 | -3/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove <br> from scaffold, in favor of using CSS | Sean Collins | 2015-11-25 | 2 | -3/+7 |
* | | | | | | | Merge pull request #22290 from y-yagi/donot_show_test_unit_job | Eileen M. Uchitelle | 2015-11-25 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | do not show Active Job test generator | yuuji.yaginuma | 2015-11-14 | 1 | -0/+1 |
* | | | | | | | Merge pull request #22399 from wjessop/remove_unused_code | Eileen M. Uchitelle | 2015-11-24 | 1 | -4/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove unused code | Will Jessop | 2015-11-24 | 1 | -4/+1 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #22348 from kv109/22233_without_deprecation | Andrew White | 2015-11-24 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix wrong timezone mapping for Switzerland [22233] | Kacper Walanus | 2015-11-15 | 1 | -1/+2 |
* | | | | | | | | Merge pull request #22370 from yui-knk/remove_blank_line | Andrew White | 2015-11-24 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Remove a blank line from a template for plugin `routes.rb` | yui-knk | 2015-11-22 | 1 | -1/+0 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #22304 from kamipo/schema_dumping_support_for_postgresql_g... | Yves Senn | 2015-11-24 | 4 | -104/+161 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add schema dumping support for PostgreSQL geometric data types | Ryuta Kamizono | 2015-11-24 | 3 | -11/+77 |
| * | | | | | | | | Move `migration/postgresql_geometric_types_test.rb` in `adapters/postgresql/g... | Ryuta Kamizono | 2015-11-24 | 2 | -93/+84 |
* | | | | | | | | | Merge pull request #22214 from kamipo/not_passing_native_database_types_to_ta... | Rafael França | 2015-11-24 | 4 | -15/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Not passing `native_database_types` to `TableDefinition` | Ryuta Kamizono | 2015-11-08 | 4 | -15/+6 |
* | | | | | | | | | | Merge pull request #22172 from tijmenb/fix-source-in-show-exception | Rafael França | 2015-11-24 | 3 | -0/+16 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add text template for source code | Tijmen Brommet | 2015-11-03 | 3 | -0/+16 |
* | | | | | | | | | | | Move all nodoc methods to the private section | Rafael Mendonça França | 2015-11-24 | 1 | -43/+43 |
* | | | | | | | | | | | Put all private method together | Rafael Mendonça França | 2015-11-24 | 1 | -36/+35 |
* | | | | | | | | | | | Avoid mutating the headers hash | Rafael Mendonça França | 2015-11-24 | 1 | -2/+3 |
* | | | | | | | | | | | nodoc in the private method | Rafael Mendonça França | 2015-11-24 | 1 | -1/+1 |
* | | | | | | | | | | | Merge pull request #22120 from hnatt/refactor-actionmailer | Rafael Mendonça França | 2015-11-24 | 1 | -55/+59 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Rename ActionMailer::Base#class_from_value -> observer_class_for | hnatt | 2015-10-30 | 1 | -4/+4 |