aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* `connection_options` is only needed for `MysqlAdapter`Ryuta Kamizono2015-11-293-3/+3
* Merge pull request #22443 from Wasserschlange/added_dollarsign_to_readmeXavier Noria2015-11-291-4/+4
|\
| * 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.mdthe-undefined2015-11-131-2/+2
* | Merge pull request #22315 from takatoshiono/fix-configuring-docArthur Nogueira Neves2015-11-281-2/+2
|\ \
| * | 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`yui-knk2015-11-282-7/+22
* | | | Merge pull request #22437 from yui-knk/changelog_ap2Kasper Timm Hansen2015-11-281-0/+2
|\ \ \ \
| * | | | [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
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | add `bin/test` script to rails pluginyuuji.yaginuma2015-11-287-7/+153
|/ / / /
* | | | Partially revert 14b20ceGodfrey Chan2015-11-272-2/+13
* | | | let the generated app Gemfile depend on listen 3.0.5Xavier Noria2015-11-261-1/+1
* | | | 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.Paul Grayson2015-10-294-1/+17
* | | | | Merge pull request #22420 from rails/revert-22415-prepared_statements_for_mys...Sean Griffin2015-11-266-152/+154
|\ \ \ \ \
| * | | | | 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
* | | | | Merge pull request #22415 from kamipo/prepared_statements_for_mysql2_adapterSean Griffin2015-11-266-154/+152
|\ \ \ \ \
| * | | | | 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 checksBen Toews2015-11-255-4/+81
* | | | | | | Merge pull request #22411 from jaredbeck/doc_ar_joinsYves Senn2015-11-261-2/+22
|\ \ \ \ \ \ \
| * | | | | | | Docs: ActiveRecord::QueryMethods#joinsJared Beck2015-11-251-2/+22
| | |/ / / / / | |/| | | | |
* / | | | | | Only run listen tests in isolation, for nowGodfrey Chan2015-11-262-1/+21
|/ / / / / /
* | | | | | Merge pull request #22401 from cllns/remove-br-from-scaffoldKasper Timm Hansen2015-11-252-3/+7
|\ \ \ \ \ \
| * | | | | | 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 generatoryuuji.yaginuma2015-11-141-0/+1
* | | | | | | Merge pull request #22399 from wjessop/remove_unused_codeEileen M. Uchitelle2015-11-241-4/+1
|\ \ \ \ \ \ \
| * | | | | | | Remove unused codeWill Jessop2015-11-241-4/+1
|/ / / / / / /
* | | | | | | Merge pull request #22348 from kv109/22233_without_deprecationAndrew White2015-11-241-1/+2
|\ \ \ \ \ \ \
| * | | | | | | 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`yui-knk2015-11-221-1/+0
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #22304 from kamipo/schema_dumping_support_for_postgresql_g...Yves Senn2015-11-244-104/+161
|\ \ \ \ \ \ \ \
| * | | | | | | | Add schema dumping support for PostgreSQL geometric data typesRyuta Kamizono2015-11-243-11/+77
| * | | | | | | | Move `migration/postgresql_geometric_types_test.rb` in `adapters/postgresql/g...Ryuta Kamizono2015-11-242-93/+84
* | | | | | | | | Merge pull request #22214 from kamipo/not_passing_native_database_types_to_ta...Rafael França2015-11-244-15/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Not passing `native_database_types` to `TableDefinition`Ryuta Kamizono2015-11-084-15/+6
* | | | | | | | | | Merge pull request #22172 from tijmenb/fix-source-in-show-exceptionRafael França2015-11-243-0/+16
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add text template for source codeTijmen Brommet2015-11-033-0/+16
* | | | | | | | | | | Move all nodoc methods to the private sectionRafael Mendonça França2015-11-241-43/+43
* | | | | | | | | | | Put all private method togetherRafael Mendonça França2015-11-241-36/+35
* | | | | | | | | | | Avoid mutating the headers hashRafael Mendonça França2015-11-241-2/+3
* | | | | | | | | | | nodoc in the private methodRafael Mendonça França2015-11-241-1/+1
* | | | | | | | | | | Merge pull request #22120 from hnatt/refactor-actionmailerRafael Mendonça França2015-11-241-55/+59
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Rename ActionMailer::Base#class_from_value -> observer_class_forhnatt2015-10-301-4/+4