From adeadcdb4bce720b800df9f5c237f28ed2b60214 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= Date: Wed, 6 Jan 2021 10:03:22 +0200 Subject: [PATCH 1/2] Revert "Bump nokogiri from 1.10.10 to 1.11.0" --- Gemfile.lock | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5eaa39b5c..2a0bb55b1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -264,7 +264,7 @@ GEM mime-types-data (3.2020.0512) mimemagic (0.3.5) mini_mime (1.0.2) - mini_portile2 (2.5.0) + mini_portile2 (2.4.0) minitest (5.14.2) monetize (1.9.4) money (~> 6.12) @@ -281,9 +281,8 @@ GEM ruby2_keywords (~> 0.0.1) netrc (0.11.0) nio4r (2.5.4) - nokogiri (1.11.0) - mini_portile2 (~> 2.5.0) - racc (~> 1.4) + nokogiri (1.10.10) + mini_portile2 (~> 2.4.0) nori (2.6.0) omniauth (1.9.1) hashie (>= 3.4.6) @@ -321,7 +320,6 @@ GEM erubis que (~> 0.8) sinatra - racc (1.5.2) rack (2.2.3) rack-oauth2 (1.16.0) activesupport From 89a6f04227876d586511e851eae62f252710ecc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20V=C3=B5hmar?= Date: Wed, 6 Jan 2021 10:51:36 +0200 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b7e9725fc..abfa5f05e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ +06.01.2021 +* Reverted Nokogiri bump due to dependency conflicts in production [#1787](https://github.com/internetee/registry/pull/1787) + 05.01.2021 -* Fixed ok/inactive bug together with disclosed contact atribute handling [#1786](https://github.com/internetee/registry/pull/1786) -* Ident data to simplified domain list in registrant APO to help with sorting and filtering [#1783](https://github.com/internetee/registry/pull/1783) +* Fixed ok/inactive bug together with disclosed contact attribute handling [#1786](https://github.com/internetee/registry/pull/1786) +* Ident data to simplified domain list in registrant API to help with sorting and filtering [#1783](https://github.com/internetee/registry/pull/1783) * Bumped Nokogiri to 1.11.0 [#1785](https://github.com/internetee/registry/pull/1785) 23.12.2020