Don't use URI.regexp to validate since it doens't have start/end anchors.

5 files changed, 5 insertions, 5 deletions

diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 6e98c4c2f02..0d8365c4ff2 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -24,7 +24,7 @@ class ApplicationSetting < ActiveRecord::Base
 
   validates :home_page_url,
     allow_blank: true,
-    format: { with: URI::regexp(%w(http https)), message: "should be a valid url" },
+    format: { with: /\A#{URI.regexp(%w(http https))}\z/, message: "should be a valid url" },
     if: :home_page_url_column_exist
 
   validates_each :restricted_visibility_levels do |record, attr, value|
diff --git a/app/models/hooks/web_hook.rb b/app/models/hooks/web_hook.rb
index defef7216f2..315d96af1b9 100644
--- a/app/models/hooks/web_hook.rb
+++ b/app/models/hooks/web_hook.rb
@@ -28,7 +28,7 @@ class WebHook < ActiveRecord::Base
   default_timeout Gitlab.config.gitlab.webhook_timeout
 
   validates :url, presence: true,
-                  format: { with: URI::regexp(%w(http https)), message: "should be a valid url" }
+                  format: { with: /\A#{URI.regexp(%w(http https))}\z/, message: "should be a valid url" }
 
   def execute(data)
     parsed_url = URI.parse(url)
diff --git a/app/models/project_services/bamboo_service.rb b/app/models/project_services/bamboo_service.rb
index f968afe9fa8..d8aedbd2ab4 100644
--- a/app/models/project_services/bamboo_service.rb
+++ b/app/models/project_services/bamboo_service.rb
@@ -25,7 +25,7 @@ class BambooService < CiService
 
   validates :bamboo_url,
     presence: true,
-    format: { with: URI::regexp },
+    format: { with: /\A#{URI.regexp}\z/ },
     if: :activated?
   validates :build_key, presence: true, if: :activated?
   validates :username,
diff --git a/app/models/project_services/external_wiki_service.rb b/app/models/project_services/external_wiki_service.rb
index e521186798c..a199d0e86f2 100644
--- a/app/models/project_services/external_wiki_service.rb
+++ b/app/models/project_services/external_wiki_service.rb
@@ -18,7 +18,7 @@ class ExternalWikiService < Service
   prop_accessor :external_wiki_url
   validates :external_wiki_url,
             presence: true,
-            format: { with: URI::regexp },
+            format: { with: /\A#{URI.regexp}\z/ },
             if: :activated?
 
   def title
diff --git a/app/models/project_services/teamcity_service.rb b/app/models/project_services/teamcity_service.rb
index c26bc551352..3c002a1634b 100644
--- a/app/models/project_services/teamcity_service.rb
+++ b/app/models/project_services/teamcity_service.rb
@@ -25,7 +25,7 @@ class TeamcityService < CiService
 
   validates :teamcity_url,
     presence: true,
-    format: { with: URI::regexp }, if: :activated?
+    format: { with: /\A#{URI.regexp}\z/ }, if: :activated?
   validates :build_type, presence: true, if: :activated?
   validates :username,
     presence: true,