Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:OpenMandrivaSoftware/rosa-build into master

This commit is contained in:
Wedge 2020-11-15 03:07:21 +03:00
parent 1a8691ad2f 8c630a1176
commit 5ec4f1ec00
4 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -67,7 +67,7 @@ gem 'rack-utf8_sanitizer'
gem 'redis-semaphore' gem 'redis-semaphore'
#github api #github api
gem "octokit", "~> 4.0" gem "octokit", "~> 4.19"
gem 'faraday-http-cache' gem 'faraday-http-cache'
group :production do group :production do

35
Gemfile.lock
View File

@ -78,8 +78,8 @@ GEM
minitest (~> 5.1) minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4) thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1) tzinfo (~> 1.1)
addressable (2.5.1) addressable (2.7.0)
public_suffix (~> 2.0, >= 2.0.2) public_suffix (>= 2.0.2, < 5.0)
angular-i18n (0.1.2) angular-i18n (0.1.2)
angular-rails-templates (1.0.2) angular-rails-templates (1.0.2)
railties (>= 4.2, < 6) railties (>= 4.2, < 6)
@ -149,7 +149,7 @@ GEM
factory_girl_rails (4.8.0) factory_girl_rails (4.8.0)
factory_girl (~> 4.8.0) factory_girl (~> 4.8.0)
railties (>= 3.0.0) railties (>= 3.0.0)
faraday (0.12.1) faraday (0.12.2)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
faraday-http-cache (2.0.0) faraday-http-cache (2.0.0)
faraday (~> 0.8) faraday (~> 0.8)
@ -258,7 +258,7 @@ GEM
msgpack (1.1.0) msgpack (1.1.0)
multi_json (1.12.1) multi_json (1.12.1)
multi_xml (0.6.0) multi_xml (0.6.0)
multipart-post (2.0.0) multipart-post (2.1.1)
nest (1.1.2) nest (1.1.2)
redis redis
netrc (0.11.0) netrc (0.11.0)
@ -266,6 +266,7 @@ GEM
ngannotate-rails (1.2.2) ngannotate-rails (1.2.2)
execjs execjs
rails (>= 3.1) rails (>= 3.1)
nio4r (2.5.4)
nokogiri (1.10.9) nokogiri (1.10.9)
mini_portile2 (~> 2.4.0) mini_portile2 (~> 2.4.0)
oauth2 (1.4.0) oauth2 (1.4.0)
@ -274,7 +275,8 @@ GEM
multi_json (~> 1.3) multi_json (~> 1.3)
multi_xml (~> 0.5) multi_xml (~> 0.5)
rack (>= 1.2, < 3) rack (>= 1.2, < 3)
octokit (4.7.0) octokit (4.19.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3) sawyer (~> 0.8.0, >= 0.5.3)
ohm (1.3.2) ohm (1.3.2)
nest (~> 1.0) nest (~> 1.0)
@ -301,8 +303,9 @@ GEM
pg (0.21.0) pg (0.21.0)
polyamorous (1.3.1) polyamorous (1.3.1)
activerecord (>= 3.0) activerecord (>= 3.0)
public_suffix (2.0.5) public_suffix (4.0.6)
puma (3.9.1) puma (5.0.2)
nio4r (~> 2.0)
pundit (1.1.0) pundit (1.1.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
pygments.rb (1.1.2) pygments.rb (1.1.2)
@ -347,7 +350,7 @@ GEM
activesupport (= 4.2.11.1) activesupport (= 4.2.11.1)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rake (12.3.2) rake (13.0.1)
ransack (1.8.3) ransack (1.8.3)
actionpack (>= 3.0) actionpack (>= 3.0)
activerecord (>= 3.0) activerecord (>= 3.0)
@ -424,9 +427,9 @@ GEM
sprockets (>= 2.8, < 4.0) sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0) sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3) tilt (>= 1.1, < 3)
sawyer (0.8.1) sawyer (0.8.2)
addressable (>= 2.3.5, < 2.6) addressable (>= 2.3.5)
faraday (~> 0.8, < 1.0) faraday (> 0.8, < 2.0)
schema_auto_foreign_keys (0.1.3) schema_auto_foreign_keys (0.1.3)
its-it (~> 1.2) its-it (~> 1.2)
schema_plus_foreign_keys (~> 0.1) schema_plus_foreign_keys (~> 0.1)
@ -539,11 +542,11 @@ GEM
sprockets (>= 3.0.0) sprockets (>= 3.0.0)
sqlite3 (1.3.13) sqlite3 (1.3.13)
state_machines (0.5.0) state_machines (0.5.0)
state_machines-activemodel (0.5.0) state_machines-activemodel (0.6.0)
activemodel (>= 4.1, < 5.2) activemodel (>= 4.1, < 6.0)
state_machines (>= 0.5.0) state_machines (>= 0.5.0)
state_machines-activerecord (0.5.0) state_machines-activerecord (0.6.0)
activerecord (>= 4.1, < 5.2) activerecord (>= 4.1)
state_machines-activemodel (>= 0.5.0) state_machines-activemodel (>= 0.5.0)
state_machines-graphviz (0.0.2) state_machines-graphviz (0.0.2)
ruby-graphviz ruby-graphviz
@ -612,7 +615,7 @@ DEPENDENCIES
mock_redis mock_redis
ng-rails-csrf ng-rails-csrf
ngannotate-rails ngannotate-rails
octokit (~> 4.0) octokit (~> 4.19)
ohm (~> 1.3.2) ohm (~> 1.3.2)
ohm-expire (~> 0.1.3) ohm-expire (~> 0.1.3)
omniauth-github omniauth-github

8
config/locales/models/build_list.en.yml
View File

@ -166,10 +166,10 @@ en:
rerun_tests: Rerun tests rerun_tests: Rerun tests
rerunning_tests: Build is being rerun tests rerunning_tests: Build is being rerun tests
build_error: Build error build_error: Build error
build_published: Build has been published build_published: Published
tests_failed: Tests failed tests_failed: Tests failed
rejected_publish: Publishing rejected rejected_publish: Publishing rejected
build_publish: Build is being published build_publish: Publishing
failed_publish: Publishing error failed_publish: Publishing error
dependencies_fail: Dependences not found dependencies_fail: Dependences not found
packages_fail: Packages not found packages_fail: Packages not found
@ -180,8 +180,8 @@ en:
success: Build complete success: Build complete
build_started: Build started build_started: Build started
platform_pending: Platform pending platform_pending: Platform pending
build_published_into_testing: '[testing] Build has been published' build_published_into_testing: '[testing] Published'
build_publish_into_testing: '[testing] Build is being published' build_publish_into_testing: '[testing] Publishing'
failed_publish_into_testing: '[testing] Publishing error' failed_publish_into_testing: '[testing] Publishing error'
unpermitted_arch: Unpermitted architecture unpermitted_arch: Unpermitted architecture

4
config/locales/models/statistics.en.yml
View File

@ -19,7 +19,7 @@ en:
build_started_title: "Build started" build_started_title: "Build started"
success_title: "Build complete" success_title: "Build complete"
build_error_title: "Build error" build_error_title: "Build error"
build_published_title: "Build has been published" build_published_title: "Published"
total_build_started: "Total build started" total_build_started: "Total build started"
total_success: "Total build complete" total_success: "Total build complete"
@ -64,4 +64,4 @@ en:
last_90_days: "the last 90 days" last_90_days: "the last 90 days"
last_180_days: "the last 6 months" last_180_days: "the last 6 months"
last_year: "the last year" last_year: "the last year"
custom: "custom" custom: "custom"