Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ gem 'daemons', '~> 1.2.4'
gem 'figaro', '~> 1.1.1' # manage development credentials

# API build
gem 'grape', '~> 0.19.2'
gem 'grape', '~> 1.1.0'
gem 'grape-active_model_serializers', '~> 1.5.1'
gem 'active_model_serializers', "~> 0.10.0"
gem 'api-pagination', '~> 4.5.2'
Expand Down
32 changes: 16 additions & 16 deletions Gemfile.lock
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ GEM
sass (~> 3.4)
thor (~> 0.19)
bower-rails (0.11.0)
builder (3.2.3)
builder (3.2.4)
byebug (9.0.6)
case_transform (0.2)
activesupport
Expand All @@ -117,7 +117,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.0.5)
concurrent-ruby (1.1.7)
daemons (1.2.4)
delayed_job (4.1.2)
activesupport (>= 3.0, < 5.1)
Expand Down Expand Up @@ -185,12 +185,9 @@ GEM
json
multi_json
request_store (>= 1.0)
grape (0.19.2)
grape (1.1.0)
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
Expand All @@ -202,8 +199,9 @@ GEM
actionpack (>= 4.1, < 5.2)
activesupport (>= 4.1, < 5.2)
hashery (2.1.2)
hashie (3.5.5)
i18n (0.8.1)
hashie (3.5.7)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
ipaddress (0.8.3)
jbuilder (2.6.4)
Expand Down Expand Up @@ -249,13 +247,14 @@ GEM
mime-types-data (3.2016.0521)
mini_magick (4.7.0)
mini_portile2 (2.1.0)
minitest (5.10.2)
multi_json (1.12.1)
minitest (5.14.2)
multi_json (1.15.0)
multi_xml (0.6.0)
multipart-post (2.0.0)
mustermann (1.0.0)
mustermann-grape (1.0.0)
mustermann (~> 1.0.0)
mustermann (1.1.1)
ruby2_keywords (~> 0.0.1)
mustermann-grape (1.0.1)
mustermann (>= 1.0.0)
mysql2 (0.4.6)
native-package-installer (1.0.1)
nio4r (2.0.0)
Expand Down Expand Up @@ -290,7 +289,7 @@ GEM
puma (3.8.2)
pundit (1.1.0)
activesupport (>= 3.0.0)
rack (2.0.3)
rack (2.2.3)
rack-accept (0.4.5)
rack (>= 0.4)
rack-cors (0.4.1)
Expand Down Expand Up @@ -336,6 +335,7 @@ GEM
ruby-rc4 (0.1.5)
ruby-vips (1.0.5)
gobject-introspection (~> 3.1)
ruby2_keywords (0.0.2)
sass (3.4.23)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
Expand Down Expand Up @@ -368,7 +368,7 @@ GEM
turbolinks-source (5.0.3)
typhoeus (1.1.2)
ethon (>= 0.9.0)
tzinfo (1.2.3)
tzinfo (1.2.7)
thread_safe (~> 0.1)
uglifier (3.2.0)
execjs (>= 0.3.0, < 3)
Expand Down Expand Up @@ -409,7 +409,7 @@ DEPENDENCIES
figaro (~> 1.1.1)
fog-aws (~> 1.3.0)
gon (~> 6.1.0)
grape (~> 0.19.2)
grape (~> 1.1.0)
grape-active_model_serializers (~> 1.5.1)
inherited_resources (~> 1.7.2)!
jbuilder (~> 2.5)
Expand Down