File obs-server-2.9-0101-frontend-Update-OBS-to-Rails-version-5.2.patch of Package obs-server
From e9a89cc01bf845ae1e09c76afcf9255896422f9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Geuken?= <bgeuken@suse.de>
Date: Tue, 22 May 2018 14:49:02 +0200
Subject: [PATCH] [frontend] Update OBS to Rails version 5.2
---
src/api/Gemfile | 2 +-
src/api/Gemfile.lock | 86 ++++++++++++++++++++++++--------------------
2 files changed, 48 insertions(+), 40 deletions(-)
diff --git a/src/api/Gemfile b/src/api/Gemfile
index eccd95a1e4..1635ba2019 100644
--- a/src/api/Gemfile
+++ b/src/api/Gemfile
@@ -2,7 +2,7 @@
# This preamble is the current preamble for Rails 3 apps; edit as needed.
source 'https://rubygems.org'
-gem 'rails', '~> 5.1.1'
+gem 'rails', '~> 5.2.0'
# as our database
gem 'mysql2'
diff --git a/src/api/Gemfile.lock b/src/api/Gemfile.lock
index 535c25f0f5..684d836ef6 100644
--- a/src/api/Gemfile.lock
+++ b/src/api/Gemfile.lock
@@ -1,43 +1,47 @@
GEM
remote: https://rubygems.org/
specs:
- actioncable (5.1.4)
- actionpack (= 5.1.4)
+ actioncable (5.2.0)
+ actionpack (= 5.2.0)
nio4r (~> 2.0)
- websocket-driver (~> 0.6.1)
- actionmailer (5.1.4)
- actionpack (= 5.1.4)
- actionview (= 5.1.4)
- activejob (= 5.1.4)
+ websocket-driver (>= 0.6.1)
+ actionmailer (5.2.0)
+ actionpack (= 5.2.0)
+ actionview (= 5.2.0)
+ activejob (= 5.2.0)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
- actionpack (5.1.4)
- actionview (= 5.1.4)
- activesupport (= 5.1.4)
+ actionpack (5.2.0)
+ actionview (= 5.2.0)
+ activesupport (= 5.2.0)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
- actionview (5.1.4)
- activesupport (= 5.1.4)
+ actionview (5.2.0)
+ activesupport (= 5.2.0)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
- activejob (5.1.4)
- activesupport (= 5.1.4)
+ activejob (5.2.0)
+ activesupport (= 5.2.0)
globalid (>= 0.3.6)
- activemodel (5.1.4)
- activesupport (= 5.1.4)
+ activemodel (5.2.0)
+ activesupport (= 5.2.0)
activemodel-serializers-xml (1.0.2)
activemodel (> 5.x)
activesupport (> 5.x)
builder (~> 3.1)
- activerecord (5.1.4)
- activemodel (= 5.1.4)
- activesupport (= 5.1.4)
- arel (~> 8.0)
- activesupport (5.1.4)
+ activerecord (5.2.0)
+ activemodel (= 5.2.0)
+ activesupport (= 5.2.0)
+ arel (>= 9.0)
+ activestorage (5.2.0)
+ actionpack (= 5.2.0)
+ activerecord (= 5.2.0)
+ marcel (~> 0.3.1)
+ activesupport (5.2.0)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
minitest (~> 5.1)
@@ -53,7 +57,7 @@ GEM
airbrake-ruby (2.5.0)
amq-protocol (2.3.0)
ansi (1.5.0)
- arel (8.0.0)
+ arel (9.0.0)
ast (2.4.0)
bcrypt (3.1.11)
builder (3.2.3)
@@ -155,8 +159,8 @@ GEM
i18n (0.9.1)
concurrent-ruby (~> 1.0)
innertube (1.1.0)
- joiner (0.3.4)
- activerecord (>= 4.1.0)
+ joiner (0.4.0)
+ activerecord (>= 5.2.beta1)
jquery-datatables-rails (3.4.0)
actionpack (>= 3.1)
jquery-rails
@@ -189,9 +193,12 @@ GEM
nokogiri (>= 1.5.9)
mail (2.7.0)
mini_mime (>= 0.1.1)
+ marcel (0.3.2)
+ mimemagic (~> 0.3.2)
metaclass (0.0.4)
method_source (0.9.0)
middleware (0.1.0)
+ mimemagic (0.3.2)
mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.10.3)
@@ -252,17 +259,18 @@ GEM
rack (2.0.6)
rack-test (0.8.2)
rack (>= 1.0, < 3)
- rails (5.1.4)
- actioncable (= 5.1.4)
- actionmailer (= 5.1.4)
- actionpack (= 5.1.4)
- actionview (= 5.1.4)
- activejob (= 5.1.4)
- activemodel (= 5.1.4)
- activerecord (= 5.1.4)
- activesupport (= 5.1.4)
+ rails (5.2.0)
+ actioncable (= 5.2.0)
+ actionmailer (= 5.2.0)
+ actionpack (= 5.2.0)
+ actionview (= 5.2.0)
+ activejob (= 5.2.0)
+ activemodel (= 5.2.0)
+ activerecord (= 5.2.0)
+ activestorage (= 5.2.0)
+ activesupport (= 5.2.0)
bundler (>= 1.3.0)
- railties (= 5.1.4)
+ railties (= 5.2.0)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.2)
actionpack (~> 5.x, >= 5.0.1)
@@ -275,9 +283,9 @@ GEM
loofah (~> 2.2, >= 2.2.2)
rails_tokeninput (1.7.0)
railties (>= 3.1.0)
- railties (5.1.4)
- actionpack (= 5.1.4)
- activesupport (= 5.1.4)
+ railties (5.2.0)
+ actionpack (= 5.2.0)
+ activesupport (= 5.2.0)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
@@ -404,7 +412,7 @@ GEM
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
- websocket-driver (0.6.5)
+ websocket-driver (0.7.0)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
xmlhash (1.3.7)
@@ -474,7 +482,7 @@ DEPENDENCIES
poltergeist
pry (>= 0.9.12)
pundit
- rails (~> 5.1.1)
+ rails (~> 5.2.0)
rails-controller-testing
rails_tokeninput (>= 1.6.1.rc1)
rantly (>= 1.1.0)
--
2.25.3