Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Package updates #564

Merged
merged 5 commits into from
Mar 21, 2019
Merged

Package updates #564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c11c90b
Gemfile[.lock]: Update Rails to 5.2.2.1
DeeDeeG Mar 17, 2019
818f104
Gemfile[.lock]: Update bootstrap-sass to >= 3.4.1
DeeDeeG Mar 17, 2019
1c7db39
Gemfile[.lock]: Update devise to ~> 4.6
DeeDeeG Mar 21, 2019
9195f86
Gemfile.lock: Bump ransack to fix boot-time errors
DeeDeeG Mar 17, 2019
b99e8cd
yarn.lock: Update JS dependencies
DeeDeeG Mar 17, 2019
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
6 changes: 3 additions & 3 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
source 'https://rubygems.org'
ruby '2.5.3'

gem 'rails', '5.2.1'
gem 'rails', '5.2.2.1'

gem 'activeadmin', '~> 1.4.1'
gem 'bootsnap', require: false
gem 'bootstrap-sass'
gem 'bootstrap-sass', '>= 3.4.1'
gem 'bugsnag'
gem 'coffee-rails', '~> 4.2'
gem 'country_select'
gem 'devise', '~> 4.3'
gem 'devise', '~> 4.6'
gem 'geocoder', '~> 1.2.1'
gem 'grape', '1.1'
gem 'grape-swagger', '~> 0.31'
Expand Down
121 changes: 62 additions & 59 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.2.1)
actionpack (= 5.2.1)
actioncable (5.2.2.1)
actionpack (= 5.2.2.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.1)
actionpack (= 5.2.1)
actionview (= 5.2.1)
activejob (= 5.2.1)
actionmailer (5.2.2.1)
actionpack (= 5.2.2.1)
actionview (= 5.2.2.1)
activejob (= 5.2.2.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.1)
actionview (= 5.2.1)
activesupport (= 5.2.1)
actionpack (5.2.2.1)
actionview (= 5.2.2.1)
activesupport (= 5.2.2.1)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.1)
activesupport (= 5.2.1)
actionview (5.2.2.1)
activesupport (= 5.2.2.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
Expand All @@ -36,20 +36,20 @@ GEM
ransack (>= 1.8.7)
sass (~> 3.1)
sprockets (< 4.1)
activejob (5.2.1)
activesupport (= 5.2.1)
activejob (5.2.2.1)
activesupport (= 5.2.2.1)
globalid (>= 0.3.6)
activemodel (5.2.1)
activesupport (= 5.2.1)
activerecord (5.2.1)
activemodel (= 5.2.1)
activesupport (= 5.2.1)
activemodel (5.2.2.1)
activesupport (= 5.2.2.1)
activerecord (5.2.2.1)
activemodel (= 5.2.2.1)
activesupport (= 5.2.2.1)
arel (>= 9.0)
activestorage (5.2.1)
actionpack (= 5.2.1)
activerecord (= 5.2.1)
activestorage (5.2.2.1)
actionpack (= 5.2.2.1)
activerecord (= 5.2.2.1)
marcel (~> 0.3.1)
activesupport (5.2.1)
activesupport (5.2.2.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
Expand All @@ -59,7 +59,7 @@ GEM
arbre (1.1.1)
activesupport (>= 3.0.0)
arel (9.0.0)
autoprefixer-rails (9.1.4)
autoprefixer-rails (9.5.0)
execjs
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
Expand All @@ -74,9 +74,9 @@ GEM
debug_inspector (>= 0.0.1)
bootsnap (1.3.2)
msgpack (~> 1.0)
bootstrap-sass (3.3.7)
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
sassc (>= 2.0.0)
bugsnag (6.8.0)
concurrent-ruby (~> 1.0)
builder (3.2.3)
Expand All @@ -98,7 +98,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.1.3)
concurrent-ruby (1.1.5)
countries (2.1.4)
i18n_data (~> 0.8.0)
money (~> 6.9)
Expand All @@ -114,7 +114,7 @@ GEM
debug_inspector (0.0.3)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
devise (4.5.0)
devise (4.6.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 6.0)
Expand All @@ -126,7 +126,7 @@ GEM
dotenv (= 2.2.2)
railties (>= 3.2, < 6.0)
equalizer (0.0.11)
erubi (1.7.1)
erubi (1.8.0)
execjs (2.7.0)
factory_bot (4.8.2)
activesupport (>= 3.0.0)
Expand All @@ -138,7 +138,7 @@ GEM
actionpack (>= 3.2.13)
formtastic_i18n (0.6.0)
geocoder (1.2.14)
globalid (0.4.1)
globalid (0.4.2)
activesupport (>= 4.2.0)
grape (1.1.0)
activesupport
Expand All @@ -161,7 +161,7 @@ GEM
hashdiff (0.3.7)
high_voltage (3.0.0)
http_accept_language (2.1.1)
i18n (1.1.1)
i18n (1.6.0)
concurrent-ruby (~> 1.0)
i18n-debug (1.1.1)
i18n (< 2)
Expand Down Expand Up @@ -201,17 +201,17 @@ GEM
loofah (2.2.3)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.0)
mail (2.7.1)
mini_mime (>= 0.1.1)
mail_form (1.7.1)
actionmailer (>= 3.2, < 6)
activemodel (>= 3.2, < 6)
marcel (0.3.3)
mimemagic (~> 0.3.2)
method_source (0.9.0)
mimemagic (0.3.2)
method_source (0.9.2)
mimemagic (0.3.3)
mini_mime (1.0.1)
mini_portile2 (2.3.0)
mini_portile2 (2.4.0)
minitest (5.11.3)
money (6.13.0)
i18n (>= 0.6.4, <= 2)
Expand All @@ -221,8 +221,8 @@ GEM
mustermann-grape (1.0.0)
mustermann (~> 1.0.0)
nio4r (2.3.1)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
nokogiri (1.10.1)
mini_portile2 (~> 2.4.0)
orm_adapter (0.5.0)
pg (1.1.3)
pg_search (2.1.2)
Expand All @@ -248,33 +248,33 @@ GEM
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.1)
actioncable (= 5.2.1)
actionmailer (= 5.2.1)
actionpack (= 5.2.1)
actionview (= 5.2.1)
activejob (= 5.2.1)
activemodel (= 5.2.1)
activerecord (= 5.2.1)
activestorage (= 5.2.1)
activesupport (= 5.2.1)
rails (5.2.2.1)
actioncable (= 5.2.2.1)
actionmailer (= 5.2.2.1)
actionpack (= 5.2.2.1)
actionview (= 5.2.2.1)
activejob (= 5.2.2.1)
activemodel (= 5.2.2.1)
activerecord (= 5.2.2.1)
activestorage (= 5.2.2.1)
activesupport (= 5.2.2.1)
bundler (>= 1.3.0)
railties (= 5.2.1)
railties (= 5.2.2.1)
sprockets-rails (>= 2.0.0)
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)
railties (5.2.1)
actionpack (= 5.2.1)
activesupport (= 5.2.1)
railties (5.2.2.1)
actionpack (= 5.2.2.1)
activesupport (= 5.2.2.1)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rake (12.3.1)
rake (12.3.2)
rakismet (1.5.4)
ransack (2.1.0)
ransack (2.1.1)
actionpack (>= 5.0)
activerecord (>= 5.0)
activesupport (>= 5.0)
Expand Down Expand Up @@ -316,6 +316,9 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sassc (2.0.1)
ffi (~> 1.9)
rake
sdoc (1.0.0)
rdoc (>= 5.0)
simple_form (4.0.1)
Expand All @@ -336,7 +339,7 @@ GEM
activesupport (>= 4.0)
sprockets (>= 3.0.0)
temple (0.8.0)
thor (0.20.0)
thor (0.20.3)
thread_safe (0.3.6)
tilt (2.0.8)
turbolinks (5.2.0)
Expand All @@ -352,8 +355,8 @@ GEM
coercible (~> 1.0)
descendants_tracker (~> 0.0, >= 0.0.3)
equalizer (~> 0.0, >= 0.0.9)
warden (1.2.7)
rack (>= 1.0)
warden (1.2.8)
rack (>= 2.0.6)
webmock (3.2.1)
addressable (>= 2.3.6)
crack (>= 0.3.2)
Expand All @@ -376,13 +379,13 @@ DEPENDENCIES
better_errors (~> 2.4.0)
binding_of_caller
bootsnap
bootstrap-sass
bootstrap-sass (>= 3.4.1)
bugsnag
capybara
coffee-rails (~> 4.2)
country_select
database_cleaner
devise (~> 4.3)
devise (~> 4.6)
dotenv-rails (~> 2.2.1)
factory_bot_rails (~> 4.8.2)
geocoder (~> 1.2.1)
Expand All @@ -405,7 +408,7 @@ DEPENDENCIES
puma
rack-cors
rack-jsonp
rails (= 5.2.1)
rails (= 5.2.2.1)
rakismet
rspec-rails
sass-rails
Expand All @@ -422,4 +425,4 @@ RUBY VERSION
ruby 2.5.3p105

BUNDLED WITH
1.17.1
1.17.3
Loading