aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge pull request #22142 from r11runner/query-guide-first-last-default-scopeYves Senn2015-11-021-0/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | [ci skip] querying guide methods first and last: mentioning the influence of ...r11runner2015-10-311-0/+4
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #22152 from y-yagi/remove_sass-cache_from_gitignoreAndrew White2015-11-021-1/+0
|\ \ \ \ \ \ \
| * | | | | | | remove unnecessary `.sass-cache` from plugin's gitignore templateyuuji.yaginuma2015-11-021-1/+0
| |/ / / / / /
* | | | | | | Merge pull request #22133 from yui-knk/sanitize_sql_for_orderAndrew White2015-11-025-5/+30
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Define `sanitize_sql_for_order` for AR and use it inside `preprocess_order_args`yui-knk2015-11-025-5/+30
|/ / / / / /
* | | | | | Merge pull request #22090 from kamipo/bigint_default_nilAndrew White2015-11-024-3/+36
|\ \ \ \ \ \
| * | | | | | Allow bigint with default nil for avoiding auto increment primary keyRyuta Kamizono2015-11-024-3/+36
|/ / / / / /
* | | | | | Merge pull request #22061 from kamipo/remove_default_charset_and_collationAndrew White2015-11-023-21/+13
|\ \ \ \ \ \
| * | | | | | Remove `DEFAULT_CHARSET` and `DEFAULT_COLLATION` in `MySQLDatabaseTasks`Ryuta Kamizono2015-11-023-21/+13
|/ / / / / /
* | | | | | Merge pull request #22130 from k0kubun/left-joins-changelogAndrew White2015-11-021-0/+5
|\ \ \ \ \ \
| * | | | | | Add CHANGELOG entry for #22125 [ci skip]Takashi Kokubun2015-11-021-0/+5
|/ / / / / /
* | | | | | Merge pull request #22131 from yui-knk/move_test_to_inheritance_testAndrew White2015-11-022-80/+80
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Move some AR test cases to inheritance_test.rbyui-knk2015-10-312-80/+80
* | | | | | Merge pull request #22149 from samphilipd/masterAndrew White2015-11-011-0/+5
|\ \ \ \ \ \
| * | | | | | 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
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |