Skip to content

Commit

Permalink
Merge pull request #317 from haiafara/development
Browse files Browse the repository at this point in the history 
[release] 2019-12-20 - Version Bumps & Security Fixes
  • Loading branch information
@janosrusiczki
janosrusiczki authored Dec 20, 2019
2 parents 5e207c3 + 44649ed commit eb55d26
Show file tree
Hide file tree
Showing 5 changed files with 1,281 additions and 1,691 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cache:
directories:
- ~/.cache
before_install:
- gem update --system
- yes | gem update --system --force
- gem install bundler
install:
- bundle install
Expand Down
6 changes: 3 additions & 3 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ gem 'rails', '~> 5.2.1'
# Use postgresql as the database for Active Record
gem 'pg', '>= 0.18', '< 2.0'
# Use Puma as the app server
gem 'puma', '~> 3.11'
gem 'puma', '~> 3.12'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
Expand Down Expand Up @@ -56,10 +56,10 @@ gem 'administrate-field-shrine', github: 'haiafara/administrate-field-shrine'
gem 'aws-sdk-s3'
gem 'devise'
gem 'fast_jsonapi'
gem 'friendly_id', '~> 5.2.0'
gem 'friendly_id', '~> 5.3.0'
gem 'image_processing', '~> 1.0'
gem 'rgeo-geojson'
gem 'shrine'
gem 'shrine', '~> 2.19'
gem 'sidekiq', '~> 5.2.7'
gem 'sitemap_generator'

Expand Down
119 changes: 69 additions & 50 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,40 +66,40 @@ GEM
momentjs-rails (~> 2.8)
sass-rails (~> 5.0)
selectize-rails (~> 0.6)
airbrussh (1.3.4)
airbrussh (1.4.0)
sshkit (>= 1.6.1, != 1.7.0)
arel (9.0.0)
ast (2.4.0)
autoprefixer-rails (9.6.0)
autoprefixer-rails (9.7.3)
execjs
aws-eventstream (1.0.3)
aws-partitions (1.240.0)
aws-sdk-core (3.78.0)
aws-partitions (1.258.0)
aws-sdk-core (3.86.0)
aws-eventstream (~> 1.0, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-kms (1.25.0)
aws-sdk-kms (1.27.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.55.0)
aws-sdk-core (~> 3, >= 3.77.0)
aws-sdk-s3 (1.60.1)
aws-sdk-core (~> 3, >= 3.83.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.1.0)
aws-eventstream (~> 1.0, >= 1.0.2)
bcrypt (3.1.13)
bindex (0.7.0)
bindex (0.8.1)
bootsnap (1.4.5)
msgpack (~> 1.0)
builder (3.2.3)
builder (3.2.4)
byebug (11.0.1)
capistrano (3.11.2)
airbrussh (>= 1.0.0)
i18n
rake (>= 10.0.0)
sshkit (>= 1.9.0)
capistrano-bundler (1.5.0)
capistrano-bundler (1.6.0)
capistrano (~> 3.1)
capistrano-passenger (0.2.0)
capistrano (~> 3.0)
Expand All @@ -109,9 +109,9 @@ GEM
capistrano-rvm (0.1.2)
capistrano (~> 3.0)
sshkit (~> 1.2)
capistrano-sidekiq (1.0.2)
capistrano-sidekiq (1.0.3)
capistrano (>= 3.9.0)
sidekiq (>= 3.4)
sidekiq (>= 3.4, < 6.0)
capybara (3.29.0)
addressable
mini_mime (>= 0.1.3)
Expand All @@ -132,12 +132,12 @@ GEM
concurrent-ruby (1.1.5)
connection_pool (2.2.2)
content_disposition (1.0.0)
coveralls (0.8.23)
json (>= 1.8, < 3)
simplecov (~> 0.16.1)
term-ansicolor (~> 1.3)
thor (>= 0.19.4, < 2.0)
tins (~> 1.6)
coveralls (0.7.1)
multi_json (~> 1.3)
rest-client
simplecov (>= 0.7)
term-ansicolor
thor
crass (1.0.5)
database_cleaner (1.7.0)
datetime_picker_rails (0.0.7)
Expand All @@ -150,6 +150,8 @@ GEM
warden (~> 1.2.3)
diff-lcs (1.3)
docile (1.3.2)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
down (4.8.1)
addressable (~> 2.5)
erubi (1.9.0)
Expand All @@ -159,29 +161,32 @@ GEM
factory_bot_rails (5.1.1)
factory_bot (~> 5.1.0)
railties (>= 4.2.0)
faraday (0.17.0)
faraday (0.17.1)
multipart-post (>= 1.2, < 3)
fast_jsonapi (1.5)
activesupport (>= 4.2)
ffi (1.11.1)
friendly_id (5.2.5)
ffi (1.11.3)
friendly_id (5.3.0)
activerecord (>= 4.0.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
http-accept (1.7.0)
http-cookie (1.0.3)
domain_name (~> 0.5)
i18n (1.7.0)
concurrent-ruby (~> 1.0)
image_processing (1.9.0)
mini_magick (>= 4.9.3, < 5)
image_processing (1.10.0)
mini_magick (>= 4.9.5, < 5)
ruby-vips (>= 2.0.13, < 3)
jaro_winkler (1.5.3)
jaro_winkler (1.5.4)
jbuilder (2.9.1)
activesupport (>= 4.2.0)
jmespath (1.4.0)
jquery-rails (4.3.5)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (2.2.0)
json (2.3.0)
kaminari (1.1.1)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.1.1)
Expand All @@ -198,14 +203,17 @@ GEM
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.3.1)
loofah (2.4.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (0.3.3)
mimemagic (~> 0.3.2)
method_source (0.9.2)
mime-types (3.3)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.1009)
mimemagic (0.3.3)
mini_magick (4.9.5)
mini_mime (1.0.2)
Expand All @@ -214,24 +222,26 @@ GEM
momentjs-rails (2.20.1)
railties (>= 3.1)
msgpack (1.3.1)
multi_json (1.14.1)
multipart-post (2.1.1)
net-scp (2.0.0)
net-ssh (>= 2.6.5, < 6.0.0)
net-ssh (5.2.0)
nio4r (2.3.1)
nokogiri (1.10.5)
netrc (0.11.0)
nio4r (2.5.2)
nokogiri (1.10.7)
mini_portile2 (~> 2.4.0)
orm_adapter (0.5.0)
parallel (1.18.0)
parallel (1.19.1)
parser (2.6.5.0)
ast (~> 2.4.0)
pg (1.1.4)
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
public_suffix (4.0.1)
puma (3.12.1)
rack (2.0.7)
puma (3.12.2)
rack (2.0.8)
rack-protection (2.0.7)
rack
rack-proxy (0.6.5)
Expand Down Expand Up @@ -267,13 +277,18 @@ GEM
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
redis (4.1.2)
redis (4.1.3)
regexp_parser (1.6.0)
responders (3.0.0)
actionpack (>= 5.0)
railties (>= 5.0)
rgeo (2.0.1)
rgeo-activerecord (6.2.0)
rest-client (2.1.0)
http-accept (>= 1.7.0, < 2.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rgeo (2.1.1)
rgeo-activerecord (6.2.1)
activerecord (>= 5.0)
rgeo (>= 1.0.0)
rgeo-geojson (2.1.1)
Expand All @@ -295,20 +310,20 @@ GEM
rspec-mocks (~> 3.9.0)
rspec-support (~> 3.9.0)
rspec-support (3.9.0)
rubocop (0.76.0)
rubocop (0.78.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.6)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7)
rubocop-rails (2.3.2)
rubocop-rails (2.4.0)
rack (>= 1.1)
rubocop (>= 0.72.0)
rubocop-rspec (1.36.0)
rubocop-rspec (1.37.1)
rubocop (>= 0.68.1)
ruby-progressbar (1.10.1)
ruby-vips (2.0.13)
ruby-vips (2.0.16)
ffi (~> 1.9)
ruby_dep (1.5.0)
rubyzip (2.0.0)
Expand All @@ -327,19 +342,20 @@ GEM
selenium-webdriver (3.142.6)
childprocess (>= 0.5, < 4.0)
rubyzip (>= 1.2.2)
sentry-raven (2.12.3)
sentry-raven (2.13.0)
faraday (>= 0.7.6, < 1.0)
shrine (2.17.1)
shrine (2.19.3)
content_disposition (~> 1.0)
down (~> 4.1)
shrine-memory (0.3.0)
shrine (~> 2.2)
shrine-memory (0.1.0)
down
shrine
sidekiq (5.2.7)
connection_pool (~> 2.2, >= 2.2.2)
rack (>= 1.5.0)
rack-protection (>= 1.5.0)
redis (>= 3.3.5, < 5)
simplecov (0.16.1)
simplecov (0.17.1)
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
Expand All @@ -366,16 +382,19 @@ GEM
net-ssh (>= 2.8.0)
term-ansicolor (1.7.1)
tins (~> 1.0)
thor (0.20.3)
thor (1.0.1)
thread_safe (0.3.6)
tilt (2.0.9)
tins (1.21.1)
tilt (2.0.10)
tins (1.22.2)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
underpass (0.0.7)
rgeo (~> 2.0, >= 2.0.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.6)
unicode-display_width (1.6.0)
warden (1.2.8)
rack (>= 2.0.6)
Expand All @@ -384,7 +403,7 @@ GEM
activemodel (>= 5.0)
bindex (>= 0.4.0)
railties (>= 5.0)
webpacker (4.2.0)
webpacker (4.2.2)
activesupport (>= 4.2)
rack-proxy (>= 0.6.1)
railties (>= 4.2)
Expand Down Expand Up @@ -416,14 +435,14 @@ DEPENDENCIES
devise
factory_bot_rails (~> 5.0)
fast_jsonapi
friendly_id (~> 5.2.0)
friendly_id (~> 5.3.0)
image_processing (~> 1.0)
jbuilder (~> 2.5)
listen (>= 3.0.5, < 3.2)
loofah (>= 2.2.3)
pg (>= 0.18, < 2.0)
pry
puma (~> 3.11)
puma (~> 3.12)
rack (>= 2.0.6)
rails (~> 5.2.1)
rgeo-geojson
Expand All @@ -434,7 +453,7 @@ DEPENDENCIES
sass-rails (~> 5.0)
selenium-webdriver
sentry-raven
shrine
shrine (~> 2.19)
shrine-memory
sidekiq (~> 5.2.7)
simplecov
Expand Down
30 changes: 15 additions & 15 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,36 @@
"name": "haiafara",
"private": true,
"dependencies": {
"@babel/core": "^7.7.2",
"@babel/plugin-proposal-class-properties": "^7.7.0",
"@babel/plugin-transform-runtime": "^7.6.2",
"@babel/preset-env": "^7.7.0",
"@rails/webpacker": "^4.2.0",
"caniuse-lite": "^1.0.30001010",
"css-element-queries": "^1.2.1",
"@babel/core": "^7.7.5",
"@babel/plugin-proposal-class-properties": "^7.7.4",
"@babel/plugin-transform-runtime": "^7.7.5",
"@babel/preset-env": "^7.7.5",
"@rails/webpacker": "^4.2.2",
"caniuse-lite": "^1.0.30001016",
"css-element-queries": "^1.2.2",
"css-loader": "^2.1.1",
"file-loader": "^4.2.0",
"file-loader": "^4.3.0",
"leaflet": "^1.6.0",
"leaflet-active-area": "^1.1.1",
"leaflet.fullscreen": "^1.6.0",
"postcss-cssnext": "^3.1.0",
"tailwindcss": "^1.1.3",
"set-value": "^2.0.1",
"typescript": "^3.7.2",
"vue": "^2.6.10",
"tailwindcss": "^1.1.4",
"typescript": "^3.7.3",
"vue": "^2.6.11",
"vue-image-lightbox": "^6.4.0",
"vue-lazyload": "^1.3.3",
"vue-loader": "^15.7.2",
"vue-loader": "^15.8.3",
"vue-router": "^3.1.3",
"vue-template-compiler": "^2.6.10",
"webpack": "^4.41.2",
"vue-template-compiler": "^2.6.11",
"webpack": "^4.41.4",
"webpack-cli": "^3.3.10"
},
"devDependencies": {
"babel-loader": "^8.0.6",
"eslint": "^5.16.0",
"eslint-config-standard": "^12.0.0",
"eslint-plugin-import": "^2.18.2",
"eslint-plugin-import": "^2.19.1",
"eslint-plugin-node": "^9.2.0",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-standard": "^4.0.1",
Expand Down
Loading

0 comments on commit eb55d26

Please sign in to comment.