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

Merge branch 'master' into refactor-devise-integration

Browse source
This commit is contained in:
Artur Beljajev 2018-07-17 22:47:16 +03:00
commit c6ff491ed2
2 changed files with 8 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Gemfile
View file

@ -55,9 +55,7 @@ gem 'liquid', '3.0.6' # for email templates
gem 'cancancan', '1.11.0' # autharization gem 'cancancan', '1.11.0' # autharization
gem 'devise', '4.4.3' # authenitcation gem 'devise', '4.4.3' # authenitcation
# rest api gem 'grape'
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 'jbuilder', '2.2.16' # json api gem 'jbuilder', '2.2.16' # json api
# registry specfic # registry specfic

21
Gemfile.lock
View file

@ -186,15 +186,12 @@ GEM
thor (~> 0.14) thor (~> 0.14)
globalid (0.4.1) globalid (0.4.1)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
grape (0.12.0) grape (1.0.3)
activesupport activesupport
builder builder
hashie (>= 2.1.0) mustermann-grape (~> 1.0.0)
multi_json (>= 1.3.2)
multi_xml (>= 0.5.2)
rack (>= 1.3.0) rack (>= 1.3.0)
rack-accept rack-accept
rack-mount
virtus (>= 1.0.0) virtus (>= 1.0.0)
gyoku (1.3.1) gyoku (1.3.1)
builder (>= 2.1.2) builder (>= 2.1.2)
@ -207,9 +204,6 @@ GEM
html2haml (>= 1.0.1) html2haml (>= 1.0.1)
railties (>= 4.0.1) railties (>= 4.0.1)
hashdiff (0.3.7) hashdiff (0.3.7)
hashie (3.5.5)
hashie-forbidden_attributes (0.1.1)
hashie (>= 3.0)
hpricot (0.8.6) hpricot (0.8.6)
html2haml (2.1.0) html2haml (2.1.0)
erubis (~> 2.7.0) erubis (~> 2.7.0)
@ -268,8 +262,10 @@ GEM
monetize (~> 1.6.0) monetize (~> 1.6.0)
money (~> 6.8.1) money (~> 6.8.1)
railties (>= 3.0) railties (>= 3.0)
multi_json (1.12.1) multi_json (1.13.1)
multi_xml (0.6.0) mustermann (1.0.2)
mustermann-grape (1.0.0)
mustermann (~> 1.0.0)
netrc (0.11.0) netrc (0.11.0)
nokogiri (1.8.4) nokogiri (1.8.4)
mini_portile2 (~> 2.3.0) mini_portile2 (~> 2.3.0)
@ -294,8 +290,6 @@ GEM
rack (1.6.10) rack (1.6.10)
rack-accept (0.4.5) rack-accept (0.4.5)
rack (>= 0.4) rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
rack-protection (1.5.5) rack-protection (1.5.5)
rack rack
rack-test (0.6.3) rack-test (0.6.3)
@ -472,9 +466,8 @@ DEPENDENCIES
epp-xml (= 1.1.0)! epp-xml (= 1.1.0)!
factory_bot_rails factory_bot_rails
figaro (= 1.1.1) figaro (= 1.1.1)
grape (= 0.12.0) grape
haml-rails (= 0.9.0) haml-rails (= 0.9.0)
hashie-forbidden_attributes (= 0.1.1)
html2haml (= 2.1.0) html2haml (= 2.1.0)
html5_validators (= 1.2.2) html5_validators (= 1.2.2)
isikukood isikukood