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.

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

Update dependencies (2018-02) #82

Merged
merged 2 commits into from
Feb 10, 2018
Merged
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
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ gem 'rails', '5.1.4'
gem 'rails-i18n', '~> 5.0.0'
gem 'dotenv-rails'
gem 'jbuilder', '~> 2.0'
gem 'sdoc', '~> 0.4.0', group: :doc
gem 'sdoc', '~> 1.0.0', group: :doc
gem 'puma', '~> 3.0'
gem 'pg'
gem 'pg', '< 1.0.0'
gem 'sass-rails', '~> 5.0'
gem 'uglifier', '>= 1.3.0'
gem 'webpacker', '~> 3.0'
Expand Down
76 changes: 37 additions & 39 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -45,22 +45,22 @@ GEM
airbrussh (1.3.0)
sshkit (>= 1.6.1, != 1.7.0)
arel (8.0.0)
aws-sdk (2.10.95)
aws-sdk-resources (= 2.10.95)
aws-sdk-core (2.10.95)
aws-sdk (2.10.129)
aws-sdk-resources (= 2.10.129)
aws-sdk-core (2.10.129)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
aws-sdk-resources (2.10.95)
aws-sdk-core (= 2.10.95)
aws-sdk-resources (2.10.129)
aws-sdk-core (= 2.10.129)
aws-sigv4 (1.0.2)
bcrypt (3.1.11)
bindex (0.5.0)
bootstrap-kaminari-views (0.0.5)
kaminari (>= 0.13)
rails (>= 3.1)
builder (3.2.3)
byebug (9.1.0)
capistrano (3.10.0)
byebug (10.0.0)
capistrano (3.10.1)
airbrussh (>= 1.0.0)
i18n
rake (>= 10.0.0)
Expand All @@ -74,21 +74,21 @@ GEM
capistrano-rvm (0.1.2)
capistrano (~> 3.0)
sshkit (~> 1.2)
capybara (2.16.1)
capybara (2.17.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
xpath (>= 2.0, < 4.0)
chronic (0.10.2)
climate_control (0.2.0)
cliver (0.3.2)
cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0)
concurrent-ruby (1.0.5)
crass (1.0.3)
devise (4.3.0)
devise (4.4.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 5.2)
Expand All @@ -107,7 +107,7 @@ GEM
factory_bot_rails (4.8.2)
factory_bot (~> 4.8.2)
railties (>= 3.0.0)
ffi (1.9.18)
ffi (1.9.21)
friendly_id (5.2.3)
activerecord (>= 4.0.0)
globalid (0.4.1)
Expand All @@ -126,13 +126,12 @@ GEM
haml (>= 4.0, < 6)
nokogiri (>= 1.6.0)
ruby_parser (~> 3.5)
i18n (0.9.1)
i18n (0.9.4)
concurrent-ruby (~> 1.0)
jbuilder (2.7.0)
activesupport (>= 4.2.0)
multi_json (>= 1.2)
jmespath (1.3.1)
json (1.8.6)
kaminari (1.1.1)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.1.1)
Expand Down Expand Up @@ -161,30 +160,30 @@ GEM
mimemagic (0.3.2)
mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.10.3)
multi_json (1.12.2)
minitest (5.11.3)
multi_json (1.13.1)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (4.2.0)
nio4r (2.1.0)
nokogiri (1.8.1)
nio4r (2.2.0)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
orm_adapter (0.5.0)
paperclip (5.1.0)
paperclip (5.2.1)
activemodel (>= 4.2.0)
activesupport (>= 4.2.0)
cocaine (~> 0.5.5)
mime-types
mimemagic (~> 0.3.0)
pg (0.21.0)
poltergeist (1.16.0)
poltergeist (1.17.0)
capybara (~> 2.1)
cliver (~> 0.3.1)
websocket-driver (>= 0.2.0)
public_suffix (3.0.1)
puma (3.11.0)
rack (2.0.3)
rack-proxy (0.6.2)
puma (3.11.2)
rack (2.0.4)
rack-proxy (0.6.3)
rack
rack-test (0.8.2)
rack (>= 1.0, < 3)
Expand Down Expand Up @@ -218,12 +217,12 @@ GEM
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rdoc (4.3.0)
rdoc (6.0.1)
redcarpet (3.4.0)
responders (2.4.0)
actionpack (>= 4.2.0, < 5.3)
railties (>= 4.2.0, < 5.3)
rspec-core (3.7.0)
rspec-core (3.7.1)
rspec-support (~> 3.7.0)
rspec-expectations (3.7.0)
diff-lcs (>= 1.2.0, < 2.0)
Expand All @@ -239,11 +238,11 @@ GEM
rspec-expectations (~> 3.7.0)
rspec-mocks (~> 3.7.0)
rspec-support (~> 3.7.0)
rspec-support (3.7.0)
rspec-support (3.7.1)
ruby_dep (1.5.0)
ruby_parser (3.10.1)
sexp_processor (~> 4.9)
sass (3.5.3)
sass (3.5.5)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
Expand All @@ -254,14 +253,13 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sdoc (0.4.2)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
sdoc (1.0.0)
rdoc (>= 5.0)
sexp_processor (4.10.0)
simple_form (3.5.0)
actionpack (> 4, < 5.2)
activemodel (> 4, < 5.2)
sitemap_generator (6.0.0)
sitemap_generator (6.0.1)
builder (~> 3.0)
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
Expand All @@ -270,16 +268,16 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sshkit (1.15.1)
sshkit (1.16.0)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
temple (0.8.0)
thor (0.20.0)
thread_safe (0.3.6)
tilt (2.0.8)
tzinfo (1.2.4)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.0.0)
uglifier (4.1.6)
execjs (>= 0.3.0, < 3)
warden (1.2.7)
rack (>= 1.0)
Expand All @@ -288,7 +286,7 @@ GEM
activemodel (>= 5.0)
bindex (>= 0.4.0)
railties (>= 5.0)
webpacker (3.0.2)
webpacker (3.2.1)
activesupport (>= 4.2)
rack-proxy (>= 0.6.1)
railties (>= 4.2)
Expand All @@ -297,8 +295,8 @@ GEM
websocket-extensions (0.1.3)
whenever (0.10.0)
chronic (>= 0.6.3)
xpath (2.1.0)
nokogiri (~> 1.3)
xpath (3.0.0)
nokogiri (~> 1.8)

PLATFORMS
ruby
Expand All @@ -322,15 +320,15 @@ DEPENDENCIES
kaminari
listen (~> 3.1)
paperclip
pg
pg (< 1.0.0)
poltergeist
puma (~> 3.0)
rails (= 5.1.4)
rails-i18n (~> 5.0.0)
redcarpet
rspec-rails (~> 3.4)
sass-rails (~> 5.0)
sdoc (~> 0.4.0)
sdoc (~> 1.0.0)
simple_form
sitemap_generator
uglifier (>= 1.3.0)
Expand All @@ -339,4 +337,4 @@ DEPENDENCIES
whenever

BUNDLED WITH
1.16.0
1.16.1
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
"path-complete-extname": "^0.1.0",
"postcss-loader": "^2.0.6",
"postcss-smart-import": "^0.7.5",
"precss": "^2.0.0",
"precss": "^3.0.0",
"rails-erb-loader": "^5.1.0",
"rails-ujs": "^5.1.3",
"resolve-url-loader": "^2.1.0",
"sass-loader": "^6.0.6",
"style-loader": "^0.19.0",
"style-loader": "^0.20.0",
"webpack": "^3.5.5",
"webpack-manifest-plugin": "^1.3.1",
"webpack-merge": "^4.1.0"
Expand Down
Loading