realaravinth/debian-mirror-gitlab
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update d/patches/0680-*

Browse source
This commit is contained in:
Utkarsh Gupta 2019-05-04 01:01:32 +05:30
parent fa5a783454
commit d23a63cf1b
2 changed files with 2 additions and 130 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
debian/patches/0050-relax-stable-libs.patch vendored
View file

@ -1,4 +1,4 @@
We should be able to update minor versions of stable libs withough breaking We should be able to update minor versions of stable libs without breaking
gitlab Gemfile gitlab Gemfile
--- a/Gemfile --- a/Gemfile

130
debian/patches/0680-rails-5_1.patch vendored
View file

@ -70,71 +70,6 @@ Model.new.attributes now also returns encrypted attributes.
--- a/Gemfile.lock --- a/Gemfile.lock
+++ b/Gemfile.lock +++ b/Gemfile.lock
@@ -4,41 +4,41 @@
RedCloth (4.3.2)
abstract_type (0.0.7)
ace-rails-ap (4.1.2)
- actioncable (5.0.7.1)
- actionpack (= 5.0.7.1)
- nio4r (>= 1.2, < 3.0)
+ actioncable (5.1.6.1)
+ actionpack (= 5.1.6.1)
+ nio4r (~> 2.0)
websocket-driver (~> 0.6.1)
- actionmailer (5.0.7.1)
- actionpack (= 5.0.7.1)
- actionview (= 5.0.7.1)
- activejob (= 5.0.7.1)
+ actionmailer (5.1.6.1)
+ actionpack (= 5.1.6.1)
+ actionview (= 5.1.6.1)
+ activejob (= 5.1.6.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
- actionpack (5.0.7.1)
- actionview (= 5.0.7.1)
- activesupport (= 5.0.7.1)
+ actionpack (5.1.6.1)
+ actionview (= 5.1.6.1)
+ activesupport (= 5.1.6.1)
rack (~> 2.0)
- rack-test (~> 0.6.3)
+ rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
- actionview (5.0.7.1)
- activesupport (= 5.0.7.1)
+ actionview (5.1.6.1)
+ activesupport (= 5.1.6.1)
builder (~> 3.1)
- erubis (~> 2.7.0)
+ erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
- activejob (5.0.7.1)
- activesupport (= 5.0.7.1)
+ activejob (5.1.6.1)
+ activesupport (= 5.1.6.1)
globalid (>= 0.3.6)
- activemodel (5.0.7.1)
- activesupport (= 5.0.7.1)
- activerecord (5.0.7.1)
- activemodel (= 5.0.7.1)
- activesupport (= 5.0.7.1)
- arel (~> 7.0)
+ activemodel (5.1.6.1)
+ activesupport (= 5.1.6.1)
+ activerecord (5.1.6.1)
+ activemodel (= 5.1.6.1)
+ activesupport (= 5.1.6.1)
+ arel (~> 8.0)
activerecord_sane_schema_dumper (1.0)
rails (>= 5, < 6)
- activesupport (5.0.7.1)
+ activesupport (5.1.6.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
@@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
public_suffix (>= 2.0.2, < 4.0) public_suffix (>= 2.0.2, < 4.0)
aes_key_wrap (1.0.1) aes_key_wrap (1.0.1)
@ -174,60 +109,6 @@ Model.new.attributes now also returns encrypted attributes.
grape (~> 1.0) grape (~> 1.0)
rake (~> 12) rake (~> 12)
grape_logging (1.7.0) grape_logging (1.7.0)
@@ -385,7 +384,7 @@
json (~> 1.8)
multi_xml (>= 0.5.2)
httpclient (2.8.3)
- i18n (1.2.0)
+ i18n (1.3.0)
concurrent-ruby (~> 1.0)
icalendar (2.4.1)
ice_nine (0.11.2)
@@ -634,19 +633,19 @@
rack
rack-proxy (0.6.0)
rack
- rack-test (0.6.3)
- rack (>= 1.0)
- rails (5.0.7.1)
- actioncable (= 5.0.7.1)
- actionmailer (= 5.0.7.1)
- actionpack (= 5.0.7.1)
- actionview (= 5.0.7.1)
- activejob (= 5.0.7.1)
- activemodel (= 5.0.7.1)
- activerecord (= 5.0.7.1)
- activesupport (= 5.0.7.1)
+ rack-test (1.1.0)
+ rack (>= 1.0, < 3)
+ rails (5.1.6.1)
+ actioncable (= 5.1.6.1)
+ actionmailer (= 5.1.6.1)
+ actionpack (= 5.1.6.1)
+ actionview (= 5.1.6.1)
+ activejob (= 5.1.6.1)
+ activemodel (= 5.1.6.1)
+ activerecord (= 5.1.6.1)
+ activesupport (= 5.1.6.1)
bundler (>= 1.3.0)
- railties (= 5.0.7.1)
+ railties (= 5.1.6.1)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.2)
actionpack (~> 5.x, >= 5.0.1)
@@ -662,9 +661,9 @@
rails-i18n (5.1.1)
i18n (>= 0.7, < 2)
railties (>= 5.0, < 6)
- railties (5.0.7.1)
- actionpack (= 5.0.7.1)
- activesupport (= 5.0.7.1)
+ railties (5.1.6.1)
+ actionpack (= 5.1.6.1)
+ activesupport (= 5.1.6.1)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
@@ -1033,7 +1032,7 @@ @@ -1033,7 +1032,7 @@
gpgme (~> 2.0.18) gpgme (~> 2.0.18)
grape (~> 1.1.0) grape (~> 1.1.0)
@ -237,15 +118,6 @@ Model.new.attributes now also returns encrypted attributes.
grape_logging (~> 1.7) grape_logging (~> 1.7)
graphiql-rails (~> 1.4.10) graphiql-rails (~> 1.4.10)
graphql (~> 1.8.0) graphql (~> 1.8.0)
@@ -1110,7 +1109,7 @@
rack-cors (~> 1.0.0)
rack-oauth2 (~> 1.2.1)
rack-proxy (~> 0.6.0)
- rails (= 5.0.7.1)
+ rails (= 5.1.6.1)
rails-controller-testing
rails-deprecated_sanitizer (~> 1.0.3)
rails-i18n (~> 5.1)
--- a/app/models/ci/build.rb --- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb +++ b/app/models/ci/build.rb
@@ -146,7 +146,7 @@ @@ -146,7 +146,7 @@
@ -369,7 +241,7 @@ Model.new.attributes now also returns encrypted attributes.
--- a/app/models/merge_request.rb --- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb +++ b/app/models/merge_request.rb
@@ -699,7 +699,7 @@ @@ -702,7 +702,7 @@
end end
def reload_diff_if_branch_changed def reload_diff_if_branch_changed