From 3549a13f209b85dc429553edd242cf15f9e406f7 Mon Sep 17 00:00:00 2001 From: Scott Bishop Date: Tue, 25 Jun 2019 10:10:20 -0700 Subject: [PATCH 01/17] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2807179..91807fd 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Vizzy is built with a plugin architecture. Plugins implement build hooks (build_ ## Getting Started ### Prerequisites -Ruby 2.3.1 and Rails 5.1.4. See http://installrails.com/ for install instructions. +Ruby 2.3.7 and Rails 5.1.6.2. See http://installrails.com/ for install instructions. #### Install ImageMagick and PostgreSQL Install ImageMagick, a command line image processing tool (version 6 is required as the latest version causes bundle install to fail): @@ -46,7 +46,7 @@ PostgreSQL is a database server, so you'll need to start it up to run Vizzy. ### Setup Fork the repository. Then clone your fork: `git clone https://github.com//vizzy.git` -Vizzy uses Rails 5.1 encrypted secrets for its configuration. From the Vizzy project directory, run these commands +Vizzy uses Rails 5.1.6.2 encrypted secrets for its configuration. From the Vizzy project directory, run these commands Generate the encrypted secrets file and key. From 2c5d72b01fd0d76865f1d9f3bff454dc45c36fb7 Mon Sep 17 00:00:00 2001 From: Scott Bishop Date: Wed, 10 Jul 2019 14:27:58 -0700 Subject: [PATCH 02/17] Update deployment readme --- vizzy/README.md | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/vizzy/README.md b/vizzy/README.md index c92f90e..2016a42 100644 --- a/vizzy/README.md +++ b/vizzy/README.md @@ -36,3 +36,36 @@ helm install . \ --set postgresql.postgresPassword=******** \ --set postgresql.postgresDatabase=vizzy ``` + +You could also override values in a .yaml file and then every time you want to upgrade, you can run: + +```bash +helm upgrade -i -f vizzy.yaml /vizzy +``` + +where vizzy.yaml looks like + +```yaml +# Default values for vizzy. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +image: + repository: dockerhub.com/scottcbishop/vizzy + tag: v3.4.2 + pullPolicy: IfNotPresent + pullSecret: dockerhub.com + +env: + vizzyUri: + name: VIZZY_URI + +service: + type: ClusterIP + +nginxIngress: + enabled: true + +postgresql: + enabled: true +``` From 3ee28323ff9a7e68b0a98b61183ad3061f0b37ac Mon Sep 17 00:00:00 2001 From: Scott Bishop Date: Wed, 10 Jul 2019 14:37:33 -0700 Subject: [PATCH 03/17] Update README.md --- README.md | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 91807fd..e3b3812 100644 --- a/README.md +++ b/README.md @@ -171,22 +171,7 @@ Travis CI publishes the latest master image to [Docker Hub](https://hub.docker.c We recommend a tool called [Kubernetes](https://kubernetes.io/docs/home/) (k8s), an opened sourced container cluster manager originally designed by Google, now owned by Cloud Native Computing. This tool aims to provide a platform for automating deployment, scaling, and operations of application containers across clusters of hosts. -Kubernetes scripts are provided in the [k8s](./k8s) folder. Here is an example for running the k8s deployment script. - -*NOTE*: some parameters will come from the Continuous Integration (CI) build system such as $GIT_COMMIT. - -```sh -API_SERVER=https://kubernetes-api-server.com -NAMESPACE=vizzy -REPLICA_PODS=5 -VIZZY_URI=vizzy.com -MEMORY="8Gi" -RAILS_ENV=production -DOCKER_REGISTRY=dockerhub.com -RUN_TESTS=false - -./deploy-vizzy.sh --api-server=$API_SERVER --bearer-token=$BEARER --rails-env=$RAILS_ENV --vizzy-version=$GIT_COMMIT --namespace=$NAMESPACE --vizzy-uri=$VIZZY_URI --replica-pods=$REPLICA_PODS --memory=$MEMORY --docker-registry=$DOCKER_REGISTRY --run-tests=$RUN_TESTS -``` +Helm, a tool used for Kubernetes deployments, is recommended for deployment and the chart is provided at in [vizzy](./vizzy). More information on how to deploy Vizzy with helm can be found [here](./vizzy/README.md) Vizzy scales well, we use 5 replica pods each with 8Gi memory. @@ -210,7 +195,9 @@ To get complete the setup of the database you need to run the rails migrations You should now be able to see Vizzy running at https://[your-app-name-here].herokuapp.com/ -### Our Current Deployment Setup +### Deployment Setup + +Deployment infrastructure depends on the size of the team, for a team of 30, we use 1 Pod for Postgres database 5 Pods for the Vizzy server @@ -221,6 +208,10 @@ All pods are assigned an IP/Host in the data center and share: all be loaded correctly. - A single Postgres database shared for all pods. +If deployed on AWS, you can use [Amazon RDS] (https://aws.amazon.com/rds/postgresql/) for the database pod. + +Once deployed, you can start adding Vizzy to your continuous integration builds. + ## Add Upload Step to Continuous Integration Builds Vizzy contains the upload script in the public directory [upload_images_to_server.rb](test-image-upload/upload_images_to_server.rb). To obtain the upload script in your CI builds, you can download it from the running server with this shell script From 3a37477feb195f2b8628b657c43ed65a1ffdc8bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2019 16:16:07 +0000 Subject: [PATCH 04/17] Bump nokogiri from 1.10.1 to 1.10.4 Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.1 to 1.10.4. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.1...v1.10.4) Signed-off-by: dependabot[bot] --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index cabc522..1b7b489 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -175,12 +175,12 @@ GEM netrc (0.11.0) nio4r (2.3.1) nio4r (2.3.1-java) - nokogiri (1.10.1) + nokogiri (1.10.4) mini_portile2 (~> 2.4.0) - nokogiri (1.10.1-java) - nokogiri (1.10.1-x64-mingw32) + nokogiri (1.10.4-java) + nokogiri (1.10.4-x64-mingw32) mini_portile2 (~> 2.4.0) - nokogiri (1.10.1-x86-mingw32) + nokogiri (1.10.4-x86-mingw32) mini_portile2 (~> 2.4.0) orm_adapter (0.5.0) paperclip (6.0.0) From b1a4e3770823ab320f6cf3d8b15e4e6d2f25fdda Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2019 04:30:13 +0000 Subject: [PATCH 05/17] Bump devise from 4.6.2 to 4.7.1 Bumps [devise](https://github.com/plataformatec/devise) from 4.6.2 to 4.7.1. - [Release notes](https://github.com/plataformatec/devise/releases) - [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md) - [Commits](https://github.com/plataformatec/devise/compare/v4.6.2...v4.7.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1b7b489..b937136 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,10 +48,8 @@ GEM arel (8.0.0) autoprefixer-rails (9.4.9) execjs - bcrypt (3.1.12) - bcrypt (3.1.12-java) - bcrypt (3.1.12-x64-mingw32) - bcrypt (3.1.12-x86-mingw32) + bcrypt (3.1.13) + bcrypt (3.1.13-java) better_errors (2.4.0) coderay (>= 1.0.0) erubi (>= 1.0.0) @@ -96,10 +94,10 @@ GEM crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.4) - devise (4.6.2) + devise (4.7.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0, < 6.0) + railties (>= 4.1.0) responders warden (~> 1.2.3) devise-bootstrap-views (0.0.11) @@ -195,7 +193,7 @@ GEM public_suffix (3.0.2) puma (3.10.0) puma (3.10.0-java) - rack (2.0.6) + rack (2.0.7) rack-test (1.1.0) rack (>= 1.0, < 3) rails (5.1.6.2) @@ -217,7 +215,7 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.4) + rails-html-sanitizer (1.2.0) loofah (~> 2.2, >= 2.2.2) rails_12factor (0.0.3) rails_serve_static_assets @@ -235,7 +233,7 @@ GEM method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.3.2) + rake (12.3.3) rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) From b70da2cfe535f171a3ed252fb6b0a8755a259cd8 Mon Sep 17 00:00:00 2001 From: Raul Portales Date: Thu, 24 Oct 2019 22:55:20 +0100 Subject: [PATCH 06/17] Update README.md --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index e3b3812..0d30bd6 100644 --- a/README.md +++ b/README.md @@ -126,6 +126,11 @@ From the Vizzy project directory run `rake db:create db:migrate` +### Start the server +From the Vizzy project directory run + +`rails server` + ### Create a Vizzy Project and Test User Vizzy projects allow you to run visual automation on multiple branches (ex. Master, Develop), each branch represented by a project. Each project has its own set of base images. There is typically a one to one mapping of a build plan to a Vizzy project. NOTE: Pull Requests opened against the master branch should be uploaded to the master Vizzy project so the correct set of base images are used to calculated the diffs. From 4c1a64b9259bbca30a3574188d8b0713dc619786 Mon Sep 17 00:00:00 2001 From: Raul Portales Date: Thu, 24 Oct 2019 23:21:36 +0100 Subject: [PATCH 07/17] Update README.md --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0d30bd6..e996f09 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Vizzy is a powerful Ruby on Rails web server that facilitates Visual Automation, The process Vizzy goes through is as follows: -1. First a test suite is run against the master branch. This generates a set of images which becomes the baseline to test against. These "Base Images" are uploaded and managed by Vizzy. +1. First a test suite is run against the master branch. This generates a set of images which becomes the baseline to test against. These "Base Images" are uploaded and managed by Vizzy. 2. Then for every subsequent pull request changeset, the same test suite runs and generates a new set of images called "Test Images". MD5 hashes are created from the images so only the images that are different from their base image get uploaded. Vizzy goes through each matching test, which contains two images, one base image and one test image, and performs a pixel by pixel diff of the two images using a tool called [ImageMagick](https://rubygems.org/gems/rmagick/versions/2.15.4). A third image is generated which highlights the differences in red. @@ -43,6 +43,12 @@ PostgreSQL is a database server, so you'll need to start it up to run Vizzy. `brew services start postgresql` +#### NOTE: Vizzy and icu4c 62 + +Vizzy uses icu4c version 62. The default installation from brew will not work and version 62 is not listed under recents. To replace the default installation with version 62 you can run: + +`brew reinstall https://raw.githubusercontent.com/Homebrew/homebrew-core/575eb4bbef683551e19f329f60456b13a558132f/Formula/icu4c.rb + ### Setup Fork the repository. Then clone your fork: `git clone https://github.com//vizzy.git` From 5c4a62736769d2976ed87c12a3119f83a7fd1448 Mon Sep 17 00:00:00 2001 From: ScottBishop Date: Mon, 28 Oct 2019 08:42:51 -0700 Subject: [PATCH 08/17] MAINT: Fix the helm lint in travis ci: apiVersion is now required --- vizzy/Chart.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/vizzy/Chart.yaml b/vizzy/Chart.yaml index 153b6be..17a91a6 100644 --- a/vizzy/Chart.yaml +++ b/vizzy/Chart.yaml @@ -1,3 +1,4 @@ +apiVersion: v1 name: vizzy home: https://github.com/Workday/vizzy version: 0.1.0 From f46694fd7cc602f5ab265e5d77e5b228f86ffc6d Mon Sep 17 00:00:00 2001 From: "Gregory G. Tseng" Date: Fri, 8 Nov 2019 10:03:12 -0800 Subject: [PATCH 09/17] Change md5 call to use native ruby library instead of cli (#49) --- public/upload_images_to_server.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/public/upload_images_to_server.rb b/public/upload_images_to_server.rb index 3db8831..adac336 100755 --- a/public/upload_images_to_server.rb +++ b/public/upload_images_to_server.rb @@ -252,8 +252,7 @@ def upload_images_to_build_with_id(id, images_to_upload, test_image_folder) def compute_image_md5s_json(test_image_folder) image_md5s = {} traverse_directories(test_image_folder) do |ancestry, file| - md5 = `md5 -q #{file}` - md5 = md5.tr("\n", '').to_s + md5 = Digest::MD5.file(file).hexdigest image_md5s[ancestry] = md5 end { count: image_md5s.size, json: image_md5s.to_json } From de2202e9cf551c98d8c4b0c50b00f6e3653a8b01 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 8 Nov 2019 19:53:24 +0000 Subject: [PATCH 10/17] Bump loofah from 2.2.3 to 2.3.1 Bumps [loofah](https://github.com/flavorjones/loofah) from 2.2.3 to 2.3.1. - [Release notes](https://github.com/flavorjones/loofah/releases) - [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md) - [Commits](https://github.com/flavorjones/loofah/compare/v2.2.3...v2.3.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b937136..31ececc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -93,7 +93,7 @@ GEM concurrent-ruby (1.0.5-java) crack (0.4.3) safe_yaml (~> 1.0.0) - crass (1.0.4) + crass (1.0.5) devise (4.7.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) @@ -135,7 +135,7 @@ GEM listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - loofah (2.2.3) + loofah (2.3.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -173,12 +173,12 @@ GEM netrc (0.11.0) nio4r (2.3.1) nio4r (2.3.1-java) - nokogiri (1.10.4) + nokogiri (1.10.5) mini_portile2 (~> 2.4.0) - nokogiri (1.10.4-java) - nokogiri (1.10.4-x64-mingw32) + nokogiri (1.10.5-java) + nokogiri (1.10.5-x64-mingw32) mini_portile2 (~> 2.4.0) - nokogiri (1.10.4-x86-mingw32) + nokogiri (1.10.5-x86-mingw32) mini_portile2 (~> 2.4.0) orm_adapter (0.5.0) paperclip (6.0.0) From 4a8a10da63bfb1853282166d2bb31f51b8259305 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 8 Nov 2019 20:33:48 +0000 Subject: [PATCH 11/17] Bump rubyzip from 1.2.2 to 1.3.0 Bumps [rubyzip](https://github.com/rubyzip/rubyzip) from 1.2.2 to 1.3.0. - [Release notes](https://github.com/rubyzip/rubyzip/releases) - [Changelog](https://github.com/rubyzip/rubyzip/blob/master/Changelog.md) - [Commits](https://github.com/rubyzip/rubyzip/compare/v1.2.2...v1.3.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 31ececc..b82710f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -262,7 +262,7 @@ GEM netrc (~> 0.8) rmagick (2.16.0) ruby-progressbar (1.10.0) - rubyzip (1.2.2) + rubyzip (1.3.0) safe_yaml (1.0.4) sass (3.5.2) sass-listen (~> 4.0.0) From 16a0b49098b74d01e922068c0c772c2aa47e1775 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 Dec 2019 04:04:46 +0000 Subject: [PATCH 12/17] Bump puma from 3.10.0 to 3.12.2 Bumps [puma](https://github.com/puma/puma) from 3.10.0 to 3.12.2. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v3.10.0...v3.12.2) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index f51e66a..2e3637b 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ ruby '2.3.7' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.1.6.2' # Use Puma as the app server -gem 'puma', '~> 3.0' +gem 'puma', '~> 3.12' # Use SCSS for stylesheets gem 'sass-rails', '~> 5.0.7' # Use Uglifier as compressor for JavaScript assets diff --git a/Gemfile.lock b/Gemfile.lock index b82710f..0d0154b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -191,8 +191,8 @@ GEM pg (0.21.0-x64-mingw32) pg (0.21.0-x86-mingw32) public_suffix (3.0.2) - puma (3.10.0) - puma (3.10.0-java) + puma (3.12.2) + puma (3.12.2-java) rack (2.0.7) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -377,7 +377,7 @@ DEPENDENCIES net-ldap paperclip pg - puma (~> 3.0) + puma (~> 3.12) rails (~> 5.1.6.2) rails-controller-testing rails_12factor From 7627c2f4f30a55a207ab55f2ccde06b68bcaceb5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2020 18:10:18 +0000 Subject: [PATCH 13/17] Bump rack from 2.0.7 to 2.0.8 Bumps [rack](https://github.com/rack/rack) from 2.0.7 to 2.0.8. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/2.0.7...2.0.8) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0d0154b..8fc259e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -193,7 +193,7 @@ GEM public_suffix (3.0.2) puma (3.12.2) puma (3.12.2-java) - rack (2.0.7) + rack (2.0.8) rack-test (1.1.0) rack (>= 1.0, < 3) rails (5.1.6.2) From 05626ad6bd192cec81f60ec7ca46a21e5ab42941 Mon Sep 17 00:00:00 2001 From: ScottBishop Date: Wed, 5 Feb 2020 09:25:01 -0800 Subject: [PATCH 14/17] MAINT: Use destructive destroy to delete test image --- app/controllers/test_images_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/test_images_controller.rb b/app/controllers/test_images_controller.rb index 8cf59b1..c17750e 100644 --- a/app/controllers/test_images_controller.rb +++ b/app/controllers/test_images_controller.rb @@ -69,7 +69,7 @@ def destroy new_image_diffs.each { |diff| diff.destroy } - @test_image.destroy + @test_image.destroy! redirect_to test_images_path end From 0500abd4128af921de6039c27472b36b7ffea707 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 28 Feb 2020 21:47:50 +0000 Subject: [PATCH 15/17] Bump puma from 3.12.2 to 3.12.3 Bumps [puma](https://github.com/puma/puma) from 3.12.2 to 3.12.3. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v3.12.2...v3.12.3) Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8fc259e..3cd2324 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -191,8 +191,8 @@ GEM pg (0.21.0-x64-mingw32) pg (0.21.0-x86-mingw32) public_suffix (3.0.2) - puma (3.12.2) - puma (3.12.2-java) + puma (3.12.3) + puma (3.12.3-java) rack (2.0.8) rack-test (1.1.0) rack (>= 1.0, < 3) From 7be5911c31aafaed47a6521b544529e11c887ad6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Mar 2020 00:22:35 +0000 Subject: [PATCH 16/17] Bump puma from 3.12.3 to 3.12.4 Bumps [puma](https://github.com/puma/puma) from 3.12.3 to 3.12.4. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v3.12.3...v3.12.4) Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3cd2324..308d98a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -191,8 +191,8 @@ GEM pg (0.21.0-x64-mingw32) pg (0.21.0-x86-mingw32) public_suffix (3.0.2) - puma (3.12.3) - puma (3.12.3-java) + puma (3.12.4) + puma (3.12.4-java) rack (2.0.8) rack-test (1.1.0) rack (>= 1.0, < 3) From 3cf0bf7d45180d093b4f33ee057b96957672ce29 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Mar 2020 00:22:54 +0000 Subject: [PATCH 17/17] Bump nokogiri from 1.10.5 to 1.10.9 Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.5 to 1.10.9. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/v1.10.9/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.5...v1.10.9) Signed-off-by: dependabot[bot] --- Gemfile.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3cd2324..854e2b3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -173,12 +173,12 @@ GEM netrc (0.11.0) nio4r (2.3.1) nio4r (2.3.1-java) - nokogiri (1.10.5) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) - nokogiri (1.10.5-java) - nokogiri (1.10.5-x64-mingw32) + nokogiri (1.10.9-java) + nokogiri (1.10.9-x64-mingw32) mini_portile2 (~> 2.4.0) - nokogiri (1.10.5-x86-mingw32) + nokogiri (1.10.9-x86-mingw32) mini_portile2 (~> 2.4.0) orm_adapter (0.5.0) paperclip (6.0.0) @@ -191,8 +191,8 @@ GEM pg (0.21.0-x64-mingw32) pg (0.21.0-x86-mingw32) public_suffix (3.0.2) - puma (3.12.3) - puma (3.12.3-java) + puma (3.12.4) + puma (3.12.4-java) rack (2.0.8) rack-test (1.1.0) rack (>= 1.0, < 3)