Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
b9f546fe2e18
Commit
9e52a2dc
authored
Apr 11, 2015
by
Douwe Maan
Browse files
Don't use URI.regexp to validate since it doens't have start/end anchors.
parent
10869deb6fc3
Changes
5
Hide whitespace changes
Inline
Side-by-side
app/models/application_setting.rb
View file @
b9f546fe
...
...
@@ -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
|
...
...
app/models/hooks/web_hook.rb
View file @
b9f546fe
...
...
@@ -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
)
...
...
app/models/project_services/bamboo_service.rb
View file @
b9f546fe
...
...
@@ -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
,
...
...
app/models/project_services/external_wiki_service.rb
View file @
b9f546fe
...
...
@@ -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
...
...
app/models/project_services/teamcity_service.rb
View file @
b9f546fe
...
...
@@ -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
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment