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
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ gem 'rails_admin', '~> 1.2'

# Pagination
gem 'api-pagination', '~> 4.6', '>= 4.6.3'
gem 'kaminari', '~> 1.1', '>= 1.1.1'
gem 'kaminari', '~> 1.2'

# Use postgresql as the database for Active Record
gem 'pg', '~> 0.21.0'
Expand Down
42 changes: 21 additions & 21 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ GEM
public_suffix (>= 2.0.2, < 4.0)
api-pagination (4.8.2)
arel (8.0.0)
builder (3.2.3)
builder (3.2.4)
byebug (11.0.1)
coffee-rails (4.2.2)
coffee-script (>= 2.2.0)
Expand All @@ -51,8 +51,8 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.1.5)
crass (1.0.4)
concurrent-ruby (1.1.6)
crass (1.0.6)
daemons (1.3.1)
delayed_job (4.1.5)
activesupport (>= 3.0, < 5.3)
Expand All @@ -64,7 +64,7 @@ GEM
elastic-apm (2.8.1)
concurrent-ruby (~> 1.0)
http (>= 3.0)
erubi (1.8.0)
erubi (1.9.0)
execjs (2.7.0)
faraday (0.15.4)
multipart-post (>= 1.2, < 3)
Expand All @@ -85,7 +85,7 @@ GEM
domain_name (~> 0.5)
http-form_data (2.1.1)
http_parser.rb (0.6.0)
i18n (1.6.0)
i18n (1.8.2)
concurrent-ruby (~> 1.0)
jbuilder (2.9.1)
activesupport (>= 4.2.0)
Expand All @@ -96,37 +96,37 @@ GEM
jquery-ui-rails (6.0.1)
railties (>= 3.2.16)
jwt (2.2.1)
kaminari (1.1.1)
kaminari (1.2.1)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.1.1)
kaminari-activerecord (= 1.1.1)
kaminari-core (= 1.1.1)
kaminari-actionview (1.1.1)
kaminari-actionview (= 1.2.1)
kaminari-activerecord (= 1.2.1)
kaminari-core (= 1.2.1)
kaminari-actionview (1.2.1)
actionview
kaminari-core (= 1.1.1)
kaminari-activerecord (1.1.1)
kaminari-core (= 1.2.1)
kaminari-activerecord (1.2.1)
activerecord
kaminari-core (= 1.1.1)
kaminari-core (1.1.1)
kaminari-core (= 1.2.1)
kaminari-core (1.2.1)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.2.3)
loofah (2.5.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mini_mime (>= 0.1.1)
method_source (0.9.2)
mini_mime (1.0.1)
mini_portile2 (2.4.0)
minitest (5.11.3)
minitest (5.14.1)
multi_json (1.13.1)
multi_xml (0.6.0)
multipart-post (2.1.1)
nested_form (0.3.2)
nio4r (2.3.1)
nokogiri (1.10.3)
nokogiri (1.10.9)
mini_portile2 (~> 2.4.0)
oauth2 (1.4.1)
faraday (>= 0.8, < 0.16.0)
Expand Down Expand Up @@ -158,8 +158,8 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
rails_admin (1.4.2)
builder (~> 3.1)
coffee-rails (~> 4.0)
Expand Down Expand Up @@ -224,7 +224,7 @@ GEM
thor (0.20.3)
thread_safe (0.3.6)
tilt (2.0.9)
tzinfo (1.2.5)
tzinfo (1.2.7)
thread_safe (~> 0.1)
unf (0.1.4)
unf_ext
Expand All @@ -244,7 +244,7 @@ DEPENDENCIES
delayed_job_active_record (~> 4.1, >= 4.1.2)
elastic-apm (~> 2.8)
jbuilder (~> 2.7)
kaminari (~> 1.1, >= 1.1.1)
kaminari (~> 1.2)
listen (>= 3.0.5, < 3.2)
oauth2 (~> 1.4)
pg (~> 0.21.0)
Expand Down