Skip to content

Commit 52f58b2

Browse files
committed
Merge remote-tracking branch 'davidstosik/response_body_formatter_binary'
2 parents e4f78ab + f7889eb commit 52f58b2

29 files changed

+307
-194
lines changed

Gemfile.lock

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
rspec_api_documentation (5.1.0)
4+
rspec_api_documentation (6.1.0)
55
activesupport (>= 3.0.0)
66
mustache (~> 1.0, >= 0.99.4)
77
rspec (~> 3.0)
@@ -34,7 +34,7 @@ GEM
3434
xpath (~> 2.0)
3535
childprocess (0.5.9)
3636
ffi (~> 1.0, >= 1.0.11)
37-
coderay (1.1.0)
37+
coderay (1.1.2)
3838
contracts (0.13.0)
3939
crack (0.4.3)
4040
safe_yaml (~> 1.0.0)
@@ -60,13 +60,13 @@ GEM
6060
hashdiff (0.2.3)
6161
httpclient (2.7.1)
6262
i18n (0.7.0)
63-
inch (0.7.0)
63+
inch (0.8.0)
6464
pry
6565
sparkr (>= 0.2.0)
6666
term-ansicolor
67-
yard (~> 0.8.7.5)
67+
yard (~> 0.9.12)
6868
json (1.8.6)
69-
method_source (0.8.2)
69+
method_source (0.9.0)
7070
mime-types (3.0)
7171
mime-types-data (~> 3.2015)
7272
mime-types-data (3.2015.1120)
@@ -75,13 +75,12 @@ GEM
7575
multi_json (1.11.2)
7676
multi_test (0.1.2)
7777
multipart-post (2.0.0)
78-
mustache (1.0.3)
79-
nokogiri (1.8.1)
78+
mustache (1.0.5)
79+
nokogiri (1.8.4)
8080
mini_portile2 (~> 2.3.0)
81-
pry (0.10.3)
81+
pry (0.11.3)
8282
coderay (~> 1.1.0)
83-
method_source (~> 0.8.1)
84-
slop (~> 3.4)
83+
method_source (~> 0.9.0)
8584
rack (1.6.4)
8685
rack-oauth2 (1.2.2)
8786
activesupport (>= 2.3)
@@ -115,9 +114,8 @@ GEM
115114
rack (~> 1.5)
116115
rack-protection (~> 1.4)
117116
tilt (>= 1.3, < 3)
118-
slop (3.6.0)
119117
sparkr (0.4.1)
120-
term-ansicolor (1.3.2)
118+
term-ansicolor (1.6.0)
121119
tins (~> 1.0)
122120
thin (1.6.4)
123121
daemons (~> 1.0, >= 1.0.9)
@@ -126,7 +124,7 @@ GEM
126124
thor (0.19.1)
127125
thread_safe (0.3.5)
128126
tilt (2.0.2)
129-
tins (1.8.2)
127+
tins (1.16.3)
130128
tzinfo (1.2.2)
131129
thread_safe (~> 0.1)
132130
webmock (1.22.6)
@@ -135,7 +133,7 @@ GEM
135133
hashdiff
136134
xpath (2.0.0)
137135
nokogiri (~> 1.3)
138-
yard (0.8.7.6)
136+
yard (0.9.15)
139137

140138
PLATFORMS
141139
ruby
@@ -147,6 +145,7 @@ DEPENDENCIES
147145
fakefs (~> 0.4)
148146
faraday (~> 0.9, >= 0.9.0)
149147
inch
148+
nokogiri (~> 1.8, >= 1.8.2)
150149
rack-oauth2 (~> 1.2.2, >= 1.0.7)
151150
rack-test (~> 0.6.2)
152151
rake (~> 10.1)
@@ -155,6 +154,7 @@ DEPENDENCIES
155154
sinatra (~> 1.4, >= 1.4.4)
156155
thin (~> 1.6, >= 1.6.3)
157156
webmock (~> 1.7)
157+
yard (>= 0.9.11)
158158

159159
BUNDLED WITH
160-
1.16.1
160+
1.16.4

0 commit comments

Comments
 (0)