From 65fd8209c745393961b31c58c38261e07ee998a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 11 Apr 2019 04:43:17 +0000 Subject: [PATCH 1/6] Bump state_machines-activerecord from 0.5.0 to 0.6.0 Bumps [state_machines-activerecord](https://github.com/state-machines/state_machines-activerecord) from 0.5.0 to 0.6.0. - [Release notes](https://github.com/state-machines/state_machines-activerecord/releases) - [Commits](https://github.com/state-machines/state_machines-activerecord/compare/v0.5.0...v0.6.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 35827f79a..a4b5602f5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -536,11 +536,11 @@ GEM sprockets (>= 3.0.0) sqlite3 (1.3.13) state_machines (0.5.0) - state_machines-activemodel (0.5.0) - activemodel (>= 4.1, < 5.2) + state_machines-activemodel (0.6.0) + activemodel (>= 4.1, < 6.0) state_machines (>= 0.5.0) - state_machines-activerecord (0.5.0) - activerecord (>= 4.1, < 5.2) + state_machines-activerecord (0.6.0) + activerecord (>= 4.1) state_machines-activemodel (>= 0.5.0) state_machines-graphviz (0.0.2) ruby-graphviz From 10ce720ca532f48849ad1112b26446de28a0dbfd Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 28 Feb 2020 17:25:30 +0000 Subject: [PATCH 2/6] [Security] Bump rake from 12.3.2 to 13.0.1 Bumps [rake](https://github.com/ruby/rake) from 12.3.2 to 13.0.1. **This update includes a security fix.** - [Release notes](https://github.com/ruby/rake/releases) - [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc) - [Commits](https://github.com/ruby/rake/compare/v12.3.2...v13.0.1) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index b91a960ff..ebd6881d4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -347,7 +347,7 @@ GEM activesupport (= 4.2.11.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.3.2) + rake (13.0.1) ransack (1.8.3) actionpack (>= 3.0) activerecord (>= 3.0) From ece5a47df04c783d72f34e23b510be30ad000415 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 29 Sep 2020 04:14:30 +0000 Subject: [PATCH 3/6] [Security] Bump puma from 3.9.1 to 5.0.2 Bumps [puma](https://github.com/puma/puma) from 3.9.1 to 5.0.2. **This update includes security fixes.** - [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.9.1...v5.0.2) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 481205696..a495d8d93 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -266,6 +266,7 @@ GEM ngannotate-rails (1.2.2) execjs rails (>= 3.1) + nio4r (2.5.4) nokogiri (1.10.9) mini_portile2 (~> 2.4.0) oauth2 (1.4.0) @@ -302,7 +303,8 @@ GEM polyamorous (1.3.1) activerecord (>= 3.0) public_suffix (2.0.5) - puma (3.9.1) + puma (5.0.2) + nio4r (~> 2.0) pundit (1.1.0) activesupport (>= 3.0.0) pygments.rb (1.1.2) From 4d719494e0ce96cc83d94572e5e0aa68e56bf35a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 21 Oct 2020 04:18:23 +0000 Subject: [PATCH 4/6] Bump octokit from 4.7.0 to 4.19.0 Bumps [octokit](https://github.com/octokit/octokit.rb) from 4.7.0 to 4.19.0. - [Release notes](https://github.com/octokit/octokit.rb/releases) - [Changelog](https://github.com/octokit/octokit.rb/blob/4-stable/RELEASE.md) - [Commits](https://github.com/octokit/octokit.rb/compare/v4.7.0...v4.19.0) Signed-off-by: dependabot-preview[bot] --- Gemfile | 2 +- Gemfile.lock | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index 7606f022c..7f64beaf0 100644 --- a/Gemfile +++ b/Gemfile @@ -67,7 +67,7 @@ gem 'rack-utf8_sanitizer' gem 'redis-semaphore' #github api -gem "octokit", "~> 4.0" +gem "octokit", "~> 4.19" gem 'faraday-http-cache' group :production do diff --git a/Gemfile.lock b/Gemfile.lock index a495d8d93..847031d6b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -78,8 +78,8 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.5.1) - public_suffix (~> 2.0, >= 2.0.2) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) angular-i18n (0.1.2) angular-rails-templates (1.0.2) railties (>= 4.2, < 6) @@ -149,7 +149,7 @@ GEM factory_girl_rails (4.8.0) factory_girl (~> 4.8.0) railties (>= 3.0.0) - faraday (0.12.1) + faraday (0.12.2) multipart-post (>= 1.2, < 3) faraday-http-cache (2.0.0) faraday (~> 0.8) @@ -258,7 +258,7 @@ GEM msgpack (1.1.0) multi_json (1.12.1) multi_xml (0.6.0) - multipart-post (2.0.0) + multipart-post (2.1.1) nest (1.1.2) redis netrc (0.11.0) @@ -275,7 +275,8 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - octokit (4.7.0) + octokit (4.19.0) + faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) ohm (1.3.2) nest (~> 1.0) @@ -302,7 +303,7 @@ GEM pg (0.21.0) polyamorous (1.3.1) activerecord (>= 3.0) - public_suffix (2.0.5) + public_suffix (4.0.6) puma (5.0.2) nio4r (~> 2.0) pundit (1.1.0) @@ -426,9 +427,9 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sawyer (0.8.1) - addressable (>= 2.3.5, < 2.6) - faraday (~> 0.8, < 1.0) + sawyer (0.8.2) + addressable (>= 2.3.5) + faraday (> 0.8, < 2.0) schema_auto_foreign_keys (0.1.3) its-it (~> 1.2) schema_plus_foreign_keys (~> 0.1) @@ -614,7 +615,7 @@ DEPENDENCIES mock_redis ng-rails-csrf ngannotate-rails - octokit (~> 4.0) + octokit (~> 4.19) ohm (~> 1.3.2) ohm-expire (~> 0.1.3) omniauth-github From 9a025801de066866907eaaec4b48e0c4ff3f5d55 Mon Sep 17 00:00:00 2001 From: Alexander Stefanov Date: Sat, 31 Oct 2020 16:17:29 +0300 Subject: [PATCH 5/6] =?UTF-8?q?=D0=BA=D1=80=D0=B0=D1=82=D0=BA=D0=BE=D1=81?= =?UTF-8?q?=D1=82=D1=8C=20=D1=81=D0=B5=D1=81=D1=82=D1=80=D0=B0=20=D1=82?= =?UTF-8?q?=D0=B0=D0=BB=D0=B0=D0=BD=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/locales/models/statistics.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/models/statistics.en.yml b/config/locales/models/statistics.en.yml index 5f38fcb49..4e1ecf55d 100644 --- a/config/locales/models/statistics.en.yml +++ b/config/locales/models/statistics.en.yml @@ -19,7 +19,7 @@ en: build_started_title: "Build started" success_title: "Build complete" build_error_title: "Build error" - build_published_title: "Build has been published" + build_published_title: "Published" total_build_started: "Total build started" total_success: "Total build complete" @@ -64,4 +64,4 @@ en: last_90_days: "the last 90 days" last_180_days: "the last 6 months" last_year: "the last year" - custom: "custom" \ No newline at end of file + custom: "custom" From 9b275c61b0c96bacf3170c70afb926c7205e6a78 Mon Sep 17 00:00:00 2001 From: Alexander Stefanov Date: Sat, 31 Oct 2020 16:27:00 +0300 Subject: [PATCH 6/6] =?UTF-8?q?=D0=BA=D1=80=D0=B0=D1=82=D0=BA=D0=BE=D1=81?= =?UTF-8?q?=D1=82=D1=8C=20=D1=81=D0=B5=D1=81=D1=82=D1=80=D0=B0=20=D1=82?= =?UTF-8?q?=D0=B0=D0=BB=D0=B0=D0=BD=D1=82=D0=B0=20#2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/locales/models/build_list.en.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/locales/models/build_list.en.yml b/config/locales/models/build_list.en.yml index 4a5bcd5b1..8e6ae0f92 100644 --- a/config/locales/models/build_list.en.yml +++ b/config/locales/models/build_list.en.yml @@ -166,10 +166,10 @@ en: rerun_tests: Rerun tests rerunning_tests: Build is being rerun tests build_error: Build error - build_published: Build has been published + build_published: Published tests_failed: Tests failed rejected_publish: Publishing rejected - build_publish: Build is being published + build_publish: Publishing failed_publish: Publishing error dependencies_fail: Dependences not found packages_fail: Packages not found @@ -180,8 +180,8 @@ en: success: Build complete build_started: Build started platform_pending: Platform pending - build_published_into_testing: '[testing] Build has been published' - build_publish_into_testing: '[testing] Build is being published' + build_published_into_testing: '[testing] Published' + build_publish_into_testing: '[testing] Publishing' failed_publish_into_testing: '[testing] Publishing error' unpermitted_arch: Unpermitted architecture