aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Introduce serializers to ActiveJobEvgenii Pecherkin2018-02-1419-136/+602
| | |
* | | Merge pull request #31993 from tjschuck/rdoc_formatting_fixRafael França2018-02-141-1/+1
|\ \ \ | |/ / |/| | Rdoc formatting fix: <b> instead of MD-style asterisks
| * | Rdoc formatting fix: <b> instead of MD-style asterisksT.J. Schuck2018-02-141-1/+1
| | | | | | | | | | | | [ci skip]
* | | Don't force people to upgrade i18n gemRafael Mendonça França2018-02-142-2/+2
|/ /
* | Update Gemfile.lockRafael Mendonça França2018-02-141-2/+2
| |
* | Merge pull request #31991 from radar/bump-i18n-to-one-dot-ohRafael França2018-02-141-1/+1
|\ \ | | | | | | Bump i18n to 1.0
| * | Bump i18n to 1.0Ryan Bigg2018-02-141-1/+1
| | |
* | | Document MuPDF version requirementGeorge Claghorn2018-02-131-1/+1
| | |
* | | Merge pull request #31978 from claudiob/don-t-overwrite-master-keyYuji Yaginuma2018-02-132-2/+5
|\ \ \ | | | | | | | | Don't overwrite config/master.key even on --force
| * | | Don't overwrite config/master.key even on --forceclaudiob2018-02-122-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-scopeRafael França2018-02-122-0/+19
|\ \ \ | | | | | | | | Add ActiveStorage::Blob.unattached scope
| * | | Add ActiveStorage::Blob.unattached scopefatkodima2018-02-122-0/+19
| | | |
* | | | Do not update `load_defaults` version when running `app:update` (#31951)Yuji Yaginuma2018-02-134-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 Page2018-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Closes #31967
* | | | Merge pull request #31971 from ydakuka/patch-1Rafael França2018-02-121-9/+9
|\ \ \ \ | | | | | | | | | | Change structure in the AS core extensions guide [ci skip]
| * | | | Change structure of AS core extensions [ci skip]Yauheni Dakuka2018-02-121-9/+9
|/ / / /
* / / / Add test to make sure pick works in a NullRelationRafael Mendonça França2018-02-121-0/+2
|/ / /
* | | Merge pull request #31968 from wojtodzio/fix-activestorage-blob-includesRafael França2018-02-121-1/+3
|\ \ \ | | | | | | | | ActiveStorage: use full class names when including concerns to avoid collisions
| * | | Use full class names when including concerns to avoid collisionsWojtek Wrona2018-02-121-1/+3
|/ / /
* | | Merge pull request #31953 from jameslovejoy/improve-wording-getting-startedEileen M. Uchitelle2018-02-121-13/+13
|\ \ \ | | | | | | | | Improve wording in getting started guide
| * | | Improve wording in getting started guideJames Lovejoy2018-02-091-13/+13
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge pull request #31962 from ydakuka/patch-1Ryuta Kamizono2018-02-121-1/+1
|\ \ \ \ | | | | | | | | | | Missing parentheses [ci skip]
| * | | | Remove parentheses [ci skip]Yauheni Dakuka2018-02-121-1/+1
|/ / / /
* | | | Add missing requireGeorge Claghorn2018-02-111-0/+2
| | | |
* | | | Merge pull request #31957 from claudiob/force-master-keyYuji Yaginuma2018-02-122-1/+7
|\ \ \ \ | | | | | | | | | | Respect --force option for config/master.key
| * | | | Respect --force option for config/master.keyclaudiob2018-02-112-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 Draper2018-02-112-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 selectMohsen Alizadeh2017-12-031-0/+15
| | | | |
| * | | | sanitize empty and nil parameters to selectMohsen Alizadeh2017-11-121-0/+1
| | | | |
* | | | | Unused core_extAkira Matsuda2018-02-111-1/+0
| |/ / / |/| | |
* | | | Merge pull request #31949 from rails/remove-moveClaudio B2018-02-091-2/+0
|\ \ \ \ | | | | | | | | | | Remove warning from 4 years ago [ci skip]
| * | | | Remove warning from 4 years ago [ci skip]claudiob2018-02-091-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.yaginuma2018-02-101-1/+1
| | | | |
* | | | | Make sure assert_recognizes can still find routes mounted after enginesRafael Mendonça França2018-02-092-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 Hansson2018-02-092-0/+28
| | | | | | | | | | | | | | | * Add Relation#pick as short-hand for single-value plucks
* | | | | Merge pull request #31927 from mrreynolds/patch-2Eileen M. Uchitelle2018-02-091-0/+8
|\ \ \ \ \ | | | | | | | | | | | | Document :combine_options
| * | | | | Document :combine_optionsRobert Glaser2018-02-081-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Turns out this is still undocumented functionality.
* | | | | | Merge pull request #31942 from yhirano55/use_heredoc_with_credentials_templateYuji Yaginuma2018-02-092-4/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use heredoc with credentials template
| * | | | | | Use heredoc with credentials templateYoshiyuki Hirano2018-02-092-4/+16
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * Use heredoc with credentials template. * Fix indentation for aws config
* | | | | | Merge pull request #31934 from fatkodima/fix-has_many_through-dumpingRyuta Kamizono2018-02-092-2/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix marshaling of models with `has_many :through` associations
| * | | | | | Fix marshaling of models with `has_many :through` associationsfatkodima2018-02-082-2/+8
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #31919 from ↵Ryuta Kamizono2018-02-091-1/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | bogdanvlviv/fix-test_counter_cache_with_touch_and_lock_version Fix `test_counter_cache_with_touch_and_lock_version` failure
| * | | | | Fix `test_counter_cache_with_touch_and_lock_version` failurebogdanvlviv2018-02-071-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://travis-ci.org/rails/rails/jobs/338338927#L1043 Related to daf15f58b943d85d8fb726590ae94f77ca0a5d5f
* | | | | | Merge pull request #31925 from composerinteralia/semicolonEileen M. Uchitelle2018-02-081-12/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix grammar bug in security guide [ci skip]
| * | | | | | Remove password anecdotes from guides [ci skip]Daniel Colson2018-02-071-12/+0
| | |/ / / / | |/| | | |
* | | | | | Add docs on how to configure Active Storageclaudiob2018-02-081-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Add missing requireyuuji.yaginuma2018-02-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this require, an error occurs when executing only `duration_test.rb`. Ref: https://travis-ci.org/rails/rails/jobs/338817558#L2205-L2210
* | | | | | Do not add master key when `RAILS_MASTER_KEY` env specified (#31922)Yuji Yaginuma2018-02-084-2/+27
| | | | | | | | | | | | | | | | | | Fixes #31917
* | | | | | Merge pull request #31918 from huacnlee/fix/blob-service-url-for-string-filenameGeorge Claghorn2018-02-073-1/+13
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix `blob.service_url` for supports string type `:filename` option
| * | | | | Fix `blob.service_url` for supports string or nil `:filename` option.Jason Lee2018-02-083-1/+13
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make sure `blob.service_url` present a `ActiveStorage::Filename` type to `serivce.url`. - Add `ActiveStorage::Filename.wrap` method. before: ```rb blob.service_url(filename: ActiveStorage::Filename.new("new.txt")) blob.service_url(filename: "new.txt") => NoMethodError: undefined method `parameters' for "new.txt":String params = {} blob.service_url(filename: params[:filename]) => NoMethodError: undefined method `parameters' for nil:NilClass ``` after: ```rb blob.service_url(filename: "new.txt") blob.service_url(filename: nil) ```
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 12:54:05 +0000