diff --git a/.travis.yml b/.travis.yml index 6994c551e..bb74deecc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,8 @@ before_install: - "sudo mv -f ~/chromedriver /usr/local/share/" - "sudo chmod +x /usr/local/share/chromedriver" - "sudo ln -s /usr/local/share/chromedriver /usr/local/bin/chromedriver" - + - "bundle config set without 'development staging production'" + - "bundle config set deployment '[secure]'" before_script: - "cp config/application.yml.sample config/application.yml" - "echo \"openssl_config_path: 'test/fixtures/files/test_ca/openssl.cnf'\" >> config/application.yml" @@ -19,7 +20,6 @@ before_script: - "echo \"ca_key_path: 'test/fixtures/files/test_ca/private/ca.key.pem'\" >> config/application.yml" - "echo \"ca_key_password: 'password'\" >> config/application.yml" - "cp config/database_travis.yml config/database.yml" - - "bundle config set without 'development staging production'" - "bundle exec rake db:setup:all" - "bundle exec rake data:migrate" - "curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter" diff --git a/Gemfile b/Gemfile index f7556e166..99091f556 100644 --- a/Gemfile +++ b/Gemfile @@ -69,7 +69,7 @@ gem 'e_invoice', github: 'internetee/e_invoice', branch: :master gem 'lhv', github: 'internetee/lhv', branch: :master gem 'domain_name' gem 'haml', '~> 5.0' -gem 'wkhtmltopdf-binary' +gem 'wkhtmltopdf-binary', '~> 0.12.5.1' gem 'directo', github: 'internetee/directo', branch: 'master' diff --git a/Gemfile.lock b/Gemfile.lock index 0f3b2d355..e4ad26396 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,7 +9,7 @@ GIT GIT remote: https://github.com/internetee/directo.git - revision: bdfab4be20803c666dcefc9a9c607f915a056ac5 + revision: 8ff8a382d004ffb85722a6a7a68a020bd4d7159b branch: master specs: directo (1.0.1) @@ -112,6 +112,8 @@ GEM activerecord (6.0.3.2) activemodel (= 6.0.3.2) activesupport (= 6.0.3.2) + activerecord-import (1.0.5) + activerecord (>= 3.2) activestorage (6.0.3.2) actionpack (= 6.0.3.2) activejob (= 6.0.3.2) @@ -125,18 +127,18 @@ GEM zeitwerk (~> 2.2, >= 2.2.2) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) - airbrake (10.0.1) + airbrake (10.0.5) airbrake-ruby (~> 4.13) - airbrake-ruby (4.13.0) + airbrake-ruby (4.15.0) rbtree3 (~> 0.5) akami (1.3.1) gyoku (>= 0.4.0) nokogiri - autodoc (0.7.3) + autodoc (0.7.4) actionpack activesupport (>= 3.0.0) rspec - autoprefixer-rails (9.7.4) + autoprefixer-rails (9.8.4) execjs bcrypt (3.1.13) bootsnap (1.4.6) @@ -145,8 +147,8 @@ GEM autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) builder (3.2.4) - cancancan (3.0.2) - capybara (3.31.0) + cancancan (3.1.0) + capybara (3.33.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -165,8 +167,8 @@ GEM execjs coffee-script-source (1.12.2) concurrent-ruby (1.1.6) - countries (3.0.0) - i18n_data (~> 0.8.0) + countries (3.0.1) + i18n_data (~> 0.10.0) sixarm_ruby_unaccent (~> 1.1) unicode_utils (~> 1.4) crack (0.4.3) @@ -176,22 +178,23 @@ GEM daemons-rails (1.2.1) daemons multi_json (~> 1.0) - data_migrate (6.2.0) + data_migrate (6.3.0) rails (>= 5.0) - database_cleaner (1.8.2) - devise (4.7.1) + database_cleaner (1.8.5) + devise (4.7.2) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) responders warden (~> 1.2.3) - diff-lcs (1.3) + diff-lcs (1.4.4) docile (1.3.2) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - dry-configurable (0.9.0) + dry-configurable (0.11.6) concurrent-ruby (~> 1.0) dry-core (~> 0.4, >= 0.4.7) + dry-equalizer (~> 0.2) dry-container (0.7.2) concurrent-ruby (~> 1.0) dry-configurable (~> 0.1, >= 0.1.3) @@ -199,11 +202,11 @@ GEM concurrent-ruby (~> 1.0) dry-equalizer (0.3.0) dry-inflector (0.2.0) - dry-logic (1.0.5) + dry-logic (1.0.6) concurrent-ruby (~> 1.0) dry-core (~> 0.2) dry-equalizer (~> 0.2) - dry-types (1.2.2) + dry-types (1.4.0) concurrent-ruby (~> 1.0) dry-container (~> 0.3) dry-core (~> 0.4, >= 0.4.4) @@ -213,12 +216,12 @@ GEM erubi (1.9.0) erubis (2.7.0) execjs (2.7.0) - ffi (1.12.2) + ffi (1.13.1) figaro (1.1.1) thor (~> 0.14) globalid (0.4.2) activesupport (>= 4.2.0) - grape (1.3.0) + grape (1.3.3) activesupport builder dry-types (>= 1.1) @@ -230,7 +233,7 @@ GEM haml (5.1.2) temple (>= 0.8.0) tilt - hashdiff (1.0.0) + hashdiff (1.0.1) hpricot (0.8.6) http-accept (1.7.0) http-cookie (1.0.3) @@ -241,10 +244,10 @@ GEM socksify i18n (1.8.3) concurrent-ruby (~> 1.0) - i18n_data (0.8.0) + i18n_data (0.10.0) isikukood (0.1.2) iso8601 (0.12.1) - jquery-rails (4.3.5) + jquery-rails (4.4.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -264,7 +267,7 @@ GEM kaminari-core (= 1.2.1) kaminari-core (1.2.1) keystores (0.4.0) - libxml-ruby (3.1.0) + libxml-ruby (3.2.0) listen (3.2.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -279,7 +282,7 @@ GEM method_source (0.8.2) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2019.1009) + mime-types-data (3.2020.0512) mimemagic (0.3.5) mina (0.3.1) open4 (~> 1.3.4) @@ -289,7 +292,7 @@ GEM minitest (5.14.1) monetize (1.9.4) money (~> 6.12) - money (6.13.7) + money (6.13.8) i18n (>= 0.6.4, <= 2) money-rails (1.13.3) activesupport (>= 3.0) @@ -304,7 +307,7 @@ GEM mustermann (>= 1.0.0) netrc (0.11.0) nio4r (2.5.2) - nokogiri (1.10.9) + nokogiri (1.10.10) mini_portile2 (~> 2.4.0) nori (2.6.0) open4 (1.3.4) @@ -312,7 +315,7 @@ GEM paper_trail (10.3.1) activerecord (>= 4.2) request_store (~> 1.1) - pdfkit (0.8.4.1) + pdfkit (0.8.4.3.1) pg (1.2.2) polyamorous (2.3.2) activerecord (>= 5.2.1) @@ -320,7 +323,7 @@ GEM coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - public_suffix (4.0.3) + public_suffix (4.0.5) puma (4.3.5) nio4r (~> 2.0) que (0.14.3) @@ -375,10 +378,10 @@ GEM ffi (~> 1.0) rbtree3 (0.6.0) rdoc (4.3.0) - regexp_parser (1.6.0) + regexp_parser (1.7.1) request_store (1.5.0) rack (>= 1.4) - responders (3.0.0) + responders (3.0.1) actionpack (>= 5.0) railties (>= 5.0) rest-client (2.1.0) @@ -390,21 +393,21 @@ GEM rspec-core (~> 3.9.0) rspec-expectations (~> 3.9.0) rspec-mocks (~> 3.9.0) - rspec-core (3.9.1) - rspec-support (~> 3.9.1) - rspec-expectations (3.9.0) + rspec-core (3.9.2) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) - rspec-support (3.9.2) + rspec-support (3.9.3) ruby2_keywords (0.0.2) - rubyzip (2.2.0) + rubyzip (2.3.0) safe_yaml (1.0.5) sass-rails (6.0.0) sassc-rails (~> 2.1, >= 2.1.1) - sassc (2.2.1) + sassc (2.4.0) ffi (~> 1.9) sassc-rails (2.1.2) railties (>= 4.0.0) @@ -412,7 +415,7 @@ GEM sprockets (> 3.0) sprockets-rails tilt - savon (2.12.0) + savon (2.12.1) akami (~> 1.2) builder (>= 2.1.2) gyoku (~> 1.2) @@ -455,7 +458,7 @@ GEM thor (0.20.3) thread_safe (0.3.6) tilt (2.0.10) - truemail (1.7.1) + truemail (1.8.0) simpleidn (~> 0.1.1) tzinfo (1.2.7) thread_safe (~> 0.1) @@ -463,7 +466,7 @@ GEM execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext - unf_ext (0.0.7.6) + unf_ext (0.0.7.7) unicode_utils (1.4.0) validates_email_format_of (1.6.3) i18n @@ -472,11 +475,11 @@ GEM wasabi (3.5.0) httpi (~> 2.0) nokogiri (>= 1.4.2) - webdrivers (4.2.0) + webdrivers (4.4.1) nokogiri (~> 1.6) rubyzip (>= 1.3.0) selenium-webdriver (>= 3.0, < 4.0) - webmock (3.8.0) + webmock (3.8.3) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -485,7 +488,7 @@ GEM websocket-extensions (0.1.5) whenever (0.9.4) chronic (>= 0.6.3) - wkhtmltopdf-binary (0.12.5.1) + wkhtmltopdf-binary (0.12.5.4) xpath (3.2.0) nokogiri (~> 1.8) zeitwerk (2.3.1) @@ -553,7 +556,7 @@ DEPENDENCIES webdrivers webmock whenever (= 0.9.4) - wkhtmltopdf-binary + wkhtmltopdf-binary (~> 0.12.5.1) BUNDLED WITH 2.1.4 diff --git a/config/initializers/airbrake.rb b/config/initializers/airbrake.rb index 5c1983369..abfe408c1 100644 --- a/config/initializers/airbrake.rb +++ b/config/initializers/airbrake.rb @@ -17,5 +17,5 @@ Airbrake.configure do |config| end config.environment = ENV['airbrake_env'] || Rails.env config.ignore_environments = %w[test] - config.blacklist_keys = Rails.application.config.filter_parameters + config.blocklist_keys = Rails.application.config.filter_parameters end diff --git a/db/structure.sql b/db/structure.sql index 9db7d07d1..587f68be8 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -3635,20 +3635,6 @@ CREATE INDEX index_domains_on_statuses ON public.domains USING gin (statuses); CREATE INDEX index_email_address_verifications_on_domain ON public.email_address_verifications USING btree (domain); --- --- Name: index_email_address_verifications_on_email; Type: INDEX; Schema: public; Owner: - --- - -CREATE UNIQUE INDEX index_email_address_verifications_on_email ON public.email_address_verifications USING btree (email); - - --- --- Name: index_email_addresses_validations_on_email; Type: INDEX; Schema: public; Owner: - --- - -CREATE UNIQUE INDEX index_email_addresses_validations_on_email ON public.email_addresses_validations USING btree (email); - - -- -- Name: index_epp_sessions_on_updated_at; Type: INDEX; Schema: public; Owner: - --