Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | 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 | |
* | | | | | | | | | | Merge pull request #23040 from rafaelfranca/or-error-message | Matthew Draper | 2016-01-13 | 2 | -7/+11 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Improve error message for #or when it is structurally incompatible | Rafael Mendonça França | 2016-01-13 | 2 | -7/+11 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | do not run in parallel on travis | Aaron Patterson | 2016-01-12 | 1 | -1/+5 | |
* | | | | | | | | | Revert "Change `WhereClause#merge` to same named columns on diff tables" | Sean Griffin | 2016-01-12 | 2 | -25/+13 | |
* | | | | | | | | | remove `present?` calls | Aaron Patterson | 2016-01-12 | 1 | -4/+4 | |
* | | | | | | | | | monkey patch `recycle!` on to controllers once | Aaron Patterson | 2016-01-12 | 1 | -4/+4 | |
* | | | | | | | | | Merge pull request #22935 from cllns/add-status-name-to-output | Rafael França | 2016-01-12 | 5 | -17/+84 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Add both HTTP Response Code and Type to assertion messages | Sean Collins | 2016-01-12 | 5 | -17/+84 | |
* | | | | | | | | | | Merge pull request #23035 from jkowens/fix-null-byte | Rafael França | 2016-01-12 | 2 | -1/+9 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Prevent attempt to serve a request with a null byte | Jordan Owens | 2016-01-12 | 2 | -1/+9 | |
* | | | | | | | | | | | Change `WhereClause#merge` to same named columns on diff tables | Sean Griffin | 2016-01-12 | 2 | -13/+25 | |
* | | | | | | | | | | | Merge pull request #23034 from claudiob/fix-ac-param-as-json | Rafael França | 2016-01-12 | 2 | -1/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | AC::Parameters#at_json: restore Rails 4.2’s value | claudiob | 2016-01-12 | 2 | -1/+8 | |
* | | | | | | | | | | | bring back `TEST` env for `rake test`. | Yves Senn | 2016-01-12 | 3 | -1/+21 | |
|/ / / / / / / / / / |