Merge branch 'master' into registry-902

This commit is contained in:
Maciej Szlosarczyk 2018-07-17 12:47:18 +03:00
commit f098dfd627
No known key found for this signature in database
GPG key ID: 41D62D42D3B0D765
3 changed files with 25 additions and 31 deletions

View file

@ -1,3 +1,6 @@
12.07.2018
* Implemented JavaScript testing framework to catch web UI problems [#900](https://github.com/internetee/registry/issues/900)
10.07.2018
* Nameserver bulk change returns list of affected doamins [#835](https://github.com/internetee/registry/issues/835)

View file

@ -55,9 +55,7 @@ gem 'liquid', '3.0.6' # for email templates
gem 'cancancan', '1.11.0' # autharization
gem 'devise', '4.4.3' # authenitcation
# rest api
gem 'grape', '0.12.0'
gem 'hashie-forbidden_attributes', '0.1.1' # For grape, https://github.com/ruby-grape/grape/tree/v0.12.0#rails
gem 'grape'
gem 'jbuilder', '2.2.16' # json api
# registry specfic

View file

@ -99,8 +99,8 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.5.1)
public_suffix (~> 2.0, >= 2.0.2)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
airbrake (6.0.0)
airbrake-ruby (~> 2.0)
airbrake-ruby (2.0.0)
@ -127,13 +127,13 @@ GEM
activesupport (>= 3.0.0)
uniform_notifier (~> 1.9.0)
cancancan (1.11.0)
capybara (2.14.0)
capybara (3.3.1)
addressable
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
xpath (~> 3.1)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
chronic (0.10.2)
@ -186,15 +186,12 @@ GEM
thor (~> 0.14)
globalid (0.4.1)
activesupport (>= 4.2.0)
grape (0.12.0)
grape (1.0.3)
activesupport
builder
hashie (>= 2.1.0)
multi_json (>= 1.3.2)
multi_xml (>= 0.5.2)
mustermann-grape (~> 1.0.0)
rack (>= 1.3.0)
rack-accept
rack-mount
virtus (>= 1.0.0)
gyoku (1.3.1)
builder (>= 2.1.2)
@ -206,10 +203,7 @@ GEM
haml (>= 4.0.6, < 5.0)
html2haml (>= 1.0.1)
railties (>= 4.0.1)
hashdiff (0.3.4)
hashie (3.5.5)
hashie-forbidden_attributes (0.1.1)
hashie (>= 3.0)
hashdiff (0.3.7)
hpricot (0.8.6)
html2haml (2.1.0)
erubis (~> 2.7.0)
@ -268,10 +262,12 @@ GEM
monetize (~> 1.6.0)
money (~> 6.8.1)
railties (>= 3.0)
multi_json (1.12.1)
multi_xml (0.6.0)
multi_json (1.13.1)
mustermann (1.0.2)
mustermann-grape (1.0.0)
mustermann (~> 1.0.0)
netrc (0.11.0)
nokogiri (1.8.2)
nokogiri (1.8.4)
mini_portile2 (~> 2.3.0)
nori (2.6.0)
open4 (1.3.4)
@ -284,7 +280,7 @@ GEM
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
public_suffix (2.0.5)
public_suffix (3.0.2)
puma (3.8.2)
que (0.10.0)
que-web (0.4.0)
@ -294,8 +290,6 @@ GEM
rack (1.6.10)
rack-accept (0.4.5)
rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
rack-protection (1.5.5)
rack
rack-test (0.6.3)
@ -438,14 +432,14 @@ GEM
wasabi (3.5.0)
httpi (~> 2.0)
nokogiri (>= 1.4.2)
webmock (3.0.1)
webmock (3.4.2)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
whenever (0.9.4)
chronic (>= 0.6.3)
xpath (2.0.0)
nokogiri (~> 1.3)
xpath (3.1.0)
nokogiri (~> 1.8)
PLATFORMS
ruby
@ -472,9 +466,8 @@ DEPENDENCIES
epp-xml (= 1.1.0)!
factory_bot_rails
figaro (= 1.1.1)
grape (= 0.12.0)
grape
haml-rails (= 0.9.0)
hashie-forbidden_attributes (= 0.1.1)
html2haml (= 2.1.0)
html5_validators (= 1.2.2)
isikukood