summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-07-13 13:57:43 +0200
committerJames Lopez <james@jameslopez.es>2016-07-13 13:57:43 +0200
commitdd63955032aeebfa76b774b008820879e7d37353 (patch)
tree84eae038405c3e190ff3462726b5aaf7e01a20c6
parent0b2469a4e5ee5d8deec072be3426c28133927740 (diff)
downloadgitlab-ce-dd63955032aeebfa76b774b008820879e7d37353.tar.gz
updated create_or_update_import_data to use guard clause
-rw-r--r--app/models/project.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index 72c4f591420..7dc9f396e9e 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -465,7 +465,7 @@ class Project < ActiveRecord::Base
import_url = Gitlab::UrlSanitizer.new(value)
super(import_url.sanitized_url)
- create_or_update_import_data(credentials: import_url.credentials) if valid_import_url?
+ create_or_update_import_data(credentials: import_url.credentials)
end
def import_url
@@ -482,6 +482,8 @@ class Project < ActiveRecord::Base
end
def create_or_update_import_data(data: nil, credentials: nil)
+ return unless valid_import_url?
+
project_import_data = import_data || build_import_data
if data
project_import_data.data ||= {}