Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | Merge pull request #22983 from bronson/update-mysql-in-guides | Santiago Pastorino | 2016-01-10 | 2 | -2/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | remove legacy mysql from guides to match #22715 | Scott Bronson | 2016-01-09 | 2 | -2/+1 | |
* | | | | | | | | | | | | Merge pull request #21995 from tak1n/master | Jon Moss | 2016-01-10 | 1 | -8/+35 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | fix doc for rails custom configuration through config_for [skip ci] | Benny Klotz | 2015-12-03 | 1 | -2/+2 | |
| * | | | | | | | | | | | Updated existing custom configuration for rails 5 where `config.x` | Benny Klotz | 2015-10-19 | 1 | -8/+35 | |
* | | | | | | | | | | | | Merge pull request #22993 from akshay-vishnoi/travis-update | Matthew Draper | 2016-01-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Update postgresql version to 9.4 for travis. | Akshay Vishnoi | 2016-01-10 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Merge pull request #22992 from akshay-vishnoi/fix-docs | Sean Griffin | 2016-01-09 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | [ci skip] fix typo | Akshay Vishnoi | 2016-01-10 | 2 | -2/+2 | |
* | | | | | | | | | | | | | Split out token `if` tests to trigger `before_create`. | Kasper Timm Hansen | 2016-01-09 | 1 | -1/+5 | |
* | | | | | | | | | | | | | Revert "Switch `has_secure_token` to `before_save`." | Kasper Timm Hansen | 2016-01-09 | 1 | -4/+3 | |
* | | | | | | | | | | | | | Switch `has_secure_token` to `before_save`. | Kasper Timm Hansen | 2016-01-09 | 1 | -3/+4 | |
* | | | | | | | | | | | | | Add conditional_token to users. | Kasper Timm Hansen | 2016-01-09 | 1 | -0/+1 | |
* | | | | | | | | | | | | | Merge pull request #20835 from glittershark/if-and-unless-in-secure-token | Kasper Timm Hansen | 2016-01-09 | 4 | -2/+40 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Support :if and :unless in has_secure_token | Griffin Smith | 2016-01-09 | 4 | -2/+40 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #22703 from joshsoftware/rake-log-clear | Kasper Timm Hansen | 2016-01-09 | 4 | -10/+33 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | rake log:clear task updated refs[#22544] | Pramod | 2016-01-09 | 4 | -10/+33 | |
* | | | | | | | | | | | | [ci skip] Clarify some Minitest origins. | Kasper Timm Hansen | 2016-01-09 | 1 | -0/+2 | |
* | | | | | | | | | | | | Extract line filtering to Railties. | Kasper Timm Hansen | 2016-01-09 | 4 | -64/+69 | |
* | | | | | | | | | | | | Merge pull request #22988 from y-yagi/match_environment_variable_name_and_err... | Richard Schneeman | 2016-01-09 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | match the environment variable name that actually checking and error message | yuuji.yaginuma | 2016-01-09 | 1 | -1/+1 | |
* | | | | | | | | | | | | Merge pull request #22986 from yui-knk/fix_automatic_inverse_of_comment | प्रथमेश Sonpatki | 2016-01-09 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | [ci skip] `automatic_inverse_of` returns `false` not `nil` (document fix) | yui-knk | 2016-01-09 | 1 | -1/+1 | |
* | | | | | | | | | | | | Merge pull request #22987 from prathamesh-sonpatki/add-missing-changelong-for... | Richard Schneeman | 2016-01-08 | 1 | -0/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Added missing CHANGELOG entry for https://github.com/rails/rails/pull/22976 | Prathamesh Sonpatki | 2016-01-09 | 1 | -0/+8 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #22976 from schneems/schneems/schema-migration-primary-key | Sean Griffin | 2016-01-08 | 2 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Get update_attributes working with SchemaMigration | schneems | 2016-01-08 | 2 | -3/+3 | |
* | | | | | | | | | | | | Fix the broken build | Sean Griffin | 2016-01-08 | 1 | -0/+2 | |
| |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #22984 from akshay-vishnoi/fix-docs | Richard Schneeman | 2016-01-08 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | [ci skip] Fix typo Renderering --> Rendering | Akshay Vishnoi | 2016-01-09 | 1 | -1/+1 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Refactor tz aware types, add support for PG ranges | Sean Griffin | 2016-01-08 | 5 | -8/+67 | |
* | | | | | | | | | | | Merge pull request #22967 from schneems/schneems/generic-metadata | Sean Griffin | 2016-01-08 | 17 | -14/+253 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Fixing tests and re-locating error checking. | schneems | 2016-01-08 | 5 | -16/+17 | |
| * | | | | | | | | | | | Fix kwarg to not have circular dependency | schneems | 2016-01-08 | 1 | -1/+1 | |
| * | | | | | | | | | | | Use hash like syntax for InternalMetadata | schneems | 2016-01-08 | 6 | -14/+12 | |
| * | | | | | | | | | | | Add EnvironmentMismatchError | schneems | 2016-01-08 | 2 | -4/+25 | |
| * | | | | | | | | | | | Use `key` as primary key in schema. | schneems | 2016-01-08 | 1 | -1/+1 | |
| * | | | | | | | | | | | [ci skip] Add comment to remove silenced code. | schneems | 2016-01-07 | 1 | -0/+1 | |
| * | | | | | | | | | | | Prevent destructive action on production database | schneems | 2016-01-07 | 16 | -14/+232 | |
* | | | | | | | | | | | | Merge pull request #22977 from rails/revert-22934-master | David Heinemeier Hansson | 2016-01-08 | 15 | -46/+36 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Revert "Move async execution from celluloid to concurrent-ruby" | David Heinemeier Hansson | 2016-01-08 | 15 | -46/+36 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #22934 from mperham/master | David Heinemeier Hansson | 2016-01-08 | 15 | -36/+46 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | don't need explicit dep and a pretty neat pick | Mike Perham | 2016-01-05 | 2 | -2/+1 | |
| * | | | | | | | | | | | Use Module#thread_mattr_accessor | Mike Perham | 2016-01-05 | 1 | -8/+6 | |
| * | | | | | | | | | | | Remove celluloid references | Mike Perham | 2016-01-05 | 6 | -6/+1 | |
| * | | | | | | | | | | | Move async execution from celluloid to concurrent-ruby | Mike Perham | 2016-01-05 | 9 | -30/+48 | |
* | | | | | | | | | | | | [doc] The capture method isn't always used inside views to create a variable | Akira Matsuda & saya | 2016-01-08 | 1 | -2/+2 | |
* | | | | | | | | | | | | Merge pull request #22973 from kamipo/fix_select_values_method_signature | Rafael França | 2016-01-08 | 2 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Fix `select_values` method signature for consistency | Ryuta Kamizono | 2016-01-08 | 2 | -4/+4 | |
* | | | | | | | | | | | | | Merge pull request #22971 from kamipo/insert_sql_is_almost_same_as_insert | Rafael França | 2016-01-08 | 4 | -25/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |