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 481205696..9cfe517bf 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) @@ -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) @@ -274,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) @@ -301,8 +303,9 @@ GEM pg (0.21.0) polyamorous (1.3.1) activerecord (>= 3.0) - public_suffix (2.0.5) - puma (3.9.1) + public_suffix (4.0.6) + puma (5.0.2) + nio4r (~> 2.0) pundit (1.1.0) activesupport (>= 3.0.0) pygments.rb (1.1.2) @@ -347,7 +350,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) @@ -424,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) @@ -539,11 +542,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 @@ -612,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 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 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"