Skip to content

Commit

Permalink
Merge pull request #912 from internetee/update-grape-gem
Browse files Browse the repository at this point in the history
Update "grape" gem
  • Loading branch information
vohmar authored Jul 16, 2018
2 parents 2510159 + fe530f4 commit 9de6c62
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 17 deletions.
4 changes: 1 addition & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 7 additions & 14 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -207,9 +204,6 @@ GEM
html2haml (>= 1.0.1)
railties (>= 4.0.1)
hashdiff (0.3.7)
hashie (3.5.5)
hashie-forbidden_attributes (0.1.1)
hashie (>= 3.0)
hpricot (0.8.6)
html2haml (2.1.0)
erubis (~> 2.7.0)
Expand Down Expand Up @@ -268,8 +262,10 @@ 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.4)
mini_portile2 (~> 2.3.0)
Expand All @@ -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)
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 9de6c62

Please sign in to comment.