diff --git a/2.10.15.tar.gz b/2.10.17.tar.gz similarity index 37% rename from 2.10.15.tar.gz rename to 2.10.17.tar.gz index 74eef39f9c72a815b0fb9e6919aac30f0ee3d813..df2f83e2f749d95fd3b32ced71556284d86a33cd 100644 Binary files a/2.10.15.tar.gz and b/2.10.17.tar.gz differ diff --git a/Gemfile.lock.aarch64 b/Gemfile.lock.aarch64 index 2beb63e822d00cb833c6f879c2afc8f87bac7ab9..7cd3f774a6ead861ed69f0d7264666a39e0c6201 100644 --- a/Gemfile.lock.aarch64 +++ b/Gemfile.lock.aarch64 @@ -1,76 +1,98 @@ GEM remote: https://anonymous:devcloud@mirrors.huaweicloud.com/repository/rubygems/ specs: - actioncable (5.2.7.1) - actionpack (= 5.2.7.1) + actioncable (6.1.5.1) + actionpack (= 6.1.5.1) + activesupport (= 6.1.5.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.7.1) - actionpack (= 5.2.7.1) - actionview (= 5.2.7.1) - activejob (= 5.2.7.1) + actionmailbox (6.1.5.1) + actionpack (= 6.1.5.1) + activejob (= 6.1.5.1) + activerecord (= 6.1.5.1) + activestorage (= 6.1.5.1) + activesupport (= 6.1.5.1) + mail (>= 2.7.1) + actionmailer (6.1.5.1) + actionpack (= 6.1.5.1) + actionview (= 6.1.5.1) + activejob (= 6.1.5.1) + activesupport (= 6.1.5.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.7.1) - actionview (= 5.2.7.1) - activesupport (= 5.2.7.1) - rack (~> 2.0, >= 2.0.8) + actionpack (6.1.5.1) + actionview (= 6.1.5.1) + activesupport (= 6.1.5.1) + rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.7.1) - activesupport (= 5.2.7.1) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (6.1.5.1) + actionpack (= 6.1.5.1) + activerecord (= 6.1.5.1) + activestorage (= 6.1.5.1) + activesupport (= 6.1.5.1) + nokogiri (>= 1.8.5) + actionview (6.1.5.1) + activesupport (= 6.1.5.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.7.1) - activesupport (= 5.2.7.1) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.1.5.1) + activesupport (= 6.1.5.1) globalid (>= 0.3.6) - activemodel (5.2.7.1) - activesupport (= 5.2.7.1) + activemodel (6.1.5.1) + activesupport (= 6.1.5.1) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (5.2.7.1) - activemodel (= 5.2.7.1) - activesupport (= 5.2.7.1) - arel (>= 9.0) - activestorage (5.2.7.1) - actionpack (= 5.2.7.1) - activerecord (= 5.2.7.1) - marcel (~> 1.0.0) - activesupport (5.2.7.1) + activerecord (6.1.5.1) + activemodel (= 6.1.5.1) + activesupport (= 6.1.5.1) + activestorage (6.1.5.1) + actionpack (= 6.1.5.1) + activejob (= 6.1.5.1) + activerecord (= 6.1.5.1) + activesupport (= 6.1.5.1) + marcel (~> 1.0) + mini_mime (>= 1.1.0) + activesupport (6.1.5.1) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) acts_as_list (1.0.4) activerecord (>= 4.2) acts_as_tree (2.9.1) activerecord (>= 3.0.0) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) - airbrake (13.0.0) - airbrake-ruby (~> 6.0) - airbrake-ruby (6.0.2) + airbrake (9.4.3) + airbrake-ruby (~> 4.6) + airbrake-ruby (4.6.0) rbtree3 (~> 0.5) ajax-datatables-rails (1.3.1) zeitwerk amq-protocol (2.3.2) + annotate (3.2.0) + activerecord (>= 3.2, < 8.0) + rake (>= 10.4, < 14.0) ansi (1.5.0) - arel (9.0.0) ast (2.4.2) - autoprefixer-rails (10.4.2.0) + autoprefixer-rails (10.4.7.0) execjs (~> 2) - bcrypt (3.1.17) - bootstrap (5.1.3) + awesome_print (1.9.2) + bcrypt (3.1.18) + bigdecimal (3.1.2) + bootstrap (4.6.1) autoprefixer-rails (>= 9.1.0) - popper_js (>= 2.9.3, < 3) + popper_js (>= 1.14.3, < 2) sassc-rails (>= 2.0.0) builder (3.2.4) - bullet (7.0.1) + bullet (7.0.2) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) bunny (2.19.0) @@ -79,7 +101,7 @@ GEM bunny-mock (1.7.0) bunny (>= 1.7) byebug (11.1.3) - capybara (3.36.0) + capybara (3.37.1) addressable matrix mini_mime (>= 0.1.3) @@ -92,79 +114,77 @@ GEM capybara (>= 2) minitest (>= 4) childprocess (4.1.0) - chunky_png (1.4.0) clockwork (3.0.0) activesupport tzinfo cocoon (1.2.15) codecov (0.6.0) simplecov (>= 0.15, < 0.22) - codemirror-rails (5.16.0) - railties (>= 3.0, < 6.0) coderay (1.1.3) - coffee-rails (5.0.0) - coffee-script (>= 2.2.0) - railties (>= 5.2.0) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.12.2) colorize (0.8.1) - concurrent-ruby (1.1.9) - concurrent-ruby-ext (1.1.9) - concurrent-ruby (= 1.1.9) - coveralls (0.7.1) - multi_json (~> 1.3) - rest-client - simplecov (>= 0.7) - term-ansicolor - thor + concurrent-ruby (1.1.10) + coveralls (0.8.23) + json (>= 1.8, < 3) + simplecov (~> 0.16.1) + term-ansicolor (~> 1.3) + thor (>= 0.19.4, < 2.0) + tins (~> 1.6) crack (0.4.5) rexml crass (1.0.6) - cssmin (1.0.3) daemons (1.4.1) - dalli (3.2.1) + dalli (3.2.2) data_migrate (8.0.0) activerecord (>= 5.0) railties (>= 5.0) - database_cleaner (2.0.1) - database_cleaner-active_record (~> 2.0.0) database_cleaner-active_record (2.0.1) activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) - deep_cloneable (2.4.0) - activerecord (>= 3.1.0, < 6) + deep_cloneable (3.2.0) + activerecord (>= 3.1.0, < 8) delayed_job (4.1.10) activesupport (>= 3.0, < 8.0) delayed_job_active_record (4.1.7) activerecord (>= 3.0, < 8.0) delayed_job (>= 3.0, < 5) diff-lcs (1.5.0) + digest (3.1.0) docile (1.4.0) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) + down (5.3.1) + addressable (~> 2.8) erubi (1.10.0) erubis (2.7.0) - escape_utils (1.2.1) execjs (2.8.1) - experimental-influxdb-rails (1.0.0.beta5) - influxdb (~> 0.6, >= 0.6.4) - railties (>= 4.2) - factory_bot (6.2.1) + factory_bot (6.2.0) activesupport (>= 5.0.0) factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - faker (2.20.0) + faker (2.21.0) i18n (>= 1.8.11, < 2) - feature (1.4.0) + faraday (2.3.0) + faraday-net_http (~> 2.0) + ruby2_keywords (>= 0.0.4) + faraday-net_http (2.0.3) ffi (1.15.5) + flipper (0.25.0) + flipper-active_record (0.25.0) + activerecord (>= 4.2, < 8) + flipper (~> 0.25.0) + flipper-ui (0.25.0) + erubi (>= 1.0.0, < 2.0.0) + flipper (~> 0.25.0) + rack (>= 1.4, < 3) + rack-protection (>= 1.5.3, <= 2.2.0) + sanitize (< 7) flot-rails (0.0.7) jquery-rails - font-awesome-sass (6.1.0) - sassc (>= 2.0) + font-awesome-sass (6.1.1) + sassc (~> 2.0) + gitlab (4.18.0) + httparty (~> 0.18) + terminal-table (>= 1.5.1) globalid (1.0.0) activesupport (>= 5.0) gssapi (1.3.1) @@ -190,22 +210,26 @@ GEM haml (>= 4.0, < 6) nokogiri (>= 1.6.0) ruby_parser (~> 3.5) - http-accept (1.7.0) - http-cookie (1.0.4) - domain_name (~> 0.5) + httparty (0.20.0) + mime-types (~> 3.0) + multi_xml (>= 0.5.2) i18n (1.10.0) concurrent-ruby (~> 1.0) influxdb (0.8.1) + influxdb-rails (1.0.3) + influxdb (~> 0.6, >= 0.6.4) + railties (>= 5.0) innertube (1.1.0) - joiner (0.4.2) - activerecord (>= 5.2.beta1) + joiner (0.6.0) + activerecord (>= 6.1.0) jquery-datatables (1.10.20) - jquery-rails (4.4.0) + jquery-rails (4.5.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) jquery-ui-rails (4.2.1) railties (>= 3.2.16) + json (2.6.2) kaminari (1.2.2) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.2) @@ -220,12 +244,12 @@ GEM kaminari-core (1.2.2) launchy (2.5.0) addressable (~> 2.7) - lograge (0.11.2) + lograge (0.12.0) actionpack (>= 4) activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.15.0) + loofah (2.18.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -236,9 +260,10 @@ GEM middleware (0.1.0) mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2022.0105) + mime-types-data (3.2021.1115) mini_mime (1.1.2) - minitest (5.15.0) + mini_portile2 (2.8.0) + minitest (5.16.2) minitest-ci (3.4.0) minitest (>= 5.0.6) minitest-fail-fast (0.1.0) @@ -248,35 +273,37 @@ GEM builder minitest (>= 5.0) ruby-progressbar - mocha (1.13.0) - momentjs-rails (2.29.1.1) - railties (>= 3.1) - mousetrap-rails (1.4.6) - multi_json (1.15.0) - mysql2 (0.5.3) - netrc (0.11.0) + mocha (1.14.0) + multi_xml (0.6.0) + mysql2 (0.5.4) + net-imap (0.2.3) + digest + net-protocol + strscan + net-pop (0.1.1) + digest + net-protocol + timeout + net-protocol (0.1.3) + timeout + net-smtp (0.3.1) + digest + net-protocol + timeout + next_rails (1.1.0) + colorize (>= 0.8.1) nio4r (2.5.8) - nokogiri (1.13.4-aarch64-linux) + nokogiri (1.13.6) + mini_portile2 (~> 2.8.0) racc (~> 1.4) - parallel (1.21.0) - parser (3.1.1.0) + octokit (4.25.1) + faraday (>= 1, < 3) + sawyer (~> 0.9) + parallel (1.22.1) + parser (3.1.2.0) ast (~> 2.4.1) - peek (1.1.0) - railties (>= 4.0.0) - peek-dalli (1.2.0) - concurrent-ruby - concurrent-ruby-ext - dalli - peek - peek-host (1.0.0) - peek - peek-mysql2 (1.2.0) - concurrent-ruby - concurrent-ruby-ext - mysql2 - peek pkg-config (1.4.7) - popper_js (2.9.3) + popper_js (1.16.0) power_assert (2.0.1) pry (0.13.1) coderay (~> 1.1) @@ -284,29 +311,33 @@ GEM pry-byebug (3.9.0) byebug (~> 11.0) pry (~> 0.13.0) - psych (4.0.3) - stringio - public_suffix (4.0.6) - puma (4.3.11) + pry-rails (0.3.9) + pry (>= 0.10.4) + public_suffix (4.0.7) + puma (5.6.4) nio4r (~> 2.0) pundit (2.2.0) activesupport (>= 3.0.0) racc (1.6.0) - rack (2.2.3) - rack-test (1.1.0) - rack (>= 1.0, < 3) - rails (5.2.7.1) - actioncable (= 5.2.7.1) - actionmailer (= 5.2.7.1) - actionpack (= 5.2.7.1) - actionview (= 5.2.7.1) - activejob (= 5.2.7.1) - activemodel (= 5.2.7.1) - activerecord (= 5.2.7.1) - activestorage (= 5.2.7.1) - activesupport (= 5.2.7.1) - bundler (>= 1.3.0) - railties (= 5.2.7.1) + rack (2.2.4) + rack-protection (2.2.0) + rack + rack-test (2.0.2) + rack (>= 1.3) + rails (6.1.5.1) + actioncable (= 6.1.5.1) + actionmailbox (= 6.1.5.1) + actionmailer (= 6.1.5.1) + actionpack (= 6.1.5.1) + actiontext (= 6.1.5.1) + actionview (= 6.1.5.1) + activejob (= 6.1.5.1) + activemodel (= 6.1.5.1) + activerecord (= 6.1.5.1) + activestorage (= 6.1.5.1) + activesupport (= 6.1.5.1) + bundler (>= 1.15.0) + railties (= 6.1.5.1) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -315,38 +346,24 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.2) + rails-html-sanitizer (1.4.3) loofah (~> 2.3) - rails-timeago (2.20.0) - actionpack (>= 5.2) - activesupport (>= 5.2) - rails_tokeninput (1.7.0) - railties (>= 3.1.0) - railties (5.2.7.1) - actionpack (= 5.2.7.1) - activesupport (= 5.2.7.1) + railties (6.1.5.1) + actionpack (= 6.1.5.1) + activesupport (= 6.1.5.1) method_source - rake (>= 0.8.7) - thor (>= 0.19.0, < 2.0) + rake (>= 12.2) + thor (~> 1.0) rainbow (3.1.1) rake (13.0.6) rantly (2.0.0) rbtree (0.4.5) rbtree3 (0.7.0) - rdoc (6.4.0) - psych (>= 4.0.0) + rdoc (6.3.3) redcarpet (3.5.1) - regexp_parser (2.2.1) + regexp_parser (2.5.0) request_store (1.5.1) rack (>= 1.4) - responders (3.0.1) - actionpack (>= 5.0) - railties (>= 5.0) - rest-client (2.1.0) - http-accept (>= 1.7.0, < 2.0) - http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 4.0) - netrc (~> 0.8) rexml (3.2.5) riddle (2.4.3) rspec (3.11.0) @@ -358,10 +375,10 @@ GEM rspec-expectations (3.11.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.11.0) - rspec-mocks (3.11.0) + rspec-mocks (3.11.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.11.0) - rspec-rails (5.1.1) + rspec-rails (5.1.2) actionpack (>= 5.2) activesupport (>= 5.2) railties (>= 5.2) @@ -372,29 +389,31 @@ GEM rspec-support (3.11.0) rspec_junit_formatter (0.5.1) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.26.0) + rubocop (1.31.1) + json (~> 2.3) parallel (~> 1.10) parser (>= 3.1.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) - rexml - rubocop-ast (>= 1.16.0, < 2.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.18.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.16.0) + rubocop-ast (1.18.0) parser (>= 3.1.1.0) - rubocop-performance (1.13.3) + rubocop-performance (1.14.2) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.14.2) + rubocop-rails (2.15.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.7.0, < 2.0) - rubocop-rspec (2.9.0) - rubocop (~> 1.19) + rubocop-rspec (2.12.1) + rubocop (~> 1.31) ruby-ldap (0.9.20) ruby-progressbar (1.11.0) - ruby_parser (3.18.1) + ruby2_keywords (0.0.5) + ruby_parser (3.19.1) sexp_processor (~> 4.16) rubyzip (2.3.2) sanitize (6.0.0) @@ -408,39 +427,45 @@ GEM sprockets (> 3.0) sprockets-rails tilt - selenium-webdriver (4.1.0) + sawyer (0.9.2) + addressable (>= 2.3.5) + faraday (>= 0.17.3, < 3) + selenium-webdriver (4.3.0) childprocess (>= 0.5, < 5.0) rexml (~> 3.2, >= 3.2.5) - rubyzip (>= 1.2.2) + rubyzip (>= 1.2.2, < 3.0) + websocket (~> 1.0) set (1.0.2) - sexp_processor (4.16.0) - shoulda-matchers (4.5.1) - activesupport (>= 4.2.0) - simplecov (0.21.2) + sexp_processor (4.16.1) + shoulda-matchers (5.1.0) + activesupport (>= 5.2.0) + simplecov (0.16.1) docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-html (0.12.3) - simplecov_json_formatter (0.1.4) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) single_test (0.6.0) rake sorted_set (1.0.3) rbtree set (~> 1.0) - sprite-factory (1.7.1) - sprockets (4.0.3) + sprockets (4.1.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.4.2) actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - stringio (3.0.1) + strong_migrations (1.2.0) + activerecord (>= 5.2) + strscan (3.0.1) sync (0.5.0) sysexits (1.2.0) temple (0.8.2) term-ansicolor (1.7.1) tins (~> 1.0) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) test-unit (3.5.3) power_assert thinking-sphinx (5.4.0) @@ -451,21 +476,21 @@ GEM middleware (>= 0.1.0) riddle (~> 2.3) thor (1.2.1) - thread_safe (0.3.6) tilt (2.0.10) timecop (0.9.5) - tins (1.31.0) + timeout (0.3.0) + tins (1.31.1) sync - tzinfo (1.2.9) - thread_safe (~> 0.1) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unf (0.1.4) - unf_ext - unf_ext (0.0.8.1) - unicode-display_width (2.1.0) - uniform_notifier (1.14.2) + unicode-display_width (2.2.0) + uniform_notifier (1.16.0) vcr (6.1.0) + view_component (2.57.1) + activesupport (>= 5.0.0, < 8.0) + method_source (~> 1.0) voight_kampff (1.1.4) rack (>= 1.4, < 3.0) webmock (3.14.0) @@ -473,6 +498,7 @@ GEM crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) webrick (1.7.0) + websocket (1.2.9) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -482,11 +508,11 @@ GEM webrick xpath (3.2.0) nokogiri (~> 1.8) - yajl-ruby (1.4.2) - zeitwerk (2.5.4) + yajl-ruby (1.4.3) + zeitwerk (2.6.0) PLATFORMS - aarch64-linux + ruby DEPENDENCIES activemodel-serializers-xml @@ -496,7 +522,10 @@ DEPENDENCIES airbrake airbrake-ruby ajax-datatables-rails + annotate + awesome_print bcrypt + bigdecimal bootstrap builder bullet @@ -504,63 +533,61 @@ DEPENDENCIES bunny-mock capybara capybara_minitest_spec - chunky_png - clockwork (>= 0.7) + clockwork cocoon codecov - codemirror-rails - coffee-rails - colorize + coderay coveralls - cssmin (>= 1.0.2) daemons dalli data_migrate - database_cleaner (>= 1.0.1) - deep_cloneable (~> 2.4.0) - delayed_job_active_record (>= 4.0.0) - escape_utils - experimental-influxdb-rails (>= 1.0.0.beta5) + database_cleaner-active_record + deep_cloneable + delayed_job_active_record + down factory_bot_rails faker - feature + flipper + flipper-active_record + flipper-ui flot-rails font-awesome-sass + gitlab gssapi haml haml-rails haml_lint + influxdb-rails jquery-datatables jquery-rails jquery-ui-rails (~> 4.2.1) kaminari launchy lograge + matrix (~> 0.4) minitest minitest-ci minitest-fail-fast minitest-reporters - mocha (> 0.13.0) - momentjs-rails - mousetrap-rails + mocha mysql2 + net-imap + net-pop + net-smtp + next_rails nokogiri - peek - peek-dalli - peek-host - peek-mysql2 - pry (>= 0.9.12) + octokit + pry pry-byebug - puma (~> 4.0) + pry-rails + puma pundit - rails (~> 5.2) + rails (~> 6.1) rails-controller-testing - rails-timeago (~> 2.0) - rails_tokeninput (>= 1.6.1.rc1) rantly rdoc redcarpet - responders (~> 3.0) + rexml rspec rspec-rails rspec_junit_formatter @@ -569,24 +596,24 @@ DEPENDENCIES rubocop-rails rubocop-rspec ruby-ldap - sanitize sassc-rails selenium-webdriver - shoulda-matchers (~> 4.0) + shoulda-matchers simplecov single_test - sprite-factory (>= 1.5.2) + strong_migrations + strscan (= 3.0.1) test-unit - thinking-sphinx (> 3.1) - tilt (>= 1.4.1) + thinking-sphinx timecop - uglifier (>= 1.2.2) + uglifier vcr + view_component voight_kampff - webmock (>= 2.3.0) - xmlhash (>= 1.3.6) + webmock + xmlhash xmlrpc yajl-ruby BUNDLED WITH - 2.2.33 + 2.3.3 diff --git a/Gemfile.lock.x86 b/Gemfile.lock.x86 index 4e2ff889657a26ec34ed81419de8c8382c854782..7cd3f774a6ead861ed69f0d7264666a39e0c6201 100644 --- a/Gemfile.lock.x86 +++ b/Gemfile.lock.x86 @@ -1,76 +1,98 @@ GEM remote: https://anonymous:devcloud@mirrors.huaweicloud.com/repository/rubygems/ specs: - actioncable (5.2.7.1) - actionpack (= 5.2.7.1) + actioncable (6.1.5.1) + actionpack (= 6.1.5.1) + activesupport (= 6.1.5.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.7.1) - actionpack (= 5.2.7.1) - actionview (= 5.2.7.1) - activejob (= 5.2.7.1) + actionmailbox (6.1.5.1) + actionpack (= 6.1.5.1) + activejob (= 6.1.5.1) + activerecord (= 6.1.5.1) + activestorage (= 6.1.5.1) + activesupport (= 6.1.5.1) + mail (>= 2.7.1) + actionmailer (6.1.5.1) + actionpack (= 6.1.5.1) + actionview (= 6.1.5.1) + activejob (= 6.1.5.1) + activesupport (= 6.1.5.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.7.1) - actionview (= 5.2.7.1) - activesupport (= 5.2.7.1) - rack (~> 2.0, >= 2.0.8) + actionpack (6.1.5.1) + actionview (= 6.1.5.1) + activesupport (= 6.1.5.1) + rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.7.1) - activesupport (= 5.2.7.1) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (6.1.5.1) + actionpack (= 6.1.5.1) + activerecord (= 6.1.5.1) + activestorage (= 6.1.5.1) + activesupport (= 6.1.5.1) + nokogiri (>= 1.8.5) + actionview (6.1.5.1) + activesupport (= 6.1.5.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.7.1) - activesupport (= 5.2.7.1) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.1.5.1) + activesupport (= 6.1.5.1) globalid (>= 0.3.6) - activemodel (5.2.7.1) - activesupport (= 5.2.7.1) + activemodel (6.1.5.1) + activesupport (= 6.1.5.1) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (5.2.7.1) - activemodel (= 5.2.7.1) - activesupport (= 5.2.7.1) - arel (>= 9.0) - activestorage (5.2.7.1) - actionpack (= 5.2.7.1) - activerecord (= 5.2.7.1) - marcel (~> 1.0.0) - activesupport (5.2.7.1) + activerecord (6.1.5.1) + activemodel (= 6.1.5.1) + activesupport (= 6.1.5.1) + activestorage (6.1.5.1) + actionpack (= 6.1.5.1) + activejob (= 6.1.5.1) + activerecord (= 6.1.5.1) + activesupport (= 6.1.5.1) + marcel (~> 1.0) + mini_mime (>= 1.1.0) + activesupport (6.1.5.1) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) acts_as_list (1.0.4) activerecord (>= 4.2) acts_as_tree (2.9.1) activerecord (>= 3.0.0) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) - airbrake (13.0.0) - airbrake-ruby (~> 6.0) - airbrake-ruby (6.0.2) + airbrake (9.4.3) + airbrake-ruby (~> 4.6) + airbrake-ruby (4.6.0) rbtree3 (~> 0.5) ajax-datatables-rails (1.3.1) zeitwerk amq-protocol (2.3.2) + annotate (3.2.0) + activerecord (>= 3.2, < 8.0) + rake (>= 10.4, < 14.0) ansi (1.5.0) - arel (9.0.0) ast (2.4.2) - autoprefixer-rails (10.4.2.0) + autoprefixer-rails (10.4.7.0) execjs (~> 2) - bcrypt (3.1.17) - bootstrap (5.1.3) + awesome_print (1.9.2) + bcrypt (3.1.18) + bigdecimal (3.1.2) + bootstrap (4.6.1) autoprefixer-rails (>= 9.1.0) - popper_js (>= 2.9.3, < 3) + popper_js (>= 1.14.3, < 2) sassc-rails (>= 2.0.0) builder (3.2.4) - bullet (7.0.1) + bullet (7.0.2) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) bunny (2.19.0) @@ -79,7 +101,7 @@ GEM bunny-mock (1.7.0) bunny (>= 1.7) byebug (11.1.3) - capybara (3.36.0) + capybara (3.37.1) addressable matrix mini_mime (>= 0.1.3) @@ -92,79 +114,77 @@ GEM capybara (>= 2) minitest (>= 4) childprocess (4.1.0) - chunky_png (1.4.0) clockwork (3.0.0) activesupport tzinfo cocoon (1.2.15) codecov (0.6.0) simplecov (>= 0.15, < 0.22) - codemirror-rails (5.16.0) - railties (>= 3.0, < 6.0) coderay (1.1.3) - coffee-rails (5.0.0) - coffee-script (>= 2.2.0) - railties (>= 5.2.0) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.12.2) colorize (0.8.1) - concurrent-ruby (1.1.9) - concurrent-ruby-ext (1.1.9) - concurrent-ruby (= 1.1.9) - coveralls (0.7.1) - multi_json (~> 1.3) - rest-client - simplecov (>= 0.7) - term-ansicolor - thor + concurrent-ruby (1.1.10) + coveralls (0.8.23) + json (>= 1.8, < 3) + simplecov (~> 0.16.1) + term-ansicolor (~> 1.3) + thor (>= 0.19.4, < 2.0) + tins (~> 1.6) crack (0.4.5) rexml crass (1.0.6) - cssmin (1.0.3) daemons (1.4.1) - dalli (3.2.1) + dalli (3.2.2) data_migrate (8.0.0) activerecord (>= 5.0) railties (>= 5.0) - database_cleaner (2.0.1) - database_cleaner-active_record (~> 2.0.0) database_cleaner-active_record (2.0.1) activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) - deep_cloneable (2.4.0) - activerecord (>= 3.1.0, < 6) + deep_cloneable (3.2.0) + activerecord (>= 3.1.0, < 8) delayed_job (4.1.10) activesupport (>= 3.0, < 8.0) delayed_job_active_record (4.1.7) activerecord (>= 3.0, < 8.0) delayed_job (>= 3.0, < 5) diff-lcs (1.5.0) + digest (3.1.0) docile (1.4.0) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) + down (5.3.1) + addressable (~> 2.8) erubi (1.10.0) erubis (2.7.0) - escape_utils (1.2.1) execjs (2.8.1) - experimental-influxdb-rails (1.0.0.beta5) - influxdb (~> 0.6, >= 0.6.4) - railties (>= 4.2) - factory_bot (6.2.1) + factory_bot (6.2.0) activesupport (>= 5.0.0) factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - faker (2.20.0) + faker (2.21.0) i18n (>= 1.8.11, < 2) - feature (1.4.0) + faraday (2.3.0) + faraday-net_http (~> 2.0) + ruby2_keywords (>= 0.0.4) + faraday-net_http (2.0.3) ffi (1.15.5) + flipper (0.25.0) + flipper-active_record (0.25.0) + activerecord (>= 4.2, < 8) + flipper (~> 0.25.0) + flipper-ui (0.25.0) + erubi (>= 1.0.0, < 2.0.0) + flipper (~> 0.25.0) + rack (>= 1.4, < 3) + rack-protection (>= 1.5.3, <= 2.2.0) + sanitize (< 7) flot-rails (0.0.7) jquery-rails - font-awesome-sass (6.1.0) - sassc (>= 2.0) + font-awesome-sass (6.1.1) + sassc (~> 2.0) + gitlab (4.18.0) + httparty (~> 0.18) + terminal-table (>= 1.5.1) globalid (1.0.0) activesupport (>= 5.0) gssapi (1.3.1) @@ -190,22 +210,26 @@ GEM haml (>= 4.0, < 6) nokogiri (>= 1.6.0) ruby_parser (~> 3.5) - http-accept (1.7.0) - http-cookie (1.0.4) - domain_name (~> 0.5) + httparty (0.20.0) + mime-types (~> 3.0) + multi_xml (>= 0.5.2) i18n (1.10.0) concurrent-ruby (~> 1.0) influxdb (0.8.1) + influxdb-rails (1.0.3) + influxdb (~> 0.6, >= 0.6.4) + railties (>= 5.0) innertube (1.1.0) - joiner (0.4.2) - activerecord (>= 5.2.beta1) + joiner (0.6.0) + activerecord (>= 6.1.0) jquery-datatables (1.10.20) - jquery-rails (4.4.0) + jquery-rails (4.5.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) jquery-ui-rails (4.2.1) railties (>= 3.2.16) + json (2.6.2) kaminari (1.2.2) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.2) @@ -220,12 +244,12 @@ GEM kaminari-core (1.2.2) launchy (2.5.0) addressable (~> 2.7) - lograge (0.11.2) + lograge (0.12.0) actionpack (>= 4) activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.15.0) + loofah (2.18.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -236,9 +260,10 @@ GEM middleware (0.1.0) mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2022.0105) + mime-types-data (3.2021.1115) mini_mime (1.1.2) - minitest (5.15.0) + mini_portile2 (2.8.0) + minitest (5.16.2) minitest-ci (3.4.0) minitest (>= 5.0.6) minitest-fail-fast (0.1.0) @@ -248,35 +273,37 @@ GEM builder minitest (>= 5.0) ruby-progressbar - mocha (1.13.0) - momentjs-rails (2.29.1.1) - railties (>= 3.1) - mousetrap-rails (1.4.6) - multi_json (1.15.0) - mysql2 (0.5.3) - netrc (0.11.0) + mocha (1.14.0) + multi_xml (0.6.0) + mysql2 (0.5.4) + net-imap (0.2.3) + digest + net-protocol + strscan + net-pop (0.1.1) + digest + net-protocol + timeout + net-protocol (0.1.3) + timeout + net-smtp (0.3.1) + digest + net-protocol + timeout + next_rails (1.1.0) + colorize (>= 0.8.1) nio4r (2.5.8) - nokogiri (1.13.4-x86_64-linux) + nokogiri (1.13.6) + mini_portile2 (~> 2.8.0) racc (~> 1.4) - parallel (1.21.0) - parser (3.1.1.0) + octokit (4.25.1) + faraday (>= 1, < 3) + sawyer (~> 0.9) + parallel (1.22.1) + parser (3.1.2.0) ast (~> 2.4.1) - peek (1.1.0) - railties (>= 4.0.0) - peek-dalli (1.2.0) - concurrent-ruby - concurrent-ruby-ext - dalli - peek - peek-host (1.0.0) - peek - peek-mysql2 (1.2.0) - concurrent-ruby - concurrent-ruby-ext - mysql2 - peek pkg-config (1.4.7) - popper_js (2.9.3) + popper_js (1.16.0) power_assert (2.0.1) pry (0.13.1) coderay (~> 1.1) @@ -284,29 +311,33 @@ GEM pry-byebug (3.9.0) byebug (~> 11.0) pry (~> 0.13.0) - psych (4.0.3) - stringio - public_suffix (4.0.6) - puma (4.3.11) + pry-rails (0.3.9) + pry (>= 0.10.4) + public_suffix (4.0.7) + puma (5.6.4) nio4r (~> 2.0) pundit (2.2.0) activesupport (>= 3.0.0) racc (1.6.0) - rack (2.2.3) - rack-test (1.1.0) - rack (>= 1.0, < 3) - rails (5.2.7.1) - actioncable (= 5.2.7.1) - actionmailer (= 5.2.7.1) - actionpack (= 5.2.7.1) - actionview (= 5.2.7.1) - activejob (= 5.2.7.1) - activemodel (= 5.2.7.1) - activerecord (= 5.2.7.1) - activestorage (= 5.2.7.1) - activesupport (= 5.2.7.1) - bundler (>= 1.3.0) - railties (= 5.2.7.1) + rack (2.2.4) + rack-protection (2.2.0) + rack + rack-test (2.0.2) + rack (>= 1.3) + rails (6.1.5.1) + actioncable (= 6.1.5.1) + actionmailbox (= 6.1.5.1) + actionmailer (= 6.1.5.1) + actionpack (= 6.1.5.1) + actiontext (= 6.1.5.1) + actionview (= 6.1.5.1) + activejob (= 6.1.5.1) + activemodel (= 6.1.5.1) + activerecord (= 6.1.5.1) + activestorage (= 6.1.5.1) + activesupport (= 6.1.5.1) + bundler (>= 1.15.0) + railties (= 6.1.5.1) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -315,38 +346,24 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.2) + rails-html-sanitizer (1.4.3) loofah (~> 2.3) - rails-timeago (2.20.0) - actionpack (>= 5.2) - activesupport (>= 5.2) - rails_tokeninput (1.7.0) - railties (>= 3.1.0) - railties (5.2.7.1) - actionpack (= 5.2.7.1) - activesupport (= 5.2.7.1) + railties (6.1.5.1) + actionpack (= 6.1.5.1) + activesupport (= 6.1.5.1) method_source - rake (>= 0.8.7) - thor (>= 0.19.0, < 2.0) + rake (>= 12.2) + thor (~> 1.0) rainbow (3.1.1) rake (13.0.6) rantly (2.0.0) rbtree (0.4.5) rbtree3 (0.7.0) - rdoc (6.4.0) - psych (>= 4.0.0) + rdoc (6.3.3) redcarpet (3.5.1) - regexp_parser (2.2.1) + regexp_parser (2.5.0) request_store (1.5.1) rack (>= 1.4) - responders (3.0.1) - actionpack (>= 5.0) - railties (>= 5.0) - rest-client (2.1.0) - http-accept (>= 1.7.0, < 2.0) - http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 4.0) - netrc (~> 0.8) rexml (3.2.5) riddle (2.4.3) rspec (3.11.0) @@ -358,10 +375,10 @@ GEM rspec-expectations (3.11.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.11.0) - rspec-mocks (3.11.0) + rspec-mocks (3.11.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.11.0) - rspec-rails (5.1.1) + rspec-rails (5.1.2) actionpack (>= 5.2) activesupport (>= 5.2) railties (>= 5.2) @@ -372,29 +389,31 @@ GEM rspec-support (3.11.0) rspec_junit_formatter (0.5.1) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.26.0) + rubocop (1.31.1) + json (~> 2.3) parallel (~> 1.10) parser (>= 3.1.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) - rexml - rubocop-ast (>= 1.16.0, < 2.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.18.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.16.0) + rubocop-ast (1.18.0) parser (>= 3.1.1.0) - rubocop-performance (1.13.3) + rubocop-performance (1.14.2) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.14.2) + rubocop-rails (2.15.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.7.0, < 2.0) - rubocop-rspec (2.9.0) - rubocop (~> 1.19) + rubocop-rspec (2.12.1) + rubocop (~> 1.31) ruby-ldap (0.9.20) ruby-progressbar (1.11.0) - ruby_parser (3.18.1) + ruby2_keywords (0.0.5) + ruby_parser (3.19.1) sexp_processor (~> 4.16) rubyzip (2.3.2) sanitize (6.0.0) @@ -408,39 +427,45 @@ GEM sprockets (> 3.0) sprockets-rails tilt - selenium-webdriver (4.1.0) + sawyer (0.9.2) + addressable (>= 2.3.5) + faraday (>= 0.17.3, < 3) + selenium-webdriver (4.3.0) childprocess (>= 0.5, < 5.0) rexml (~> 3.2, >= 3.2.5) - rubyzip (>= 1.2.2) + rubyzip (>= 1.2.2, < 3.0) + websocket (~> 1.0) set (1.0.2) - sexp_processor (4.16.0) - shoulda-matchers (4.5.1) - activesupport (>= 4.2.0) - simplecov (0.21.2) + sexp_processor (4.16.1) + shoulda-matchers (5.1.0) + activesupport (>= 5.2.0) + simplecov (0.16.1) docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-html (0.12.3) - simplecov_json_formatter (0.1.4) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) single_test (0.6.0) rake sorted_set (1.0.3) rbtree set (~> 1.0) - sprite-factory (1.7.1) - sprockets (4.0.3) + sprockets (4.1.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.4.2) actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - stringio (3.0.1) + strong_migrations (1.2.0) + activerecord (>= 5.2) + strscan (3.0.1) sync (0.5.0) sysexits (1.2.0) temple (0.8.2) term-ansicolor (1.7.1) tins (~> 1.0) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) test-unit (3.5.3) power_assert thinking-sphinx (5.4.0) @@ -451,21 +476,21 @@ GEM middleware (>= 0.1.0) riddle (~> 2.3) thor (1.2.1) - thread_safe (0.3.6) tilt (2.0.10) timecop (0.9.5) - tins (1.31.0) + timeout (0.3.0) + tins (1.31.1) sync - tzinfo (1.2.9) - thread_safe (~> 0.1) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unf (0.1.4) - unf_ext - unf_ext (0.0.8.1) - unicode-display_width (2.1.0) - uniform_notifier (1.14.2) + unicode-display_width (2.2.0) + uniform_notifier (1.16.0) vcr (6.1.0) + view_component (2.57.1) + activesupport (>= 5.0.0, < 8.0) + method_source (~> 1.0) voight_kampff (1.1.4) rack (>= 1.4, < 3.0) webmock (3.14.0) @@ -473,6 +498,7 @@ GEM crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) webrick (1.7.0) + websocket (1.2.9) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -482,11 +508,11 @@ GEM webrick xpath (3.2.0) nokogiri (~> 1.8) - yajl-ruby (1.4.2) - zeitwerk (2.5.4) + yajl-ruby (1.4.3) + zeitwerk (2.6.0) PLATFORMS - x86_64-linux + ruby DEPENDENCIES activemodel-serializers-xml @@ -496,7 +522,10 @@ DEPENDENCIES airbrake airbrake-ruby ajax-datatables-rails + annotate + awesome_print bcrypt + bigdecimal bootstrap builder bullet @@ -504,63 +533,61 @@ DEPENDENCIES bunny-mock capybara capybara_minitest_spec - chunky_png - clockwork (>= 0.7) + clockwork cocoon codecov - codemirror-rails - coffee-rails - colorize + coderay coveralls - cssmin (>= 1.0.2) daemons dalli data_migrate - database_cleaner (>= 1.0.1) - deep_cloneable (~> 2.4.0) - delayed_job_active_record (>= 4.0.0) - escape_utils - experimental-influxdb-rails (>= 1.0.0.beta5) + database_cleaner-active_record + deep_cloneable + delayed_job_active_record + down factory_bot_rails faker - feature + flipper + flipper-active_record + flipper-ui flot-rails font-awesome-sass + gitlab gssapi haml haml-rails haml_lint + influxdb-rails jquery-datatables jquery-rails jquery-ui-rails (~> 4.2.1) kaminari launchy lograge + matrix (~> 0.4) minitest minitest-ci minitest-fail-fast minitest-reporters - mocha (> 0.13.0) - momentjs-rails - mousetrap-rails + mocha mysql2 + net-imap + net-pop + net-smtp + next_rails nokogiri - peek - peek-dalli - peek-host - peek-mysql2 - pry (>= 0.9.12) + octokit + pry pry-byebug - puma (~> 4.0) + pry-rails + puma pundit - rails (~> 5.2) + rails (~> 6.1) rails-controller-testing - rails-timeago (~> 2.0) - rails_tokeninput (>= 1.6.1.rc1) rantly rdoc redcarpet - responders (~> 3.0) + rexml rspec rspec-rails rspec_junit_formatter @@ -569,24 +596,24 @@ DEPENDENCIES rubocop-rails rubocop-rspec ruby-ldap - sanitize sassc-rails selenium-webdriver - shoulda-matchers (~> 4.0) + shoulda-matchers simplecov single_test - sprite-factory (>= 1.5.2) + strong_migrations + strscan (= 3.0.1) test-unit - thinking-sphinx (> 3.1) - tilt (>= 1.4.1) + thinking-sphinx timecop - uglifier (>= 1.2.2) + uglifier vcr + view_component voight_kampff - webmock (>= 2.3.0) - xmlhash (>= 1.3.6) + webmock + xmlhash xmlrpc yajl-ruby BUNDLED WITH - 2.2.33 + 2.3.3 diff --git a/obs-server.spec b/obs-server.spec index 8519ea671e5aea5c201d8b501df8cfb8cce019d4..64f3c75c3bfdc722571d115e3111a659bb87ecc8 100644 --- a/obs-server.spec +++ b/obs-server.spec @@ -5,8 +5,8 @@ Name: obs-server -Version: 2.10.15 -Release: 2 +Version: 2.10.17 +Release: 3 Summary: The Open Build Service -- Server Component License: GPL-2.0-only OR GPL-3.0-only URL: http://www.openbuildservice.org @@ -16,10 +16,6 @@ Source1: Gemfile.lock.aarch64 Source2: Gemfile.lock.x86 Patch1: 0001-obs_server-fix-usage-info.patch Patch2: fix-obs_productconvert-inputfile-path.patch -Patch4: 0004-remove-systemV-method.patch -Patch5: 0005-obsscheduler-stop.patch -Patch6: obs_project_update-should-tell-the-usage-but-not-hung-still.patch -Patch7: Adapt-setup-appliance.sh-for-openeuler.patch BuildArch: noarch @@ -77,8 +73,6 @@ This is the API server instance, and the web client for the OBS. %prep %autosetup -n open-build-service-%version -p1 -rm -rf src/{api,backend}/docker-files -rm -rf src/api/Dockerfile.frontend-base rm -rf src/backend/build #adpate to obs-bundled-gema-2.10.1 because of updating to obs-server-2.10.11 rm -rf src/api/config/brakeman.ignore @@ -104,26 +98,14 @@ cd src/api bundle --local --path %_libdir/obs-api/ cd - make -sed -i '/c.blacklist_keys = \[/d' src/api/config/initializers/airbrake.rb -sed -i '/config.db_adapter = :/d' src/api/config/initializers/ajax_datatables_rails.rb -sed -i '/AjaxDatatablesRails.configure/d' src/api/config/initializers/ajax_datatables_rails.rb -sed -i '/end/d' src/api/config/initializers/ajax_datatables_rails.rb -rm -rf src/api/app/assets/stylesheets/webui2/webui2.css.scss -sed -i 's/js_compressor = :uglifier/js_compressor = Uglifier.new(harmony: true)/g' src/api/config/environments/production.rb %install export DESTDIR=$RPM_BUILD_ROOT -perl -p -i -e 's/^APACHE_VHOST_CONF=.*/APACHE_VHOST_CONF=obs-apache2.conf/' Makefile.include perl -p -i -e 's/^APACHE_USER=.*/APACHE_USER=apache/' Makefile.include perl -p -i -e 's/^APACHE_GROUP=.*/APACHE_GROUP=apache/' Makefile.include mkdir -p src/api/app/assets/config pushd src/api/app/assets/config -cat << EOF > manifest.js -//= link_tree ../images -//= link_directory ../ -//= link_directory ../ -EOF #javascripts.js stylesheets.css popd export OBS_VERSION="%{version}" @@ -140,15 +122,14 @@ rm -rf $RPM_BUILD_ROOT/usr/sbin/rcobsclouduploadserver rm -rf $RPM_BUILD_ROOT/usr/sbin/rcobsclouduploadworker rm -rf $RPM_BUILD_ROOT/srv/www/obs/api/spec +# Remove Gemfile.next and Gemfile.next.lock since they are only for testing the next Rails version in development and test environments +rm %{buildroot}/srv/www/obs/api/Gemfile.next %{buildroot}/srv/www/obs/api/Gemfile.next.lock + if ! test -L $RPM_BUILD_ROOT/usr/lib/obs/server/build; then echo "/usr/lib/obs/server/build is not a symlink!" exit 1 fi -cd $RPM_BUILD_ROOT/srv/www/obs/api/public/assets/webui2/ -ln -sf application-*.js application.js -ln -sf webui2-*.css webui2.css -cd - [-d $RPM_BUILD_ROOT/etc/sysconfig] || mkdir -p $RPM_BUILD_ROOT/etc/sysconfig install -m 0644 dist/sysconfig.obs-server $RPM_BUILD_ROOT/etc/sysconfig/obs-server @@ -371,21 +352,6 @@ fi %{_sbindir}/obsscheduler %{_sbindir}/obsworker %{_sbindir}/obs_project_update -%{_sbindir}/rcobsdispatcher -%{_sbindir}/rcobspublisher -%{_sbindir}/rcobsrepserver -%{_sbindir}/rcobssrcserver -%{_sbindir}/rcobswarden -%{_sbindir}/rcobsdodup -%{_sbindir}/rcobsgetbinariesproxy -%{_sbindir}/rcobsdeltastore -%{_sbindir}/rcobsservicedispatch -%{_sbindir}/rcobssigner -%{_sbindir}/rcobsnotifyforward -%{_sbindir}/rcobsredis -%{_sbindir}/rcobsworker -%{_sbindir}/rcobsscheduler -%{_sbindir}/rcobsservice %{_bindir}/obs_productconvert %config(noreplace) /usr/lib/obs/server/BSConfig.pm %config(noreplace) /etc/slp.reg.d/* @@ -404,6 +370,10 @@ fi %attr(0755, obsservicerun, obsrun) %dir /srv/obs/service %attr(0755, obsservicerun, obsrun) %dir /srv/obs/service/log +/srv/www/obs/api/config/routes/api_routes.rb +/srv/www/obs/api/config/routes/webui_routes.rb +/usr/lib/systemd/system/obs-delayedjob-queue-scm.service + %triggerin -n obs-server -- docker usermod -a -G docker obsservicerun @@ -417,6 +387,9 @@ usermod -a -G docker obsservicerun %attr(-,apache,apache) %config(noreplace) /srv/www/obs/api/config/production.sphinx.conf +/srv/www/obs/api/docker-files/Dockerfile +/srv/www/obs/api/docker-files/Dockerfile.minitest + %dir /srv/www/obs %dir /srv/www/obs/api %dir /srv/www/obs/api/config @@ -428,9 +401,7 @@ usermod -a -G docker obsservicerun %config(noreplace) /srv/www/obs/api/config/crawler-user-agents.json /srv/www/obs/api/config/initializers %dir /srv/www/obs/api/config/environments -%dir /srv/www/obs/api/files %dir /srv/www/obs/api/db -/srv/www/obs/api/db/checker.rb /srv/www/obs/api/Gemfile %verify(not mtime) /srv/www/obs/api/last_deploy /srv/www/obs/api/Gemfile.lock @@ -450,25 +421,14 @@ usermod -a -G docker obsservicerun %{_unitdir}/obs-delayedjob-queue-releasetracking.service %{_unitdir}/obs-delayedjob-queue-staging.service %{_unitdir}/obs-sphinx.service -%{_sbindir}/rcobs-api-support -%{_sbindir}/rcobs-clockwork -%{_sbindir}/rcobs-delayedjob-queue-consistency_check -%{_sbindir}/rcobs-delayedjob-queue-default -%{_sbindir}/rcobs-delayedjob-queue-issuetracking -%{_sbindir}/rcobs-delayedjob-queue-mailers -%{_sbindir}/rcobs-delayedjob-queue-project_log_rotate -%{_sbindir}/rcobs-delayedjob-queue-releasetracking -%{_sbindir}/rcobs-delayedjob-queue-staging -%{_sbindir}/rcobs-sphinx -%{_sbindir}/rcobsapisetup +%{_unitdir}/obssourcepublish.service /srv/www/obs/api/app -%attr(-,apache,apache) /srv/www/obs/api/db/structure.sql +%attr(-,apache,apache) /srv/www/obs/api/db/schema.rb %attr(-,apache,apache) /srv/www/obs/api/db/data_schema.rb /srv/www/obs/api/db/attribute_descriptions.rb /srv/www/obs/api/db/data /srv/www/obs/api/db/migrate /srv/www/obs/api/db/seeds.rb -/srv/www/obs/api/files/wizardtemplate.spec /srv/www/obs/api/lib /srv/www/obs/api/public /srv/www/obs/api/Rakefile @@ -510,13 +470,14 @@ usermod -a -G docker obsservicerun %files -n obs-common %defattr(-,root,root) -/var/adm/fillup-templates/sysconfig.obs-server /usr/lib/obs/server/setup-appliance.sh %{_unitdir}/obsstoragesetup.service %{_sbindir}/obsstoragesetup -%{_sbindir}/rcobsstoragesetup %changelog +* Thu Jul 28 2022 xiangyuning - 2.10.17-3 +- Upgrade to version 2.10.17 + * Wed Jun 15 2022 wangkai - 2.10.15-2 - Fix obs-api install warning