aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add specific bug reporting guidelines to contributing.md. [ci skip]Tim2015-12-111-7/+33
* Merge pull request #22449 from dnagir/database_connection_messageYves Senn2015-12-011-1/+1
|\
| * Explain the connection pool error message betterDmytrii Nagirniak2015-12-011-1/+1
* | Merge pull request #22361 from grosser/grosser/rescueArthur Nogueira Neves2015-11-301-26/+19
|\ \
| * | rescue memcached errors in a consistent wayMichael Grosser2015-11-291-26/+19
* | | Merge pull request #22456 from chriskottom/fix-minitest-plugin-with-minitest-...Sean Griffin2015-11-302-1/+7
|\ \ \
| * | | 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.Nick Muerdter2015-11-193-4/+13
* | | | Merge pull request #22451 from kamipo/refactor_abstract_adapter_initializeKasper Timm Hansen2015-11-304-8/+7
|\ \ \ \
| * | | | Refactor `AbstractAdapter#initialize`Ryuta Kamizono2015-11-304-8/+7
* | | | | Merge pull request #22452 from kamipo/fix_indentationArun Agrawal2015-11-301-7/+7
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \
| * | | | | Remove some bind related test cases from finder_test.rb to sanitize_test.rbyui-knk2015-11-212-91/+94
* | | | | | Merge pull request #22427 from eliotsykes/validation-message-proc-docYves Senn2015-11-301-1/+30
|\ \ \ \ \ \
| * | | | | | 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 constantyui-knk2015-11-221-1/+1
* | | | | | | Merge pull request #18155 from bogdan/collection_association_double_element_fixSean Griffin2015-11-293-4/+20
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Bugfix collection association #create method …Bogdan Gusiev2015-11-233-4/+20
* | | | | | | Merge pull request #22444 from kamipo/connection_options_is_only_needed_for_m...Santiago Pastorino2015-11-293-3/+3
|\ \ \ \ \ \ \
| * | | | | | | `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
|\ \ \ \ \ \ \ \ \ \