Use embedded rails 5.1

This commit is contained in:
Pirate Praveen 2019-03-12 20:42:49 +05:30
parent e243bafc9b
commit e93789a259
4 changed files with 23 additions and 0 deletions

View file

@ -9,6 +9,7 @@ debian/conf/smtp_settings.rb etc/gitlab/initializers
debian/conf/tmpfiles.d/gitlab.conf.example usr/lib/gitlab/templates/tmpfiles.d
debian/conf/nginx.conf.example usr/lib/gitlab/templates
debian/conf/nginx.ssl.conf.example usr/lib/gitlab/templates
debian/gems-compat/* usr/share/gitlab/vendor/gems
debian/rake-tasks.sh usr/lib/gitlab/scripts
debian/gitlab-rake.sh usr/lib/gitlab/scripts
.babelrc.js usr/share/gitlab

View file

@ -0,0 +1,20 @@
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,16 @@
source 'https://rubygems.org'
-gem 'rails', '~> 5.0'
+gem "rails", "5.1.6.1", path: 'vendor/gems/rails-5.1.6.1'
+gem "railties", "5.1.6.1", path: 'vendor/gems/railties-5.1.6.1'
+gem "activerecord", "5.1.6.1", path: 'vendor/gems/activerecord-5.1.6.1'
+gem "activesupport", "5.1.6.1", path: 'vendor/gems/activesupport-5.1.6.1'
+gem "activemodel", "5.1.6.1", path: 'vendor/gems/activemodel-5.1.6.1'
+gem "activejob", "5.1.6.1", path: 'vendor/gems/activejob-5.1.6.1'
+gem "actioncable", "5.1.6.1", path: 'vendor/gems/actioncable-5.1.6.1'
+gem "actionmailer", "5.1.6.1", path: 'vendor/gems/actionmailer-5.1.6.1'
+gem "actionpack", "5.1.6.1", path: 'vendor/gems/actionpack-5.1.6.1'
+gem "actionview", "5.1.6.1", path: 'vendor/gems/actionview-5.1.6.1'
+gem "arel", "8.0.0", path: 'vendor/gems/arel-8.0.0'
gem 'rails-deprecated_sanitizer', '~> 1.0', '>= 1.0.3'
# Improves copy-on-write performance for MRI

View file

@ -24,5 +24,6 @@
0680-rails-5_1.patch
0680-rails-5_2.patch
0685-bump-fog.patch
0686-rails-5.1-embed.patch
0690-debian-usage-ping.patch
0700-add-salsa-link-to-help.patch

1
debian/source/include-binaries vendored Normal file
View file

@ -0,0 +1 @@
debian/gems-compat/activesupport-5.1.6.1/lib/active_support/values/unicode_tables.dat