Addresses database comments

- Adds a default on expires_at datetime
- Modifies deploy tokens views to handle default expires at value
- Use datetime_with_timezone where possible
- Remove unused scopes

2 files changed, 1 insertions, 1 deletions

diff --git a/spec/features/projects/settings/repository_settings_spec.rb b/spec/features/projects/settings/repository_settings_spec.rb
index 7887178a3ed..2528c7f437d 100644
--- a/spec/features/projects/settings/repository_settings_spec.rb
+++ b/spec/features/projects/settings/repository_settings_spec.rb
@@ -94,6 +94,7 @@ feature 'Repository settings' do
       let!(:deploy_token) { deploy_token_project.deploy_token }
 
       before do
+        stub_container_registry_config(enabled: true)
         visit project_settings_repository_path(project)
       end
 
diff --git a/spec/models/project_deploy_token_spec.rb b/spec/models/project_deploy_token_spec.rb
index ccaed23f11a..9e2e40c2e8f 100644
--- a/spec/models/project_deploy_token_spec.rb
+++ b/spec/models/project_deploy_token_spec.rb
@@ -7,7 +7,6 @@ RSpec.describe ProjectDeployToken, type: :model do
 
   it { is_expected.to belong_to :project }
   it { is_expected.to belong_to :deploy_token }
-  it { is_expected.to accept_nested_attributes_for :deploy_token }
 
   it { is_expected.to validate_presence_of :deploy_token }
   it { is_expected.to validate_presence_of :project }