Skip to content

Commit

Permalink
Update rails and bootstrap-sass
Browse files Browse the repository at this point in the history
  • Loading branch information
@peter-hank
peter-hank committed Jul 18, 2019
1 parent 1712aa4 commit bccbfe1
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 44 deletions.
4 changes: 2 additions & 2 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ gem 'active_interaction', '~> 3.6'
gem 'acts-as-taggable-on', '~> 5.0'
gem 'acts_as_api', '~> 1.0'
gem 'bootsnap', '~> 1.3', require: false
gem 'bootstrap-sass', '~> 3.3'
gem 'bootstrap-sass', '~> 3.4'
gem 'breadcrumbs', '~> 0.1'
gem 'browser', '~> 2.5'
gem 'devise', '~> 4.4'
Expand All @@ -30,7 +30,7 @@ gem 'pg', '~> 1.0'
gem 'progress_bar', '~> 1.2'
gem 'protected_attributes_continued', '~> 1.3' # TODO: switch to strong parameters
gem 'pundit', '~> 1.1'
gem 'rails', '~> 5.1.0' # @drg frozen
gem 'rails', '~> 5.1.6' # @drg frozen
gem 'rails-observers', '~> 0.1'
gem 'recaptcha', '~> 4.12'
gem 'redis-namespace', '~> 1.6'
Expand Down
87 changes: 45 additions & 42 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,43 +10,43 @@ GEM
specs:
acl9 (3.1.0)
rails (~> 5.0)
actioncable (5.1.6)
actionpack (= 5.1.6)
actioncable (5.1.7)
actionpack (= 5.1.7)
nio4r (~> 2.0)
websocket-driver (~> 0.6.1)
actionmailer (5.1.6)
actionpack (= 5.1.6)
actionview (= 5.1.6)
activejob (= 5.1.6)
actionmailer (5.1.7)
actionpack (= 5.1.7)
actionview (= 5.1.7)
activejob (= 5.1.7)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.1.6)
actionview (= 5.1.6)
activesupport (= 5.1.6)
actionpack (5.1.7)
actionview (= 5.1.7)
activesupport (= 5.1.7)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionpack-action_caching (1.2.0)
actionpack (>= 4.0.0, < 6)
actionview (5.1.6)
activesupport (= 5.1.6)
actionview (5.1.7)
activesupport (= 5.1.7)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
active_interaction (3.6.1)
activemodel (>= 4, < 6)
activejob (5.1.6)
activesupport (= 5.1.6)
activejob (5.1.7)
activesupport (= 5.1.7)
globalid (>= 0.3.6)
activemodel (5.1.6)
activesupport (= 5.1.6)
activerecord (5.1.6)
activemodel (= 5.1.6)
activesupport (= 5.1.6)
activemodel (5.1.7)
activesupport (= 5.1.7)
activerecord (5.1.7)
activemodel (= 5.1.7)
activesupport (= 5.1.7)
arel (~> 8.0)
activesupport (5.1.6)
activesupport (5.1.7)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
Expand All @@ -61,16 +61,16 @@ GEM
public_suffix (>= 2.0.2, < 4.0)
arel (8.0.0)
ast (2.4.0)
autoprefixer-rails (8.6.0)
autoprefixer-rails (9.6.0)
execjs
awesome_print (1.8.0)
bcrypt (3.1.12)
bindex (0.5.0)
bootsnap (1.3.0)
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)
brakeman (4.3.0)
breadcrumbs (0.1.7)
i18n
Expand Down Expand Up @@ -125,7 +125,7 @@ GEM
faraday (0.15.2)
multipart-post (>= 1.2, < 3)
feed-abstract (0.0.15)
ffi (1.9.25)
ffi (1.11.1)
font-awesome-rails (4.7.0.4)
railties (>= 3.2, < 6.0)
formtastic (3.1.5)
Expand All @@ -135,7 +135,7 @@ GEM
fuubar (2.3.1)
rspec-core (~> 3.0)
ruby-progressbar (~> 1.4)
globalid (0.4.1)
globalid (0.4.2)
activesupport (>= 4.2.0)
haml (5.0.4)
temple (>= 0.8.0)
Expand Down Expand Up @@ -179,10 +179,10 @@ 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)
method_source (0.9.2)
mini_mime (1.0.0)
mini_mime (1.0.1)
mini_portile2 (2.4.0)
minitest (5.11.3)
msgpack (1.2.4)
Expand Down Expand Up @@ -227,17 +227,17 @@ GEM
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.1.6)
actioncable (= 5.1.6)
actionmailer (= 5.1.6)
actionpack (= 5.1.6)
actionview (= 5.1.6)
activejob (= 5.1.6)
activemodel (= 5.1.6)
activerecord (= 5.1.6)
activesupport (= 5.1.6)
rails (5.1.7)
actioncable (= 5.1.7)
actionmailer (= 5.1.7)
actionpack (= 5.1.7)
actionview (= 5.1.7)
activejob (= 5.1.7)
activemodel (= 5.1.7)
activerecord (= 5.1.7)
activesupport (= 5.1.7)
bundler (>= 1.3.0)
railties (= 5.1.6)
railties (= 5.1.7)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.2)
actionpack (~> 5.x, >= 5.0.1)
Expand All @@ -250,9 +250,9 @@ GEM
loofah (~> 2.2, >= 2.2.2)
rails-observers (0.1.5)
activemodel (>= 4.0)
railties (5.1.6)
actionpack (= 5.1.6)
activesupport (= 5.1.6)
railties (5.1.7)
actionpack (= 5.1.7)
activesupport (= 5.1.7)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
Expand Down Expand Up @@ -322,6 +322,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
selenium-client (1.2.18)
selenium-webdriver (3.12.0)
childprocess (~> 0.5)
Expand Down Expand Up @@ -397,7 +400,7 @@ GEM
hashdiff
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
websocket-extensions (0.1.4)
whenever (0.10.0)
chronic (>= 0.6.3)
will_paginate (3.1.6)
Expand All @@ -417,7 +420,7 @@ DEPENDENCIES
acts_as_api (~> 1.0)
awesome_print (~> 1.8)
bootsnap (~> 1.3)
bootstrap-sass (~> 3.3)
bootstrap-sass (~> 3.4)
brakeman (~> 4.3)
breadcrumbs (~> 0.1)
browser (~> 2.5)
Expand Down Expand Up @@ -452,7 +455,7 @@ DEPENDENCIES
pry-rails (~> 0.3)
pundit (~> 1.1)
pundit-matchers (~> 1.6)
rails (~> 5.1.0)
rails (~> 5.1.6)
rails-controller-testing (~> 1.0)
rails-observers (~> 0.1)
recaptcha (~> 4.12)
Expand Down

0 comments on commit bccbfe1

Please sign in to comment.