aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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) ```
* | | Merge pull request #31923 from jdelStrother/duration-deserializationRafael França2018-02-072-0/+14
|\ \ \ | | | | | | | | Fix yaml deserialization of ActiveSupport::Duration
| * | | Fix yaml deserialization of ActiveSupport::DurationJonathan del Strother2018-02-072-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | This ensures the duration's @parts hash has a default value, to avoid this regression introduced in 5.1: YAML.load(YAML.dump(10.minutes)) + 1 # => NoMethodError: undefined method `+' for nil:NilClass
* | | | Bump `minitest-server`yuuji.yaginuma2018-02-071-2/+2
| |/ / |/| | | | | | | | | | | | | | In order to use `minitest_bisect` with Minitest 5.11.x, it needs to be updated. Ref: https://github.com/seattlerb/minitest-server/issues/2
* | | Revert "✂️"Ryuta Kamizono2018-02-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 487a1061cc496455dfe5ee84d1e49d509c1675b5. This `#--` is necessary for the doc of `distinct`. [ci skip]
* | | ✂️schneems2018-02-061-2/+1
| | |
* | | Merge pull request #31914 from utilum/bump_em-socksifyMatthew Draper2018-02-071-1/+1
|\ \ \ | | | | | | | | Update em-socksify to the latest version
| * | | Update em-socksify to the latest versionutilum2018-02-061-1/+1
| | | | | | | | | | | | | | | | Avoid warning: parentheses after method name is interpreted as an argument list, not a decomposed argument
* | | | Merge pull request #31912 from robin850/upgrade-sdoc-1-0Matthew Draper2018-02-072-11/+5
|\ \ \ \ | |/ / / |/| | | Refer to a stable release of SDoc
| * | | Refer to a stable release of SDocRobin Dupret2018-02-062-11/+5
|/ / /
* | | Merge pull request #31880 from ↵Javan Makhmali2018-02-063-3/+13
|\ \ \ | | | | | | | | | | | | | | | | rmacklin/publish-activestorage-source-in-addition-to-compiled-js Include source code in published activestorage npm package
| * | | Include source code in published activestorage npm packageRichard Macklin2018-02-063-3/+13
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows activestorage users to ship smaller javascript bundles to visitors using modern browsers, as demonstrated in this repository: https://github.com/rmacklin/activestorage-es2015-build-example In that example, the bundle shrinks by 5K (24%). In addition to allowing smaller bundles for those who ship untranspiled code to modern browsers, including the source code in the published package can be useful in other ways: 1. Users can import individual modules rather than the whole library 2. As a result of (1), users can also monkey patch parts of activestorage by importing the relevant module, modifying the exported object, and then importing the rest of activestorage (which would then use the patched object). Note: In order to allow the source code to be depended on rather than the compiled code, we have to declare the external dependency on spark-md5 as a regular dependency, not a development dependency. This means that even users who depend on the compiled code will have to download this package. However, spark-md5 is a small package, so this tradeoff seems worth it.
* | | Merge pull request #31240 from PHedkvist/sys_test_mobile_guideEileen M. Uchitelle2018-02-061-0/+28
|\ \ \ | | | | | | | | Example of multiple configurations for system test in guide [ci skip]
| * | | Example of mobile configuration for system test in guide [ci skip]Pierre Hedkvist2017-12-041-0/+28
| | | |
* | | | Invoke `load_schema` in `_default_attributes`Ryuta Kamizono2018-02-062-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently `_default_attributes` doesn't work unless `load_schema` is called before. The `MissingAttributeError` is caused by `reload_schema_from_cache` is invoked by `serialize`. I added `load_schema` in `_default_attributes` to `_default_attributes` works without any dependency like `attribute_types` etc. Closes #31905.
* | | | Use Redis#mget for RedisCacheStore#fetch_multifatkodima2018-02-052-0/+16
| | | |
* | | | Add missing instrumentation to RedisCacheStore#read_multifatkodima2018-02-057-18/+25
| | | |
* | | | Don't output information on drop if not verboseeileencodes2018-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | Followup to b988ecb, when I cherry-picked from my parallel testing branch I didn't realize `drop` wasn't part of the commit.
* | | | Add ability to turn off verbose for database taskseileencodes2018-02-051-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You could use the `VERBOSE` env var to turn off output for migrations tasks but you couldn't use it for other tasks. This change moves the `verbose?` check to a method so we can also use it in create and drop respectively. tenderlove and I noticed this as part of the ongoing work in parallel testing. When the parallel tests boot the app needs to create new databases for each worker. The output from these is unnecessary but there was previously no way to turn it off. Now if `VERBOSE=false` is passes to `bin/rails db:create` the text "Created blah blah db" will no longer be output.
* | | | Redis cache store: consolidate serializationJeremy Daer2018-02-041-17/+21
| | | | | | | | | | | | | | | | Use `serialize_entry` throughout and introduce `serialize_entries`.
* | | | RedisCacheStore: fix `#write_multi` mset serializationfatkodima2018-02-042-1/+18
| | | | | | | | | | | | | | | | | | | | Closes #31886 Fixes #31884
* | | | Make test runner work with AR test toolyuuji.yaginuma2018-02-041-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since #29572, test runner will be loaded as minitest's plugin. Therefore, if specify a value in `Minitest.extensions` before the Minitest initialization process, the extension will not load and the test runner will not work. https://github.com/seattlerb/minitest/blob/44eee51ed9716c789c7cea8a90c131cf736b8915/lib/minitest.rb#L86 Also, load processing of adapter is done before minitest option processing, so set the adapter in the file so that the `-a` option works.
* | | | Prefer `@connection.abandon_results!` than `@connection.next_result while ↵Ryuta Kamizono2018-02-041-1/+1
| | | | | | | | | | | | | | | | @connection.more_results?`
* | | | Add nodoc to `migrations_paths` and `migration_context` in `AbstractAdapter`Ryuta Kamizono2018-02-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | These are internally used only. [ci skip]
* | | | Merge pull request #31878 from timdiggins/corrections-to-31755Ryuta Kamizono2018-02-041-6/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Correct capitalization of "Rails" in guide text [ci skip]
| * | | | Correct capitalization of "Rails" in the guide text.Tim Diggins2018-02-031-6/+6
|/ / / / | | | | | | | | | | | | correction to #31755 as per https://github.com/rails/rails/pull/31755#discussion_r165819798
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 22:07:29 +0000