zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-06-10 06:34:46 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into 269-dispute-list

Browse source
This commit is contained in:
Karl Erik Õunapuu 2020-04-29 17:28:22 +03:00
commit 56a351f0cb
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -1,3 +1,6 @@
27.04.2020
* Downgrade SimpleCov to 0.17 due to incompatibiilty with CodeClimate [#1575](https://github.com/internetee/registry/pull/1575)
17.04.2020 17.04.2020
* Webinterfaces have now clickable version string pointing to the latest deployed commit in github [#1345](https://github.com/internetee/registry/pull/1345) * Webinterfaces have now clickable version string pointing to the latest deployed commit in github [#1345](https://github.com/internetee/registry/pull/1345)

2
Gemfile
View file

@ -87,7 +87,7 @@ group :test do
gem 'capybara' gem 'capybara'
gem 'database_cleaner' gem 'database_cleaner'
gem 'minitest', '~> 5.14' gem 'minitest', '~> 5.14'
gem 'simplecov', require: false gem 'simplecov', '0.17.1', require: false # CC last supported v0.17
gem 'webdrivers' gem 'webdrivers'
gem 'webmock' gem 'webmock'
end end

9
Gemfile.lock
View file

@ -413,10 +413,11 @@ GEM
selenium-webdriver (3.142.7) selenium-webdriver (3.142.7)
childprocess (>= 0.5, < 4.0) childprocess (>= 0.5, < 4.0)
rubyzip (>= 1.2.2) rubyzip (>= 1.2.2)
simplecov (0.18.1) simplecov (0.17.1)
docile (~> 1.1) docile (~> 1.1)
simplecov-html (~> 0.11.0) json (>= 1.8, < 3)
simplecov-html (0.11.0) simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
simpleidn (0.0.9) simpleidn (0.0.9)
sinatra (2.0.8.1) sinatra (2.0.8.1)
mustermann (~> 1.0) mustermann (~> 1.0)
@ -521,7 +522,7 @@ DEPENDENCIES
sdoc (= 0.4.1) sdoc (= 0.4.1)
select2-rails (= 3.5.9.3) select2-rails (= 3.5.9.3)
selectize-rails (= 0.12.1) selectize-rails (= 0.12.1)
simplecov simplecov (= 0.17.1)
simpleidn (= 0.0.9) simpleidn (= 0.0.9)
uglifier uglifier
validates_email_format_of (= 1.6.3) validates_email_format_of (= 1.6.3)