Skip to content

Commit

Permalink
Merge branch 'master' into 2659-extend-email-validator
Browse files Browse the repository at this point in the history
  • Loading branch information
@maricavor
maricavor authored May 7, 2024
2 parents 1bc2595 + 7635bc5 commit ef6448e
Show file tree
Hide file tree
Showing 31 changed files with 297 additions and 133 deletions.
3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@
# Do not commit one. Instead, download the latest from https://github.com/internetee/style-guide.
.rubocop.yml
/lib/tasks/mock.rake

.DS_Store
/node_modules
2 changes: 1 addition & 1 deletion .ruby-version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.3
3.3.0
13 changes: 13 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
06.02.2024
* Updated request for getting reference data https://github.com/internetee/registry/pull/2625
* Force Delete process end is triggered by email update https://github.com/internetee/registry/issues/2634

26.01.2024
* Fix for auction race condition on domain registration deadline https://github.com/internetee/registry/issues/2641

18.01.2024
* Fix for vat on monthly invoices from December '23 https://github.com/internetee/registry/issues/2639

22.12.2023
* Improvements for statistics queries https://github.com/internetee/registry/pull/2632

21.12.2023
* Registrar statistics calculation refactor https://github.com/internetee/registry/pull/2629

Expand Down
6 changes: 6 additions & 0 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
FROM internetee/ruby:3.0-buster

RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B
RUN apt-get update && apt-get install -y --no-install-recommends \
git \
postgresql-client \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

RUN mkdir -p /opt/webapps/app/tmp/pids
WORKDIR /opt/webapps/app
COPY Gemfile Gemfile.lock ./
Expand Down
5 changes: 3 additions & 2 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ gem 'figaro', '~> 1.2'

# model related
gem 'paper_trail', '~> 14.0'
gem 'pg', '1.5.4'
gem 'pg', '1.5.6'
# 1.8 is for Rails < 5.0
gem 'ransack', '~> 4.0.0'
gem 'truemail', '~> 3.0' # validates email by regexp, mail server existence and address existence
gem 'validates_email_format_of', '1.7.2' # validates email against RFC 2822 and RFC 3696

# 0.7.3 is the latest for Rails 4.2, however, it is absent on Rubygems server
# https://github.com/huacnlee/rails-settings-cached/issues/165
gem 'nokogiri', '~> 1.15.0'
gem 'nokogiri', '~> 1.16.0'

# style
gem 'bootstrap-sass', '~> 3.4'
Expand Down Expand Up @@ -91,6 +91,7 @@ group :test do
gem 'minitest', '~> 5.17'
gem 'minitest-stub_any_instance'
gem 'selenium-webdriver'
# gem 'webdrivers'
gem 'simplecov', '0.17.1', require: false # CC last supported v0.17
gem 'spy'
gem 'webdrivers', '~> 3.2'
Expand Down
158 changes: 79 additions & 79 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,63 +77,63 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actioncable (6.1.7.3)
actionpack (= 6.1.7.3)
activesupport (= 6.1.7.3)
actioncable (6.1.7.7)
actionpack (= 6.1.7.7)
activesupport (= 6.1.7.7)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.1.7.3)
actionpack (= 6.1.7.3)
activejob (= 6.1.7.3)
activerecord (= 6.1.7.3)
activestorage (= 6.1.7.3)
activesupport (= 6.1.7.3)
actionmailbox (6.1.7.7)
actionpack (= 6.1.7.7)
activejob (= 6.1.7.7)
activerecord (= 6.1.7.7)
activestorage (= 6.1.7.7)
activesupport (= 6.1.7.7)
mail (>= 2.7.1)
actionmailer (6.1.7.3)
actionpack (= 6.1.7.3)
actionview (= 6.1.7.3)
activejob (= 6.1.7.3)
activesupport (= 6.1.7.3)
actionmailer (6.1.7.7)
actionpack (= 6.1.7.7)
actionview (= 6.1.7.7)
activejob (= 6.1.7.7)
activesupport (= 6.1.7.7)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.1.7.3)
actionview (= 6.1.7.3)
activesupport (= 6.1.7.3)
actionpack (6.1.7.7)
actionview (= 6.1.7.7)
activesupport (= 6.1.7.7)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.1.7.3)
actionpack (= 6.1.7.3)
activerecord (= 6.1.7.3)
activestorage (= 6.1.7.3)
activesupport (= 6.1.7.3)
actiontext (6.1.7.7)
actionpack (= 6.1.7.7)
activerecord (= 6.1.7.7)
activestorage (= 6.1.7.7)
activesupport (= 6.1.7.7)
nokogiri (>= 1.8.5)
actionview (6.1.7.3)
activesupport (= 6.1.7.3)
actionview (6.1.7.7)
activesupport (= 6.1.7.7)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
active_interaction (4.0.5)
activemodel (>= 5, < 7)
activesupport (>= 5, < 7)
activejob (6.1.7.3)
activesupport (= 6.1.7.3)
activejob (6.1.7.7)
activesupport (= 6.1.7.7)
globalid (>= 0.3.6)
activemodel (6.1.7.3)
activesupport (= 6.1.7.3)
activerecord (6.1.7.3)
activemodel (= 6.1.7.3)
activesupport (= 6.1.7.3)
activestorage (6.1.7.3)
actionpack (= 6.1.7.3)
activejob (= 6.1.7.3)
activerecord (= 6.1.7.3)
activesupport (= 6.1.7.3)
activemodel (6.1.7.7)
activesupport (= 6.1.7.7)
activerecord (6.1.7.7)
activemodel (= 6.1.7.7)
activesupport (= 6.1.7.7)
activestorage (6.1.7.7)
actionpack (= 6.1.7.7)
activejob (= 6.1.7.7)
activerecord (= 6.1.7.7)
activesupport (= 6.1.7.7)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (6.1.7.3)
activesupport (6.1.7.7)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
Expand Down Expand Up @@ -169,8 +169,8 @@ GEM
aws-eventstream (~> 1, >= 1.0.2)
bcrypt (3.1.16)
bindata (2.4.14)
bootsnap (1.9.3)
msgpack (~> 1.0)
bootsnap (1.17.1)
msgpack (~> 1.2)
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
sassc (>= 2.0.0)
Expand All @@ -194,7 +194,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.2.2)
concurrent-ruby (1.2.3)
connection_pool (2.4.1)
countries (4.0.1)
i18n_data (~> 0.13.0)
Expand Down Expand Up @@ -235,15 +235,15 @@ GEM
thor (>= 0.14.0, < 2)
globalid (1.0.1)
activesupport (>= 5.0)
google-protobuf (3.21.9)
google-protobuf (3.21.9-x86_64-linux)
google-protobuf (3.25.2)
google-protobuf (3.25.2-x86_64-linux)
googleapis-common-protos-types (1.3.0)
google-protobuf (~> 3.14)
grpc (1.41.1)
google-protobuf (~> 3.17)
grpc (1.60.0)
google-protobuf (~> 3.25)
googleapis-common-protos-types (~> 1.0)
grpc (1.41.1-x86_64-linux)
google-protobuf (~> 3.17)
grpc (1.60.0-x86_64-linux)
google-protobuf (~> 3.25)
googleapis-common-protos-types (~> 1.0)
gyoku (1.3.1)
builder (>= 2.1.2)
Expand Down Expand Up @@ -295,21 +295,21 @@ GEM
kaminari-core (1.2.1)
libxml-ruby (3.2.1)
logger (1.4.3)
loofah (2.21.3)
loofah (2.21.4)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (1.0.1)
marcel (1.0.2)
method_source (1.0.0)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2021.0704)
mimemagic (0.4.3)
nokogiri (~> 1)
rake
mini_mime (1.1.2)
mini_portile2 (2.8.2)
mini_mime (1.1.5)
mini_portile2 (2.8.5)
minitest (5.18.1)
minitest-stub_any_instance (1.0.3)
monetize (1.9.4)
Expand All @@ -321,7 +321,7 @@ GEM
monetize (~> 1.9.0)
money (~> 6.13.2)
railties (>= 3.0)
msgpack (1.4.2)
msgpack (1.7.2)
net-protocol (0.1.3)
timeout
net-smtp (0.3.3)
Expand All @@ -332,10 +332,10 @@ GEM
newrelic_rpm (= 8.1.0)
newrelic_rpm (8.1.0)
nio4r (2.5.9)
nokogiri (1.15.3)
nokogiri (1.16.2)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.15.3-x86_64-linux)
nokogiri (1.16.2-x86_64-linux)
racc (~> 1.4)
nori (2.6.0)
omniauth (2.1.0)
Expand All @@ -361,7 +361,7 @@ GEM
activerecord (>= 6.0)
request_store (~> 1.4)
pdfkit (0.8.7.2)
pg (1.5.4)
pg (1.5.6)
pg_query (2.1.2)
google-protobuf (>= 3.17.1)
pghero (3.1.0)
Expand All @@ -370,10 +370,10 @@ GEM
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (5.0.0)
puma (5.6.7)
puma (5.6.8)
nio4r (~> 2.0)
racc (1.7.1)
rack (2.2.8)
racc (1.7.3)
rack (2.2.8.1)
rack-oauth2 (1.21.3)
activesupport
attr_required
Expand All @@ -384,30 +384,30 @@ GEM
rack
rack-test (2.1.0)
rack (>= 1.3)
rails (6.1.7.3)
actioncable (= 6.1.7.3)
actionmailbox (= 6.1.7.3)
actionmailer (= 6.1.7.3)
actionpack (= 6.1.7.3)
actiontext (= 6.1.7.3)
actionview (= 6.1.7.3)
activejob (= 6.1.7.3)
activemodel (= 6.1.7.3)
activerecord (= 6.1.7.3)
activestorage (= 6.1.7.3)
activesupport (= 6.1.7.3)
rails (6.1.7.7)
actioncable (= 6.1.7.7)
actionmailbox (= 6.1.7.7)
actionmailer (= 6.1.7.7)
actionpack (= 6.1.7.7)
actiontext (= 6.1.7.7)
actionview (= 6.1.7.7)
activejob (= 6.1.7.7)
activemodel (= 6.1.7.7)
activerecord (= 6.1.7.7)
activestorage (= 6.1.7.7)
activesupport (= 6.1.7.7)
bundler (>= 1.15.0)
railties (= 6.1.7.3)
railties (= 6.1.7.7)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (6.1.7.3)
actionpack (= 6.1.7.3)
activesupport (= 6.1.7.3)
railties (6.1.7.7)
actionpack (= 6.1.7.7)
activesupport (= 6.1.7.7)
method_source
rake (>= 12.2)
thor (~> 1.0)
Expand All @@ -416,7 +416,7 @@ GEM
activerecord (>= 6.1.5)
activesupport (>= 6.1.5)
i18n
rbtree3 (0.6.0)
rbtree3 (0.7.1)
redis (5.0.6)
redis-client (>= 0.9.0)
redis-client (0.14.1)
Expand Down Expand Up @@ -472,7 +472,7 @@ GEM
unf (~> 0.1.4)
sixarm_ruby_unaccent (1.2.0)
socksify (1.7.1)
sprockets (4.0.2)
sprockets (4.0.3)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.2)
Expand Down Expand Up @@ -524,15 +524,15 @@ GEM
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
websocket-driver (0.7.5)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
whenever (1.0.0)
chronic (>= 0.6.3)
wkhtmltopdf-binary (0.12.6.6)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.6.8)
zeitwerk (2.6.13)

PLATFORMS
ruby
Expand Down Expand Up @@ -576,12 +576,12 @@ DEPENDENCIES
money-rails
newrelic-infinite_tracing
newrelic_rpm
nokogiri (~> 1.15.0)
nokogiri (~> 1.16.0)
omniauth-rails_csrf_protection
omniauth-tara!
paper_trail (~> 14.0)
pdfkit
pg (= 1.5.4)
pg (= 1.5.6)
pg_query (>= 0.9.0)
pghero
pry (= 0.14.2)
Expand Down
1 change: 0 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Domain Registry
===============
[![Build Status](https://travis-ci.org/internetee/registry.svg?branch=master)](https://travis-ci.org/internetee/registry)
[![Maintainability](https://api.codeclimate.com/v1/badges/a91e4ae502a6c5245160/maintainability)](https://codeclimate.com/github/internetee/registry/maintainability)
[![Test Coverage](https://api.codeclimate.com/v1/badges/a91e4ae502a6c5245160/test_coverage)](https://codeclimate.com/github/internetee/registry/test_coverage)
[![Documentation Status](https://readthedocs.org/projects/eeregistry/badge/?version=latest)](http://docs.internet.ee/en/latest/?badge=latest)
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/admin/registrars_controller.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def new

def create
@registrar = Registrar.new(registrar_params)
@registrar.reference_no = ::Billing::ReferenceNo.generate
@registrar.reference_no = ::Billing::ReferenceNo.generate(owner: @registrar.name)

if @registrar.valid?
@registrar.transaction do
Expand Down
Loading

0 comments on commit ef6448e

Please sign in to comment.