Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #23008 from tawan/avoid-multiple-default-paths | Eileen M. Uchitelle | 2016-01-16 | 2 | -1/+12 |
|\ | |||||
| * | Avoid multiple default paths to server.pid file | Tawan Sierek | 2016-01-16 | 2 | -1/+12 |
|/ | |||||
* | Fix the updated API (this sorts the concurrent-ruby switch with Basecamp) | David Heinemeier Hansson | 2016-01-16 | 1 | -1/+1 |
* | Revert "Merge pull request #22977 from rails/revert-22934-master" | David Heinemeier Hansson | 2016-01-16 | 15 | -36/+46 |
* | Merge pull request #20046 from yoongkang/ladida | Rafael Mendonça França | 2016-01-16 | 3 | -1/+20 |
|\ | |||||
| * | Use ActiveSupport::SafeBuffer when flushing content_for | Yoong Kang Lim | 2015-05-25 | 3 | -1/+20 |
* | | Merge pull request #20005 from kamipo/default_expression_support | Rafael França | 2016-01-16 | 11 | -44/+100 |
|\ \ | |||||
| * | | Fix extract default with CURRENT_TIMESTUMP | Ryuta Kamizono | 2016-01-13 | 3 | -2/+24 |
| * | | Fix extract default with CURRENT_DATE | Ryuta Kamizono | 2016-01-13 | 1 | -3/+8 |
| * | | Add expression support on the schema default | Ryuta Kamizono | 2016-01-13 | 8 | -39/+68 |
* | | | Merge pull request #22985 from akshay-vishnoi/fix-typo | Rafael França | 2016-01-16 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | test `include?`- fix typo | Akshay Vishnoi | 2016-01-09 | 1 | -1/+1 |
* | | | | Merge pull request #23067 from kamipo/sql_for_insert_returns_values_for_passi... | Rafael França | 2016-01-16 | 3 | -24/+16 |
|\ \ \ \ | |||||
| * | | | | `sql_for_insert` returns values for passing to `exec_insert` | Ryuta Kamizono | 2016-01-15 | 3 | -24/+16 |
* | | | | | Merge pull request #23079 from y-yagi/fix_log_clear_example | Rafael França | 2016-01-16 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | remove unnecessary `ENV[]` from `log:clear` example [ci skip] | yuuji.yaginuma | 2016-01-16 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #23060 from schneems/schneems/revert-revert-migration-set-... | Richard Schneeman | 2016-01-15 | 2 | -19/+59 |
|\ \ \ \ \ | |||||
| * | | | | | Fix intermittent test failures | schneems | 2016-01-14 | 1 | -0/+1 |
| * | | | | | Revert "Revert "Set environment even when no migration runs"" | schneems | 2016-01-14 | 2 | -19/+58 |
* | | | | | | Merge pull request #22278 from poporul/master | Godfrey Chan | 2016-01-15 | 2 | -6/+14 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Allow to store .keep file in cache directory | Alexey Pokhozhaev | 2015-11-13 | 2 | -6/+14 |
* | | | | | | | Merge pull request #23071 from khundawg/dave_moore/update-docs-ActionCable__C... | Jon Moss | 2016-01-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | [ci skip] Fix typo in docs | DAVID MOORE | 2016-01-15 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #23065 from kamipo/clean_up_internal_metadata_definition | Richard Schneeman | 2016-01-15 | 2 | -4/+3 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Clean up internal metadata definition | Ryuta Kamizono | 2016-01-15 | 2 | -4/+3 |
* | | | | | | | | Merge pull request #23068 from kamipo/remove_unused_last_insert_id_value | Sean Griffin | 2016-01-15 | 1 | -9/+1 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | `last_insert_id_value` and `last_insert_id` are unused anymore | Ryuta Kamizono | 2016-01-15 | 1 | -9/+1 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #23014 from jonatack/improve-generated-config-files | Rafael França | 2016-01-15 | 2 | -4/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Improve generated config initializer files | Jon Atack | 2016-01-13 | 2 | -4/+6 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #23052 from kamipo/update_deprecation_horizon | Rafael França | 2016-01-15 | 1 | -3/+3 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Update deprecation_horizon to 5.1 from 5.0 [ci skip] | Ryuta Kamizono | 2016-01-14 | 1 | -3/+3 |
* | | | | | | | Merge pull request #23059 from rails/revert-23017-schneems/migration-sets-env... | Sean Griffin | 2016-01-14 | 2 | -58/+19 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Revert "Set environment even when no migration runs" | Sean Griffin | 2016-01-14 | 2 | -58/+19 |
|/ / / / / / / | |||||
* | | | | | | | Revert "Merge pull request #20835 from glittershark/if-and-unless-in-secure-t... | Kasper Timm Hansen | 2016-01-14 | 5 | -45/+2 |
* | | | | | | | Merge pull request #23048 from kamipo/substitute_at_is_no_longer_used | Sean Griffin | 2016-01-14 | 6 | -20/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | `substitute_at` is no longer used | Ryuta Kamizono | 2016-01-14 | 6 | -20/+3 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Properly include the `from` clause when merging relations | Sean Griffin | 2016-01-14 | 2 | -0/+10 |
* | | | | | | | Ensure enum scopes work properly with STI and inheritance | Sean Griffin | 2016-01-14 | 1 | -1/+1 |
* | | | | | | | Merge pull request #23017 from schneems/schneems/migration-sets-environment-v... | Richard Schneeman | 2016-01-14 | 2 | -19/+58 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Set environment even when no migration runs | schneems | 2016-01-11 | 2 | -1/+37 |
| * | | | | | | | Clean up duplicate migration logic | schneems | 2016-01-11 | 2 | -18/+21 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #23054 from ankit1910/update-doc | Jon Moss | 2016-01-14 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | update doc for << method of has_many association | ankit1910 | 2016-01-14 | 1 | -0/+1 |
* | | | | | | | | Merge pull request #23056 from ankit1910/fix-typo | Rafael França | 2016-01-14 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | [ci skip] fix typo in docs | ankit1910 | 2016-01-14 | 1 | -1/+1 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #23049 from sevenseacat/patch-1 | Jon Moss | 2016-01-13 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Fix typo in docs [ci skip] | Rebecca Skinner | 2016-01-14 | 1 | -2/+2 |
|/ / / / / / | |||||
* | / / / / | Space Oddity | Akira Matsuda | 2016-01-14 | 3 | -4/+4 |
| |/ / / / |/| | | | | |||||
* | | | | | docs, formatting pass over changelogs. [ci skip] | Yves Senn | 2016-01-13 | 4 | -11/+13 |
* | | | | | fix regression when loading fixture files with symbol keys. | Yves Senn | 2016-01-13 | 4 | -2/+16 |