From 8c35d163a5c50eeb30220141036dac0c5dad295c Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Sun, 6 May 2018 17:55:50 +0900 Subject: Port travis_retry for CI (#7379) * Port travis_retry for CI * Add license --- Gemfile.lock | 3 --- 1 file changed, 3 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index f4be9bf9c..6a579d53b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -501,8 +501,6 @@ GEM rspec-expectations (~> 3.7.0) rspec-mocks (~> 3.7.0) rspec-support (~> 3.7.0) - rspec-retry (0.5.7) - rspec-core (> 3.3) rspec-sidekiq (3.0.3) rspec-core (~> 3.0, >= 3.0.0) sidekiq (>= 2.4.0) @@ -726,7 +724,6 @@ DEPENDENCIES redis-rails (~> 5.0) rqrcode (~> 0.10) rspec-rails (~> 3.7) - rspec-retry (~> 0.5) rspec-sidekiq (~> 3.0) rubocop (~> 0.55) ruby-progressbar (~> 1.4) -- cgit From 4d706f9976e705c70f32dfbbd78abb8ab7f1dd7a Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Sat, 12 May 2018 19:08:12 +0900 Subject: Downgrade doorkeeper to version 4.2.6 (#7456) ref https://github.com/doorkeeper-gem/doorkeeper/pull/1060 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile b/Gemfile index 2beac94d2..5c2f33de4 100644 --- a/Gemfile +++ b/Gemfile @@ -41,7 +41,7 @@ gem 'omniauth-cas', '~> 1.1' gem 'omniauth-saml', '~> 1.10' gem 'omniauth', '~> 1.2' -gem 'doorkeeper', '~> 4.3' +gem 'doorkeeper', '~> 4.2', '< 4.3' gem 'fast_blank', '~> 1.0' gem 'fastimage' gem 'goldfinger', '~> 2.1' diff --git a/Gemfile.lock b/Gemfile.lock index 6a579d53b..4507cc146 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -167,7 +167,7 @@ GEM docile (1.3.0) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) - doorkeeper (4.3.2) + doorkeeper (4.2.6) railties (>= 4.2) dotenv (2.2.2) dotenv-rails (2.2.2) @@ -659,7 +659,7 @@ DEPENDENCIES devise (~> 4.4) devise-two-factor (~> 3.0) devise_pam_authenticatable2 (~> 9.1) - doorkeeper (~> 4.3) + doorkeeper (~> 4.2, < 4.3) dotenv-rails (~> 2.2, < 2.3) fabrication (~> 2.20) faker (~> 1.8) -- cgit From f77b11cd10cdc7488e0eb2c07c73b4f4a57ab8b7 Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Sun, 13 May 2018 18:32:46 +0900 Subject: Update http_parser.rb to head version (#7467) --- Gemfile | 1 + Gemfile.lock | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'Gemfile.lock') diff --git a/Gemfile b/Gemfile index 5c2f33de4..1799c2981 100644 --- a/Gemfile +++ b/Gemfile @@ -50,6 +50,7 @@ gem 'redis-namespace', '~> 1.5' gem 'htmlentities', '~> 4.3' gem 'http', '~> 3.2' gem 'http_accept_language', '~> 2.1' +gem 'http_parser.rb', '~> 0.6', git: 'https://github.com/tmm1/http_parser.rb', ref: '54b17ba8c7d8d20a16dfc65d1775241833219cf2' gem 'httplog', '~> 1.0' gem 'idn-ruby', require: 'idn' gem 'kaminari', '~> 1.1' diff --git a/Gemfile.lock b/Gemfile.lock index 4507cc146..6b7651b77 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,10 @@ +GIT + remote: https://github.com/tmm1/http_parser.rb + revision: 54b17ba8c7d8d20a16dfc65d1775241833219cf2 + ref: 54b17ba8c7d8d20a16dfc65d1775241833219cf2 + specs: + http_parser.rb (0.6.1) + GEM remote: https://rubygems.org/ specs: @@ -252,7 +259,6 @@ GEM domain_name (~> 0.5) http-form_data (2.1.0) http_accept_language (2.1.1) - http_parser.rb (0.6.0) httplog (1.0.2) colorize (~> 0.8) rack (>= 1.0) @@ -675,6 +681,7 @@ DEPENDENCIES htmlentities (~> 4.3) http (~> 3.2) http_accept_language (~> 2.1) + http_parser.rb (~> 0.6)! httplog (~> 1.0) i18n-tasks (~> 0.9) idn-ruby -- cgit From 6bed372ad2d8da87f0f3cfa478e688c48aa94702 Mon Sep 17 00:00:00 2001 From: MIYAGI Hikaru Date: Wed, 16 May 2018 23:52:19 +0900 Subject: Fix posix-spawn to version 0.3.12 (#7517) Because 0.3.13 causes build error in x86 or other ILP32 environments. closes #7453 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile b/Gemfile index 1799c2981..d4e707fe1 100644 --- a/Gemfile +++ b/Gemfile @@ -61,7 +61,7 @@ gem 'nsa', '~> 0.2' gem 'oj', '~> 3.5' gem 'ostatus2', '~> 2.0' gem 'ox', '~> 2.9' -gem 'posix-spawn', '~> 0.3' +gem 'posix-spawn', '0.3.12' gem 'pundit', '~> 1.1' gem 'premailer-rails' gem 'rack-attack', '~> 5.2' diff --git a/Gemfile.lock b/Gemfile.lock index 6b7651b77..3c798d8ca 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -387,7 +387,7 @@ GEM pghero (2.1.0) activerecord pkg-config (1.3.0) - posix-spawn (0.3.13) + posix-spawn (0.3.12) powerpack (0.1.1) premailer (1.11.1) addressable @@ -711,7 +711,7 @@ DEPENDENCIES pg (~> 1.0) pghero (~> 2.1) pkg-config (~> 1.3) - posix-spawn (~> 0.3) + posix-spawn (= 0.3.12) premailer-rails private_address_check (~> 0.4.1) pry-byebug (~> 3.6) -- cgit From 0b1f88cfd5fb88b392c7b959467ffdb087868f7d Mon Sep 17 00:00:00 2001 From: MIYAGI Hikaru Date: Sat, 19 May 2018 09:20:43 +0900 Subject: Upgrade posix-spawn to master (#7542) --- Gemfile | 2 +- Gemfile.lock | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile b/Gemfile index d4e707fe1..cab4c4139 100644 --- a/Gemfile +++ b/Gemfile @@ -61,7 +61,7 @@ gem 'nsa', '~> 0.2' gem 'oj', '~> 3.5' gem 'ostatus2', '~> 2.0' gem 'ox', '~> 2.9' -gem 'posix-spawn', '0.3.12' +gem 'posix-spawn', git: 'https://github.com/rtomayko/posix-spawn', ref: '58465d2e213991f8afb13b984854a49fcdcc980c' gem 'pundit', '~> 1.1' gem 'premailer-rails' gem 'rack-attack', '~> 5.2' diff --git a/Gemfile.lock b/Gemfile.lock index 3c798d8ca..f7a377d45 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,10 @@ +GIT + remote: https://github.com/rtomayko/posix-spawn + revision: 58465d2e213991f8afb13b984854a49fcdcc980c + ref: 58465d2e213991f8afb13b984854a49fcdcc980c + specs: + posix-spawn (0.3.13) + GIT remote: https://github.com/tmm1/http_parser.rb revision: 54b17ba8c7d8d20a16dfc65d1775241833219cf2 @@ -387,7 +394,6 @@ GEM pghero (2.1.0) activerecord pkg-config (1.3.0) - posix-spawn (0.3.12) powerpack (0.1.1) premailer (1.11.1) addressable @@ -711,7 +717,7 @@ DEPENDENCIES pg (~> 1.0) pghero (~> 2.1) pkg-config (~> 1.3) - posix-spawn (= 0.3.12) + posix-spawn! premailer-rails private_address_check (~> 0.4.1) pry-byebug (~> 3.6) -- cgit