aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #22985 from akshay-vishnoi/fix-typoRafael França2016-01-161-1/+1
|\
| * test `include?`- fix typoAkshay Vishnoi2016-01-091-1/+1
* | Merge pull request #23067 from kamipo/sql_for_insert_returns_values_for_passi...Rafael França2016-01-163-24/+16
|\ \
| * | `sql_for_insert` returns values for passing to `exec_insert`Ryuta Kamizono2016-01-153-24/+16
* | | Merge pull request #23079 from y-yagi/fix_log_clear_exampleRafael França2016-01-161-1/+1
|\ \ \
| * | | remove unnecessary `ENV[]` from `log:clear` example [ci skip]yuuji.yaginuma2016-01-161-1/+1
|/ / /
* | | Merge pull request #23060 from schneems/schneems/revert-revert-migration-set-...Richard Schneeman2016-01-152-19/+59
|\ \ \
| * | | Fix intermittent test failuresschneems2016-01-141-0/+1
| * | | Revert "Revert "Set environment even when no migration runs""schneems2016-01-142-19/+58
* | | | Merge pull request #22278 from poporul/masterGodfrey Chan2016-01-152-6/+14
|\ \ \ \
| * | | | Allow to store .keep file in cache directoryAlexey Pokhozhaev2015-11-132-6/+14
* | | | | Merge pull request #23071 from khundawg/dave_moore/update-docs-ActionCable__C...Jon Moss2016-01-151-1/+1
|\ \ \ \ \
| * | | | | [ci skip] Fix typo in docsDAVID MOORE2016-01-151-1/+1
* | | | | | Merge pull request #23065 from kamipo/clean_up_internal_metadata_definitionRichard Schneeman2016-01-152-4/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Clean up internal metadata definitionRyuta Kamizono2016-01-152-4/+3
* | | | | | Merge pull request #23068 from kamipo/remove_unused_last_insert_id_valueSean Griffin2016-01-151-9/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | `last_insert_id_value` and `last_insert_id` are unused anymoreRyuta Kamizono2016-01-151-9/+1
|/ / / / /
* | | | | Merge pull request #23014 from jonatack/improve-generated-config-filesRafael França2016-01-152-4/+6
|\ \ \ \ \
| * | | | | Improve generated config initializer filesJon Atack2016-01-132-4/+6
| |/ / / /
* | | | | Merge pull request #23052 from kamipo/update_deprecation_horizonRafael França2016-01-151-3/+3
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Update deprecation_horizon to 5.1 from 5.0 [ci skip]Ryuta Kamizono2016-01-141-3/+3
* | | | | Merge pull request #23059 from rails/revert-23017-schneems/migration-sets-env...Sean Griffin2016-01-142-58/+19
|\ \ \ \ \
| * | | | | Revert "Set environment even when no migration runs"Sean Griffin2016-01-142-58/+19
|/ / / / /
* | | | | Revert "Merge pull request #20835 from glittershark/if-and-unless-in-secure-t...Kasper Timm Hansen2016-01-145-45/+2
* | | | | Merge pull request #23048 from kamipo/substitute_at_is_no_longer_usedSean Griffin2016-01-146-20/+3
|\ \ \ \ \
| * | | | | `substitute_at` is no longer usedRyuta Kamizono2016-01-146-20/+3
* | | | | | Properly include the `from` clause when merging relationsSean Griffin2016-01-142-0/+10
* | | | | | Ensure enum scopes work properly with STI and inheritanceSean Griffin2016-01-141-1/+1
* | | | | | Merge pull request #23017 from schneems/schneems/migration-sets-environment-v...Richard Schneeman2016-01-142-19/+58
|\ \ \ \ \ \
| * | | | | | Set environment even when no migration runsschneems2016-01-112-1/+37
| * | | | | | Clean up duplicate migration logicschneems2016-01-112-18/+21
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #23054 from ankit1910/update-docJon Moss2016-01-141-0/+1
|\ \ \ \ \ \
| * | | | | | update doc for << method of has_many associationankit19102016-01-141-0/+1
* | | | | | | Merge pull request #23056 from ankit1910/fix-typoRafael França2016-01-141-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | [ci skip] fix typo in docsankit19102016-01-141-1/+1
|/ / / / / /
* | | | | | Merge pull request #23049 from sevenseacat/patch-1Jon Moss2016-01-131-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix typo in docs [ci skip]Rebecca Skinner2016-01-141-2/+2
|/ / / / /
* | / / / Space OddityAkira Matsuda2016-01-143-4/+4
| |/ / / |/| | |
* | | | docs, formatting pass over changelogs. [ci skip]Yves Senn2016-01-134-11/+13
* | | | fix regression when loading fixture files with symbol keys.Yves Senn2016-01-134-2/+16
* | | | Merge pull request #23040 from rafaelfranca/or-error-messageMatthew Draper2016-01-132-7/+11
|\ \ \ \
| * | | | Improve error message for #or when it is structurally incompatibleRafael Mendonça França2016-01-132-7/+11
|/ / / /
* | | | do not run in parallel on travisAaron Patterson2016-01-121-1/+5
* | | | Revert "Change `WhereClause#merge` to same named columns on diff tables"Sean Griffin2016-01-122-25/+13
* | | | remove `present?` callsAaron Patterson2016-01-121-4/+4
* | | | monkey patch `recycle!` on to controllers onceAaron Patterson2016-01-121-4/+4
* | | | Merge pull request #22935 from cllns/add-status-name-to-outputRafael França2016-01-125-17/+84
|\ \ \ \
| * | | | Add both HTTP Response Code and Type to assertion messagesSean Collins2016-01-125-17/+84
* | | | | Merge pull request #23035 from jkowens/fix-null-byteRafael França2016-01-122-1/+9
|\ \ \ \ \
| * | | | | Prevent attempt to serve a request with a null byteJordan Owens2016-01-122-1/+9