aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update changelog for #22122Sam Davies2015-11-011-0/+5
* Merge pull request #22147 from jwworth/pull-request/double-stringRichard Schneeman2015-11-011-1/+1
|\
| * Fix double word 'string' [ci skip]Jake Worth2015-11-011-1/+1
|/
* Merge pull request #22083 from thejamespinto/idempotent-route-generatorAndrew White2015-11-013-1/+20
|\
| * Route generator should be idempotent - closes #22082Thiago Pinto2015-10-313-1/+20
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-10-3114-28/+28
|\ \
| * | Remove wrong period mark in `ActiveSupport::LogSubscriber` docs [ci skip]amitkumarsuroliya2015-10-111-1/+1
| * | Add missing punctuation mark in `ActiveSupport` docs [ci skip]amitkumarsuroliya2015-10-114-7/+7
| * | Fixed `ActiveSupport::NumberHelper` Outputs [ci skip]amitkumarsuroliya2015-10-111-2/+2
| * | Improved `KeyError` messages on bang version, since commit https://github.com...amitkumarsuroliya2015-10-112-2/+2
| * | Revert "Corrected ActiveSupport `time_with_zone` outputs [ci skip]"Rafael Mendonça França2015-10-101-7/+7
| * | Corrected ActiveSupport `time_with_zone` outputs [ci skip]amitkumarsuroliya2015-10-111-7/+7
| * | Improved readability of Assertion docs, replaced ‘Assert’ -> ‘Assertsâ€...amitkumarsuroliya2015-10-093-12/+12
| * | Replace `an UNIQUE` with `a UNIQUE` as UNIQUE doesn't have a vowel sound [ci ...amitkumarsuroliya2015-10-072-2/+2
| * | Fixed wording in Assertion docs, changed ‘Assert’ -> ‘Asserts’Ronak Jangir2015-10-074-4/+4
* | | Merge pull request #22140 from jwworth/pull-request/fix-double-wordArun Agrawal2015-10-311-1/+1
|\ \ \
| * | | Fix double word 'be' [ci skip]Jake Worth2015-10-311-1/+1
|/ / /
* | | Merge pull request #22136 from y-yagi/fix_changelog_formatArun Agrawal2015-10-311-2/+3
|\ \ \ | |_|/ |/| |
| * | minor formatting changes [ci skip]yuuji.yaginuma2015-10-311-2/+3
|/ /
* | split `process` from mailer instantiationAaron Patterson2015-10-302-5/+6
* | Merge pull request #22125 from k0kubun/left_joinsSean Griffin2015-10-305-3/+10
|\ \
| * | Alias left_joins to left_outer_joinsTakashi Kokubun2015-10-315-3/+10
* | | Add tasks to automatize CHANGELOG headersRafael Mendonça França2015-10-301-2/+13
* | | :scissors:Rafael Mendonça França2015-10-301-1/+0
* | | Merge pull request #21251 from rodzyn/more_param_parser_testsSean Griffin2015-10-301-0/+14
|\ \ \
| * | | Add test for parsing application/vnd.api+jsonMarcin Olichwirowicz2015-08-211-0/+14
* | | | Merge pull request #22128 from Sirupsen/config-for-envRafael França2015-10-303-2/+22
|\ \ \ \
| * | | | rails/application: allow passing an env to config_forSimon Eskildsen2015-10-303-2/+22
|/ / / /
* | | | don't sleep in testsAaron Patterson2015-10-301-10/+6
* | | | Merge pull request #22122 from samphilipd/sam/manual_locking_on_schema_migrat...Sean Griffin2015-10-308-23/+322
|\ \ \ \
| * | | | Use advisory locks to prevent concurrent migrationsSam Davies2015-10-308-23/+322
* | | | | Fix test failures caused by #12071Sean Griffin2015-10-301-10/+10
| |_|/ / |/| | |
* | | | Merge pull request #11872 from AvnerCohen/log_namespaceSean Griffin2015-10-302-1/+14
|\ \ \ \
| * | | | When logging Cache key, in debug mode, also log namespace, to create the full...Avner Cohen2015-06-232-1/+14
* | | | | Merge pull request #12071 from Crunch09/outer_joinsSean Griffin2015-10-307-16/+176
|\ \ \ \ \
| * | | | | added ActiveRecord::Relation#left_outer_joinsFlorian Thomas2015-05-197-16/+176
* | | | | | Add version constraint to database gem in generated applicationRafael Mendonça França2015-10-294-17/+32
* | | | | | Revert "ActionController::Base#process() now only takes an action name"Aaron Patterson2015-10-293-6/+22
* | | | | | Ensure `has_and_belongs_to_many` works with `belongs_to_required_by_default`Sean Griffin2015-10-293-2/+16
* | | | | | ActionController::Base#process() now only takes an action nameAaron Patterson2015-10-293-22/+6
* | | | | | switch to JSON.dump to avoid infinite recursionAaron Patterson2015-10-291-1/+1
* | | | | | Add a changelog entry for #13008Sean Griffin2015-10-291-0/+4
* | | | | | Merge pull request #13008 from ktheory/sanitize_orderSean Griffin2015-10-292-0/+12
|\ \ \ \ \ \
| * | | | | | Support SQL sanitization in AR::QueryMethods#orderAaron Suggs2013-11-222-0/+12
* | | | | | | use `dispatch` instead of `process` to run requests thougheileencodes2015-10-292-8/+8
* | | | | | | Remove unnecessary methodeileencodes2015-10-291-3/+0
* | | | | | | Merge pull request #19511 from larskanis/replace_const_conn_paramsSean Griffin2015-10-291-7/+2
|\ \ \ \ \ \ \
| * | | | | | | PostgreSQL, Replace static connection param list by the one built into libpq.Lars Kanis2015-03-251-7/+2
* | | | | | | | Merge pull request #22121 from gocardless/patch-2Andrew White2015-10-292-12/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't disable errors when turning standard_conforming_strings onHarry Marr2015-10-292-12/+10