TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
66,292 Commits 2 Branches 0 Tags 294 MiB
e360ac1231
Commit Graph

66292 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evgenii Pecherkin
e360ac1231 Introduce serializers to ActiveJob 2018-02-14 13:10:07 -05:00
Rafael Mendonça França
2e87ea6d70 Don't force people to upgrade i18n gem 2018-02-14 11:55:36 -05:00
Rafael Mendonça França
79aa6158b8 Update Gemfile.lock 2018-02-14 01:47:37 -05:00
Rafael França
24e067a127
Merge pull request #31991 from radar/bump-i18n-to-one-dot-oh 
Bump i18n to 1.0
 2018-02-14 01:45:49 -05:00
Ryan Bigg
068fc462fd
Bump i18n to 1.0 2018-02-14 12:49:19 +11:00
George Claghorn
c476969b44 Document MuPDF version requirement 2018-02-13 10:47:39 -05:00
Yuji Yaginuma
8157c8a742
Merge pull request #31978 from claudiob/don-t-overwrite-master-key 
Don't overwrite config/master.key even on --force
 2018-02-13 21:18:39 +09:00
claudiob
b77861d0c9 Don't overwrite config/master.key even on --force 
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.
 2018-02-12 22:10:28 -08:00
Rafael França
b9ed1fa444
Merge pull request #31970 from fatkodima/active_storage-unattached-scope 
Add ActiveStorage::Blob.unattached scope
 2018-02-12 20:55:23 -05:00
Yuji Yaginuma
2c4e9c678b
Do not update load_defaults version when running app:update (#31951) 
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`.
 2018-02-13 07:13:38 +09:00
Joseph Page
c01c38efbd
Doc: fixes typo cache: -> compress: 
[ci skip]

Closes #31967
 2018-02-12 12:49:16 -08:00
Rafael França
2e84839a09
Merge pull request #31971 from ydakuka/patch-1 
Change structure in the AS core extensions guide [ci skip]
 2018-02-12 15:37:46 -05:00
Yauheni Dakuka
a7b97454f8
Change structure of AS core extensions [ci skip] 2018-02-12 23:29:34 +03:00
Rafael Mendonça França
4c615a53e0 Add test to make sure pick works in a NullRelation 2018-02-12 15:15:16 -05:00
fatkodima
0c463f50ea Add ActiveStorage::Blob.unattached scope 2018-02-12 22:13:00 +02:00
Rafael França
18b13d768f
Merge pull request #31968 from wojtodzio/fix-activestorage-blob-includes 
ActiveStorage: use full class names when including concerns to avoid collisions
 2018-02-12 15:04:38 -05:00
Wojtek Wrona
40fabc3cc1
Use full class names when including concerns to avoid collisions 2018-02-12 16:37:54 +01:00
Eileen M. Uchitelle
81c7d4138a
Merge pull request #31953 from jameslovejoy/improve-wording-getting-started 
Improve wording in getting started guide
 2018-02-12 09:08:14 -05:00
Ryuta Kamizono
4a17b26c68
Merge pull request #31962 from ydakuka/patch-1 
Missing parentheses [ci skip]
 2018-02-12 15:35:51 +09:00
Yauheni Dakuka
27e5c76a77 Remove parentheses [ci skip] 2018-02-12 09:31:24 +03:00
George Claghorn
cfcb92f9ea Add missing require 2018-02-11 18:30:09 -05:00
Yuji Yaginuma
360d9bdbf3
Merge pull request #31957 from claudiob/force-master-key 
Respect --force option for config/master.key
 2018-02-12 07:49:37 +09:00
claudiob
24284fd3d4 Respect --force option for config/master.key 
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.
 2018-02-11 11:37:21 -08:00
Matthew Draper
a2a752d102
Merge pull request #31133 from mohsen-alizadeh/sanitize_empty_and_nil_parameters_passed_to_select 
sanitize empty and nil parameters to select #31059
 2018-02-11 19:37:10 +10:30
Akira Matsuda
d0192e0c2d Unused core_ext 2018-02-11 02:19:50 +09:00
James Lovejoy
b62eed173f Improve wording in getting started guide 
[ci skip]
 2018-02-09 23:33:35 -08:00
Claudio B
936a96a98b
Merge pull request #31949 from rails/remove-move 
Remove warning from 4 years ago [ci skip]
 2018-02-09 16:55:05 -08:00
claudiob
4491ce902b Remove warning from 4 years ago [ci skip] 
`config/initializers/assets.rb` has been a part of Rails apps since
Rails 4.2 (30b56084). This comment is probably unnecessary by now.
 2018-02-09 16:49:38 -08:00
yuuji.yaginuma
b91a4a0826 Fix formatting of pick [ci skip] 2018-02-10 09:01:03 +09:00
Rafael Mendonça França
c92ea62792 Make sure assert_recognizes can still find routes mounted after engines 
Before, if the application defined after an engine this method would not
recognize the route since it was not defined insdie the engine.
 2018-02-09 13:51:20 -05:00
David Heinemeier Hansson
80cc0d323b
Add Relation#pick as short-hand for single-value plucks (#31941) 
* Add Relation#pick as short-hand for single-value plucks
 2018-02-09 10:30:19 -08:00
Eileen M. Uchitelle
b6ee4e4b98
Merge pull request #31927 from mrreynolds/patch-2 
Document :combine_options
 2018-02-09 09:18:11 -05:00
Yuji Yaginuma
172c80dfd9
Merge pull request #31942 from yhirano55/use_heredoc_with_credentials_template 
Use heredoc with credentials template
 2018-02-09 16:59:45 +09:00
Yoshiyuki Hirano
1469657349 Use heredoc with credentials template 
* Use heredoc with credentials template.
* Fix indentation for aws config
 2018-02-09 15:38:44 +09:00
Ryuta Kamizono
52c9af6c51 Merge pull request #31934 from fatkodima/fix-has_many_through-dumping 
Fix marshaling of models with `has_many :through` associations
 2018-02-09 09:53:35 +09:00
Ryuta Kamizono
0613533f78
Merge pull request #31919 from bogdanvlviv/fix-test_counter_cache_with_touch_and_lock_version 
Fix `test_counter_cache_with_touch_and_lock_version` failure
 2018-02-09 09:43:34 +09:00
Robert Glaser
6ee504b1d7 Document :combine_options 
Turns out this is still undocumented functionality.
 2018-02-08 21:54:29 +01:00
fatkodima
42a3c92c8c Fix marshaling of models with has_many :through associations 2018-02-08 16:13:56 +02:00
Eileen M. Uchitelle
d7f9adf794
Merge pull request #31925 from composerinteralia/semicolon 
Fix grammar bug in security guide [ci skip]
 2018-02-08 08:37:19 -05:00
claudiob
cc488b40d2 Add docs on how to configure Active Storage 
[ci skip]
 2018-02-08 08:09:56 -05:00
yuuji.yaginuma
e4719ec047 Add missing require 
Without this require, an error occurs when executing only `duration_test.rb`.
Ref: https://travis-ci.org/rails/rails/jobs/338817558#L2205-L2210
 2018-02-08 20:05:48 +09:00
Yuji Yaginuma
5d75ef72e6
Do not add master key when RAILS_MASTER_KEY env specified (#31922) 
Fixes #31917
 2018-02-08 19:49:50 +09:00
George Claghorn
cc523fba9b
Merge pull request #31918 from huacnlee/fix/blob-service-url-for-string-filename 
Fix `blob.service_url` for supports string type `:filename` option
 2018-02-07 22:31:32 -05:00
Jason Lee
0625a2ba80 Fix blob.service_url for supports string or nil :filename option. 
- 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)
```
 2018-02-08 10:15:55 +08:00
Daniel Colson
013fd84373 Remove password anecdotes from guides [ci skip] 2018-02-07 18:00:10 -05:00
bogdanvlviv
4444294cd9
Fix test_counter_cache_with_touch_and_lock_version failure 
https://travis-ci.org/rails/rails/jobs/338338927#L1043

Related to daf15f58b943d85d8fb726590ae94f77ca0a5d5f
 2018-02-07 23:23:19 +02:00
Rafael França
5ae2ecab6d
Merge pull request #31923 from jdelStrother/duration-deserialization 
Fix yaml deserialization of ActiveSupport::Duration
 2018-02-07 15:06:21 -05:00
Jonathan del Strother
a467c6bdd5 Fix yaml deserialization of ActiveSupport::Duration 
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
 2018-02-07 13:19:08 +00:00
yuuji.yaginuma
c5d431e469 Bump minitest-server 
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
 2018-02-07 21:47:48 +09:00
Ryuta Kamizono
01c54e29bd Revert "✂️" 
This reverts commit 487a1061cc496455dfe5ee84d1e49d509c1675b5.

This `#--` is necessary for the doc of `distinct`.

[ci skip]
 2018-02-07 14:49:24 +09:00