Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Registry 186 #246

Merged
merged 30 commits into from
Nov 15, 2016
Merged

Registry 186 #246

merged 30 commits into from
Nov 15, 2016

Conversation

vohmar
Copy link
Contributor

@vohmar vohmar commented Nov 15, 2016

No description provided.

Artur Beljajev added 30 commits November 3, 2016 16:29
Merge branch 'master' into registry-186
01179fc
Merge branch 'master' into registry-186
e52c747
Add extended registrar's info to "pending_deleted" mailer
bebd49e 
#180
Fix "expiration" mailer
34c1e0d 
#180
Add extended registrar's info to "pending_update_request_for_old_regi…
fc9104a 
…strant" mailer

#180
Revert e53980e and 7cdfa10
4fd18c4 
#180
Extract expirable concern from domain model
e653d8b 
#238
Improve domain's outzone and delete logic
aa29c78 
- Encapsulate outzone and delete candidate logic into domain model
- Fix the logic itself

Fixes #238
Consider domains having current time at "expire_time" attribute expired
877e699 
Fixes #238
Revert domain expirable
3b120f0 
#186
Revert domain expirable
0c6c583 
#186
Merge remote-tracking branch 'origin/registry-235' into registry-186
3d1dd17 
# Conflicts:
#	spec/models/domain_spec.rb
Merge remote-tracking branch 'origin/registry-238' into registry-186
4075024 
# Conflicts:
#	app/models/domain.rb
#	spec/models/domain_spec.rb
Revert domain spec
820dfeb 
#186
Merge branch 'master' into registry-186
a20af37
Update "pending_update_request_for_old_registrant" mailer
ccb062c 
#180
Revert "Load all translation files from config/locales"
d0b7168 
This reverts commit 8c474b2.
Merge branch 'master' into registry-186
7e11c3a
Update "pending_update_request_for_old_registrant" mailer
eac7690 
#180
Refactor mailer views
789468c 
#180
Refactor domain mailer views
962e983 
#180
Refactor domain mailer views
a6de376 
#180
Refactor domain mailer views
2c3dbc6 
#180
Refactor domain mailer views
c0f4066 
#180
Destroy DomainExpirationEmailJob
471ac90 
#180
Refactor domain mailer views
3a04079 
#180
Fix domain specs
185af69 
#180
Fix DomainExpirationEmailJob
907d5cc 
#180
Fix DomainExpirationEmailJob spec
54df5f1 
#180
Fix domain specs
df1aad5 
#180
@vohmar vohmar merged commit 173407e into staging Nov 15, 2016
@dependabot dependabot bot mentioned this pull request Apr 12, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@vohmar