Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Improve documentation on custom serializers | Rafael Mendonça França | 2018-02-14 | 4 | -79/+47 | |
| | | | ||||||
| * | | Add configuration to set custom serializers | Rafael Mendonça França | 2018-02-14 | 2 | -0/+8 | |
| | | | ||||||
| * | | No need to require a autoloaded constant | Rafael Mendonça França | 2018-02-14 | 1 | -1/+0 | |
| | | | ||||||
| * | | Add serializers for Time, Date and DateTime | Rafael Mendonça França | 2018-02-14 | 7 | -2/+77 | |
| | | | ||||||
| * | | Allow serializers to be used either as classes or objects | Rafael Mendonça França | 2018-02-14 | 10 | -124/+110 | |
| | | | ||||||
| * | | Add symbol and duration serializers | Rafael Mendonça França | 2018-02-14 | 4 | -2/+52 | |
| | | | ||||||
| * | | Only add one more custom key in the serialized hash | Rafael Mendonça França | 2018-02-14 | 6 | -51/+59 | |
| | | | | | | | | | | | | | | | | | | | | | Now custom serialziers can register itself in the serialized hash using the "_aj_serialized" key that constains the serializer name. This way we can avoid poluting the hash with many reserved keys. | |||||
| * | | Define the interface of a Serializer | Rafael Mendonça França | 2018-02-14 | 1 | -0/+18 | |
| | | | ||||||
| * | | Remove unnecessary qualified constant lookups | Rafael Mendonça França | 2018-02-14 | 5 | -11/+11 | |
| | | | ||||||
| * | | Simplify the implementation of custom serialziers | Rafael Mendonça França | 2018-02-14 | 3 | -41/+37 | |
| | | | | | | | | | | | | | | | Right now it is only possible to define serializers globally so we don't need to use a class attribute in the job class. | |||||
| * | | Remove non-default serializers | Evgenii Pecherkin | 2018-02-14 | 10 | -163/+72 | |
| | | | ||||||
| * | | Introduce serializers to ActiveJob | Evgenii Pecherkin | 2018-02-14 | 19 | -136/+602 | |
| | | | ||||||
* | | | Merge pull request #31993 from tjschuck/rdoc_formatting_fix | Rafael França | 2018-02-14 | 1 | -1/+1 | |
|\ \ \ | |/ / |/| | | Rdoc formatting fix: <b> instead of MD-style asterisks | |||||
| * | | Rdoc formatting fix: <b> instead of MD-style asterisks | T.J. Schuck | 2018-02-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | [ci skip] | |||||
* | | | Don't force people to upgrade i18n gem | Rafael Mendonça França | 2018-02-14 | 2 | -2/+2 | |
|/ / | ||||||
* | | Update Gemfile.lock | Rafael Mendonça França | 2018-02-14 | 1 | -2/+2 | |
| | | ||||||
* | | Merge pull request #31991 from radar/bump-i18n-to-one-dot-oh | Rafael França | 2018-02-14 | 1 | -1/+1 | |
|\ \ | | | | | | | Bump i18n to 1.0 | |||||
| * | | Bump i18n to 1.0 | Ryan Bigg | 2018-02-14 | 1 | -1/+1 | |
| | | | ||||||
* | | | Document MuPDF version requirement | George Claghorn | 2018-02-13 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #31978 from claudiob/don-t-overwrite-master-key | Yuji Yaginuma | 2018-02-13 | 2 | -2/+5 | |
|\ \ \ | | | | | | | | | Don't overwrite config/master.key even on --force | |||||
| * | | | Don't overwrite config/master.key even on --force | claudiob | 2018-02-12 | 2 | -2/+5 | |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/rails/rails/pull/31957#issuecomment-364817423 The purpose of `--force` is not to have any prompt whether a file should be kept or overwritten. In general, all existing files should be overwritten. However, `config/master.key` is special because it is git-ignored, and overwriting it will cause the app not to run (since there won't be a way to decrypt the credentials). As a result, it's probably better to keep the existing config/master.key. | |||||
* | | | Merge pull request #31970 from fatkodima/active_storage-unattached-scope | Rafael França | 2018-02-12 | 2 | -0/+19 | |
|\ \ \ | | | | | | | | | Add ActiveStorage::Blob.unattached scope | |||||
| * | | | Add ActiveStorage::Blob.unattached scope | fatkodima | 2018-02-12 | 2 | -0/+19 | |
| | | | | ||||||
* | | | | Do not update `load_defaults` version when running `app:update` (#31951) | Yuji Yaginuma | 2018-02-13 | 4 | -2/+26 | |
| | | | | | | | | | | | | | | | | | | | | Incompatible settings are included in the settings set by `load_defaults`. So, I think that target version should be updated by a user when becomes available, and should not be updated with `app:update`. | |||||
* | | | | Doc: fixes typo `cache:` -> `compress:` | Joseph Page | 2018-02-12 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Closes #31967 | |||||
* | | | | Merge pull request #31971 from ydakuka/patch-1 | Rafael França | 2018-02-12 | 1 | -9/+9 | |
|\ \ \ \ | | | | | | | | | | | Change structure in the AS core extensions guide [ci skip] | |||||
| * | | | | Change structure of AS core extensions [ci skip] | Yauheni Dakuka | 2018-02-12 | 1 | -9/+9 | |
|/ / / / | ||||||
* / / / | Add test to make sure pick works in a NullRelation | Rafael Mendonça França | 2018-02-12 | 1 | -0/+2 | |
|/ / / | ||||||
* | | | Merge pull request #31968 from wojtodzio/fix-activestorage-blob-includes | Rafael França | 2018-02-12 | 1 | -1/+3 | |
|\ \ \ | | | | | | | | | ActiveStorage: use full class names when including concerns to avoid collisions | |||||
| * | | | Use full class names when including concerns to avoid collisions | Wojtek Wrona | 2018-02-12 | 1 | -1/+3 | |
|/ / / | ||||||
* | | | Merge pull request #31953 from jameslovejoy/improve-wording-getting-started | Eileen M. Uchitelle | 2018-02-12 | 1 | -13/+13 | |
|\ \ \ | | | | | | | | | Improve wording in getting started guide | |||||
| * | | | Improve wording in getting started guide | James Lovejoy | 2018-02-09 | 1 | -13/+13 | |
| | | | | | | | | | | | | | | | | [ci skip] | |||||
* | | | | Merge pull request #31962 from ydakuka/patch-1 | Ryuta Kamizono | 2018-02-12 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | Missing parentheses [ci skip] | |||||
| * | | | | Remove parentheses [ci skip] | Yauheni Dakuka | 2018-02-12 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Add missing require | George Claghorn | 2018-02-11 | 1 | -0/+2 | |
| | | | | ||||||
* | | | | Merge pull request #31957 from claudiob/force-master-key | Yuji Yaginuma | 2018-02-12 | 2 | -1/+7 | |
|\ \ \ \ | | | | | | | | | | | Respect --force option for config/master.key | |||||
| * | | | | Respect --force option for config/master.key | claudiob | 2018-02-11 | 2 | -1/+7 | |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is similar to #30700 which ensures the `--quiet` option of `rails new` is respected by the `MasterKeyGenerator` (missing from #30067). Before this commit, running `rails new app --force` would still prompt the user what to do with the conflict in `config/master.key`: ``` … identical config/locales/en.yml conflict config/master.key Overwrite /Users/claudiob/Desktop/pizza/config/master.key? (enter "h" for help) [Ynaqdh] ``` After this commit, `config/master.key` is overwritten: ``` … identical config/locales/en.yml force config/master.key append .gitignore ``` The newly added test generates an app and then generates it again with `--force`. Without this commit, the test would just wait forever for user input. | |||||
* | | | | Merge pull request #31133 from ↵ | Matthew Draper | 2018-02-11 | 2 | -0/+16 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | mohsen-alizadeh/sanitize_empty_and_nil_parameters_passed_to_select sanitize empty and nil parameters to select #31059 | |||||
| * | | | | add test case to relation select | Mohsen Alizadeh | 2017-12-03 | 1 | -0/+15 | |
| | | | | | ||||||
| * | | | | sanitize empty and nil parameters to select | Mohsen Alizadeh | 2017-11-12 | 1 | -0/+1 | |
| | | | | | ||||||
* | | | | | Unused core_ext | Akira Matsuda | 2018-02-11 | 1 | -1/+0 | |
| |/ / / |/| | | | ||||||
* | | | | Merge pull request #31949 from rails/remove-move | Claudio B | 2018-02-09 | 1 | -2/+0 | |
|\ \ \ \ | | | | | | | | | | | Remove warning from 4 years ago [ci skip] | |||||
| * | | | | Remove warning from 4 years ago [ci skip] | claudiob | 2018-02-09 | 1 | -2/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | `config/initializers/assets.rb` has been a part of Rails apps since Rails 4.2 (30b56084). This comment is probably unnecessary by now. | |||||
* | | | | | Fix formatting of `pick` [ci skip] | yuuji.yaginuma | 2018-02-10 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Make sure assert_recognizes can still find routes mounted after engines | Rafael Mendonça França | 2018-02-09 | 2 | -4/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Before, if the application defined after an engine this method would not recognize the route since it was not defined insdie the engine. | |||||
* | | | | | Add Relation#pick as short-hand for single-value plucks (#31941) | David Heinemeier Hansson | 2018-02-09 | 2 | -0/+28 | |
| | | | | | | | | | | | | | | | * Add Relation#pick as short-hand for single-value plucks | |||||
* | | | | | Merge pull request #31927 from mrreynolds/patch-2 | Eileen M. Uchitelle | 2018-02-09 | 1 | -0/+8 | |
|\ \ \ \ \ | | | | | | | | | | | | | Document :combine_options | |||||
| * | | | | | Document :combine_options | Robert Glaser | 2018-02-08 | 1 | -0/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Turns out this is still undocumented functionality. | |||||
* | | | | | | Merge pull request #31942 from yhirano55/use_heredoc_with_credentials_template | Yuji Yaginuma | 2018-02-09 | 2 | -4/+16 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Use heredoc with credentials template | |||||
| * | | | | | | Use heredoc with credentials template | Yoshiyuki Hirano | 2018-02-09 | 2 | -4/+16 | |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | * Use heredoc with credentials template. * Fix indentation for aws config |