Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
2b0426a4
Commit
2b0426a4
authored
Feb 21, 2017
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix tests due to error key changed
parent
aae71188
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/models/application_setting.rb
app/models/application_setting.rb
+1
-1
spec/models/application_setting_spec.rb
spec/models/application_setting_spec.rb
+1
-1
No files found.
app/models/application_setting.rb
View file @
2b0426a4
...
@@ -309,6 +309,6 @@ class ApplicationSetting < ActiveRecord::Base
...
@@ -309,6 +309,6 @@ class ApplicationSetting < ActiveRecord::Base
def
check_default_artifacts_expire_in
def
check_default_artifacts_expire_in
ChronicDuration
.
parse
(
default_artifacts_expire_in
)
ChronicDuration
.
parse
(
default_artifacts_expire_in
)
rescue
ChronicDuration
::
DurationParseError
rescue
ChronicDuration
::
DurationParseError
errors
.
add
(
:default_artifacts_expir
atio
n
,
"is not a correct duration"
)
errors
.
add
(
:default_artifacts_expir
e_i
n
,
"is not a correct duration"
)
end
end
end
end
spec/models/application_setting_spec.rb
View file @
2b0426a4
...
@@ -59,7 +59,7 @@ describe ApplicationSetting, models: true do
...
@@ -59,7 +59,7 @@ describe ApplicationSetting, models: true do
def
expect_invalid
def
expect_invalid
expect
(
setting
).
to
be_invalid
expect
(
setting
).
to
be_invalid
expect
(
setting
.
errors
.
messages
)
expect
(
setting
.
errors
.
messages
)
.
to
have_key
(
:default_artifacts_expir
atio
n
)
.
to
have_key
(
:default_artifacts_expir
e_i
n
)
end
end
end
end
...
...
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