diff options
| author | John Jarvis <jarv@gitlab.com> | 2019-01-01 20:38:37 +0000 |
|---|---|---|
| committer | John Jarvis <jarv@gitlab.com> | 2019-01-01 20:38:37 +0000 |
| commit | e4dabec82a8f375389b9bb52b8fe6b1ac304d74e (patch) | |
| tree | aaa221a679fd83fd7f41478e50a23ded4bc08fd4 /app/models/remote_mirror.rb | |
| parent | 8f461ef779187018ddac59dbaccafe01c493e463 (diff) | |
| parent | 63c48f73803cf1c68d6c9af408f877ea61781118 (diff) | |
| download | gitlab-ce-e4dabec82a8f375389b9bb52b8fe6b1ac304d74e.tar.gz | |
Merge branch 'security-fix-ssrf-import-url-remote-mirror' into 'master'
[master] SSRF - Scan Internal Ports and GCP/AWS endpoints
See merge request gitlab/gitlabhq!2689
Diffstat (limited to 'app/models/remote_mirror.rb')
| -rw-r--r-- | app/models/remote_mirror.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/remote_mirror.rb b/app/models/remote_mirror.rb index 5a6895aefab..a3fa67c72bf 100644 --- a/app/models/remote_mirror.rb +++ b/app/models/remote_mirror.rb @@ -17,7 +17,7 @@ class RemoteMirror < ActiveRecord::Base belongs_to :project, inverse_of: :remote_mirrors - validates :url, presence: true, url: { protocols: %w(ssh git http https), allow_blank: true, enforce_user: true } + validates :url, presence: true, public_url: { protocols: %w(ssh git http https), allow_blank: true, enforce_user: true } before_save :set_new_remote_name, if: :mirror_url_changed? |