Skip to content

Commit

Permalink
Merge pull request #39 from sul-dlss/pin-rest-client
Browse files Browse the repository at this point in the history
pin rest-client to 1.x
  • Loading branch information
ndushay authored Jul 21, 2016
2 parents ffef664 + d92b9d3 commit c1d7f7f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ gem 'jquery-rails'
gem 'turbolinks'
gem 'jbuilder', '~> 2.0'

gem 'rest-client'
gem 'rest-client', '~> 1.8' # pinned to 1.x release line as 2.x breaks our code as-is
gem 'simhash' # to compare mementos
# gem 'execjs' # to run JavaScript code from Ruby # not used??
gem 'therubyracer' # embed the V8 JavaScript interpreter into Ruby
Expand Down
12 changes: 5 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,7 @@ GEM
libv8 (3.16.14.15)
mail (2.6.4)
mime-types (>= 1.16, < 4)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mime-types (2.99.2)
mini_exiftool (1.7.0)
mini_magick (4.5.1)
mini_portile2 (2.1.0)
Expand Down Expand Up @@ -168,10 +166,10 @@ GEM
rdoc (4.2.2)
json (~> 1.4)
ref (2.0.0)
rest-client (2.0.0)
rest-client (1.8.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
rspec (3.5.0)
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
Expand Down Expand Up @@ -289,7 +287,7 @@ DEPENDENCIES
mysql2 (~> 0.3.21)
phantomjs
rails (~> 4.1.16)
rest-client
rest-client (~> 1.8)
rspec
rspec-rails
rubocop
Expand Down

0 comments on commit c1d7f7f

Please sign in to comment.