Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: zooniverse/education-api
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f32a39d5adda1bd1b16ba2207b45281b839a1345
Choose a base ref
..
head repository: zooniverse/education-api
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 27b1067bcbce57ef87cb3a05a8120bd6606104d0
Choose a head ref
Showing with 3 additions and 14 deletions.
  1. +1 −1 Dockerfile
  2. +0 −1 Gemfile
  3. +2 −12 Gemfile.lock
2 changes: 1 addition & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.6-slim-stretch
FROM ruby:2.7-slim

WORKDIR /app

1 change: 0 additions & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,6 @@ gem 'honeybadger', "~> 4.12"
gem 'sidekiq', "~> 5.2"
gem 'sidetiq', "~> 0.7"

gem 'sinatra', "~> 2.2", require: nil
gem 'active_model_serializers', "~> 0.10"
gem 'puma', "~> 5.6"
gem 'newrelic_rpm'
14 changes: 2 additions & 12 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -89,7 +89,7 @@ GEM
factory_girl_rails (4.9.0)
factory_girl (~> 4.9.0)
railties (>= 3.0.0)
faraday (0.17.5)
faraday (0.17.6)
multipart-post (>= 1.2, < 3)
faraday-detailed_logger (2.5.0)
faraday (>= 0.16, < 3)
@@ -125,8 +125,6 @@ GEM
mini_portile2 (2.8.0)
minitest (5.16.2)
multipart-post (2.2.3)
mustermann (1.1.1)
ruby2_keywords (~> 0.0.1)
newrelic_rpm (4.7.1.340)
nio4r (2.5.8)
nokogiri (1.13.9)
@@ -204,7 +202,6 @@ GEM
rspec-mocks (~> 3.7.0)
rspec-support (~> 3.7.0)
rspec-support (3.7.0)
ruby2_keywords (0.0.5)
sidekiq (5.2.10)
connection_pool (~> 2.2, >= 2.2.2)
rack (~> 2.0)
@@ -214,11 +211,6 @@ GEM
celluloid (>= 0.17.3)
ice_cube (~> 0.14.0)
sidekiq (>= 4.1.0)
sinatra (2.2.0)
mustermann (~> 1.0)
rack (~> 2.2)
rack-protection (= 2.2.0)
tilt (~> 2.0)
sprockets (4.1.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
@@ -228,7 +220,6 @@ GEM
sprockets (>= 3.0.0)
thor (1.2.1)
thread_safe (0.3.6)
tilt (2.0.10)
timers (4.1.2)
hitimes
tzinfo (1.2.10)
@@ -270,8 +261,7 @@ DEPENDENCIES
rspec-rails (~> 3.6)
sidekiq (~> 5.2)
sidetiq (~> 0.7)
sinatra (~> 2.2)
web-console (~> 3.7)

BUNDLED WITH
1.17.3
2.1.4