Merge branch 'master' into zj-create-mattermost-team

1 files changed, 1 insertions, 10 deletions

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 16d4f3b4f1b..f2989eff22d 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -55,15 +55,6 @@ module Ci
         pending.unstarted.order('created_at ASC').first
       end
 
-      def create_from(build)
-        new_build = build.dup
-        new_build.status = 'pending'
-        new_build.runner_id = nil
-        new_build.trigger_request_id = nil
-        new_build.token = nil
-        new_build.save
-      end
-
       def retry(build, current_user)
         Ci::RetryBuildService
           .new(build.project, current_user)
@@ -484,7 +475,7 @@ module Ci
     def artifacts_expire_in=(value)
       self.artifacts_expire_at =
         if value
-          Time.now + ChronicDuration.parse(value)
+          ChronicDuration.parse(value)&.seconds&.from_now
         end
     end