debian-mirror-gitlab/debian/patches/0050-relax-stable-libs.patch

355 lines
9.4 KiB
Diff
Raw Normal View History

2016-04-05 22:57:46 +05:30
We should be able to update minor versions of stable libs without breaking
gitlab Gemfile
2017-01-15 13:33:34 +05:30
--- a/Gemfile
+++ b/Gemfile
2018-10-13 18:35:17 +05:30
@@ -5,7 +5,7 @@
gem_versions = {}
gem_versions['activerecord_sane_schema_dumper'] = rails5? ? '1.0' : '0.2'
-gem_versions['default_value_for'] = rails5? ? '~> 3.0.5' : '~> 3.0.0'
+gem_versions['default_value_for'] = rails5? ? '~> 3.0.5' : '~> 3.0'
gem_versions['rails'] = rails5? ? '5.0.6' : '4.2.10'
gem_versions['rails-i18n'] = rails5? ? '~> 5.1' : '~> 4.0.9'
# --- The end of special code for migrating to Rails 5.0 ---
2018-05-09 12:38:34 +05:30
@@ -13,12 +13,12 @@
2016-08-24 20:52:28 +05:30
source 'https://rubygems.org'
2016-06-16 12:31:48 +05:30
2018-05-09 12:38:34 +05:30
gem 'rails', gem_versions['rails']
2017-09-10 18:21:32 +05:30
-gem 'rails-deprecated_sanitizer', '~> 1.0.3'
+gem 'rails-deprecated_sanitizer', '~> 1.0', '>= 1.0.3'
2016-06-16 12:31:48 +05:30
# Responders respond_to and respond_with
2016-09-13 18:27:13 +05:30
gem 'responders', '~> 2.0'
2016-11-03 15:15:38 +05:30
-gem 'sprockets', '~> 3.7.0'
+gem 'sprockets', '~> 3.7'
2016-06-16 12:31:48 +05:30
# Default values for AR models
2018-05-09 12:38:34 +05:30
gem 'default_value_for', gem_versions['default_value_for']
@@ -28,7 +28,7 @@
2017-09-10 18:21:32 +05:30
gem 'pg', '~> 0.18.2', group: :postgres
2018-05-09 12:38:34 +05:30
gem 'rugged', '~> 0.27'
2018-03-18 12:27:51 +05:30
-gem 'grape-route-helpers', '~> 2.1.0'
+gem 'grape-route-helpers', '~> 2.1'
2017-09-10 18:21:32 +05:30
gem 'faraday', '~> 0.12'
2016-09-13 18:27:13 +05:30
2018-05-09 12:38:34 +05:30
@@ -37,35 +37,35 @@
gem 'doorkeeper', '~> 4.3'
gem 'doorkeeper-openid_connect', '~> 1.3'
gem 'omniauth', '~> 1.8'
2018-03-26 14:57:00 +05:30
-gem 'omniauth-auth0', '~> 2.0.0'
+gem 'omniauth-auth0', '~> 2.0'
2018-03-18 12:27:51 +05:30
gem 'omniauth-azure-oauth2', '~> 0.0.9'
2017-09-10 18:21:32 +05:30
-gem 'omniauth-cas3', '~> 1.1.4'
2017-08-17 23:00:15 +05:30
-gem 'omniauth-facebook', '~> 4.0.0'
2017-09-10 18:21:32 +05:30
+gem 'omniauth-cas3', '~> 1.1', '>= 1.1.4'
2017-08-17 23:00:15 +05:30
+gem 'omniauth-facebook', '~> 4.0'
2018-10-15 15:54:03 +05:30
gem 'omniauth-github', '~> 1.3'
-gem 'omniauth-gitlab', '~> 1.0.2'
2018-03-19 12:30:19 +05:30
+gem 'omniauth-gitlab', '~> 1.0', '>= 1.0.2'
2018-05-09 12:38:34 +05:30
gem 'omniauth-google-oauth2', '~> 0.5.3'
2017-08-17 23:00:15 +05:30
gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
gem 'omniauth-oauth2-generic', '~> 0.2.2'
2018-05-09 12:38:34 +05:30
gem 'omniauth-saml', '~> 1.10'
2017-08-17 23:00:15 +05:30
-gem 'omniauth-shibboleth', '~> 1.2.0'
+gem 'omniauth-shibboleth', '~> 1.2'
2018-05-09 12:38:34 +05:30
gem 'omniauth-twitter', '~> 1.4'
-gem 'omniauth_crowd', '~> 2.2.0'
2017-08-17 23:00:15 +05:30
+gem 'omniauth_crowd', '~> 2.2'
2017-09-10 18:21:32 +05:30
gem 'omniauth-authentiq', '~> 0.3.1'
2017-08-17 23:00:15 +05:30
-gem 'rack-oauth2', '~> 1.2.1'
-gem 'jwt', '~> 1.5.6'
+gem 'rack-oauth2', '~> 1.2', '>= 1.2.1'
+gem 'jwt', '~> 1.5', '>= 1.5.6'
2016-06-16 12:31:48 +05:30
# Spam and anti-bot protection
2017-08-17 23:00:15 +05:30
gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails'
2016-06-16 12:31:48 +05:30
gem 'akismet', '~> 2.0'
# Two-factor authentication
2016-06-16 23:10:45 +05:30
-gem 'devise-two-factor', '~> 3.0.0'
+gem 'devise-two-factor', '~> 3.0'
2016-06-16 12:31:48 +05:30
gem 'rqrcode-rails3', '~> 0.1.7'
2018-05-09 12:38:34 +05:30
-gem 'attr_encrypted', '~> 3.1.0'
+gem 'attr_encrypted', '~> 3.1'
2016-06-16 23:10:45 +05:30
gem 'u2f', '~> 0.2.1'
2016-06-16 12:31:48 +05:30
2017-08-17 23:00:15 +05:30
# GitLab Pages
-gem 'validates_hostname', '~> 1.0.6'
+gem 'validates_hostname', '~> 1.0', '>= 1.0.6'
2016-08-25 14:58:19 +05:30
2017-08-17 23:00:15 +05:30
# Browser detection
gem 'browser', '~> 2.2'
2018-06-27 16:13:27 +05:30
@@ -86,12 +86,12 @@
gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false
2016-06-02 15:52:42 +05:30
# Language detection
2018-03-27 20:24:05 +05:30
-gem 'github-linguist', '~> 5.3.3', require: 'linguist'
+gem 'github-linguist', '~> 5.3', '>= 5.3.3', require: 'linguist'
2016-06-16 12:31:48 +05:30
# API
2018-03-18 12:27:51 +05:30
gem 'grape', '~> 1.0'
2018-10-15 15:54:03 +05:30
gem 'grape-entity', '~> 0.7.1'
2018-03-18 12:27:51 +05:30
-gem 'rack-cors', '~> 1.0.0', require: 'rack/cors'
+gem 'rack-cors', '~> 1.0', require: 'rack/cors'
# Disable strong_params so that Mash does not respond to :permitted?
gem 'hashie-forbidden_attributes'
2018-06-27 16:13:27 +05:30
@@ -100,7 +100,7 @@
2017-09-10 18:21:32 +05:30
gem 'kaminari', '~> 1.0'
2016-09-13 18:27:13 +05:30
# HAML
-gem 'hamlit', '~> 2.6.1'
+gem 'hamlit', '~> 2.6', '>= 2.6.1'
# Files attachments
2018-03-18 12:27:51 +05:30
gem 'carrierwave', '~> 1.2'
2018-10-15 15:54:03 +05:30
@@ -109,9 +109,9 @@
2018-05-09 12:38:34 +05:30
gem 'dropzonejs-rails', '~> 0.7.1'
# for backups
-gem 'fog-aws', '~> 2.0.1'
+gem 'fog-aws', '~> 2.0', '>= 2.0.1'
gem 'fog-core', '~> 1.44'
2018-10-15 15:54:03 +05:30
-gem 'fog-google', '~> 1.3.3'
+gem 'fog-google', '~> 1.3', '>= 1.3.3'
2018-05-09 12:38:34 +05:30
gem 'fog-local', '~> 0.3'
2018-10-15 15:54:03 +05:30
gem 'fog-openstack', '~> 0.1'
gem 'fog-rackspace', '~> 0.1.1'
2018-06-27 16:13:27 +05:30
@@ -124,32 +124,32 @@
2018-03-18 12:27:51 +05:30
gem 'unf', '~> 0.1.4'
# Seed data
-gem 'seed-fu', '~> 2.3.7'
+gem 'seed-fu', '~> 2.3', '>= 2.3.7'
2016-06-16 12:31:48 +05:30
2016-03-15 21:57:01 +05:30
# Markdown and HTML processing
2018-05-09 12:38:34 +05:30
-gem 'html-pipeline', '~> 2.7.1'
2017-09-10 18:21:32 +05:30
-gem 'deckar01-task_list', '2.0.0'
2018-03-18 12:27:51 +05:30
-gem 'gitlab-markup', '~> 1.6.2'
2018-05-09 12:38:34 +05:30
+gem 'html-pipeline', '~> 2.7', '>= 2.7.1'
2018-03-18 12:27:51 +05:30
+gem 'deckar01-task_list', '2.0'
+gem 'gitlab-markup', '~> 1.6', '>= 1.6.2'
2017-08-17 23:00:15 +05:30
gem 'redcarpet', '~> 3.4'
2018-03-27 20:24:05 +05:30
gem 'commonmarker', '~> 0.17'
2017-08-17 23:00:15 +05:30
-gem 'RedCloth', '~> 4.3.2'
+gem 'RedCloth', '~> 4.3', '>= 4.3.2'
gem 'rdoc', '~> 4.2'
gem 'org-ruby', '~> 0.9.12'
gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1'
2018-05-09 12:38:34 +05:30
-gem 'asciidoctor', '~> 1.5.6'
+gem 'asciidoctor', '~> 1.5', '>= 1.5.6'
gem 'asciidoctor-plantuml', '0.0.8'
2018-06-27 16:13:27 +05:30
gem 'rouge', '~> 3.1'
2017-09-10 18:21:32 +05:30
gem 'truncato', '~> 0.7.9'
-gem 'bootstrap_form', '~> 2.7.0'
2018-03-27 22:47:51 +05:30
-gem 'nokogiri', '~> 1.8.2'
2017-09-10 18:21:32 +05:30
+gem 'bootstrap_form', '~> 2.7'
2018-03-18 12:27:51 +05:30
+gem 'nokogiri', '~> 1.8', '>= 1.8.2'
2016-06-16 12:31:48 +05:30
# Diffs
2017-08-17 23:00:15 +05:30
-gem 'diffy', '~> 3.1.0'
+gem 'diffy', '~> 3.1'
2016-06-16 12:31:48 +05:30
# Application server
group :unicorn do
2016-11-03 15:15:38 +05:30
- gem 'unicorn', '~> 5.1.0'
+ gem 'unicorn', '~> 5.1'
gem 'unicorn-worker-killer', '~> 0.4.4'
2016-06-16 12:31:48 +05:30
end
2018-06-27 16:13:27 +05:30
@@ -162,7 +162,7 @@
2016-06-16 12:31:48 +05:30
# Background jobs
2017-08-17 23:00:15 +05:30
gem 'sidekiq', '~> 5.0'
2017-09-10 18:21:32 +05:30
gem 'sidekiq-cron', '~> 0.6.0'
2016-08-24 20:52:28 +05:30
-gem 'redis-namespace', '~> 1.5.2'
+gem 'redis-namespace', '~> 1.5', '>= 1.5.2'
2017-09-10 18:21:32 +05:30
gem 'sidekiq-limit_fetch', '~> 3.4', require: false
2017-08-17 23:00:15 +05:30
# Cron Parser
2018-10-15 15:54:03 +05:30
@@ -175,39 +175,39 @@
2017-09-10 18:21:32 +05:30
gem 'rainbow', '~> 2.2'
2016-06-16 12:31:48 +05:30
# GitLab settings
-gem 'settingslogic', '~> 2.0.9'
+gem 'settingslogic', '~> 2.0', '>= 2.0.9'
2017-08-17 23:00:15 +05:30
# Linear-time regex library for untrusted regular expressions
2017-09-10 18:21:32 +05:30
-gem 're2', '~> 1.1.1'
+gem 're2', '~> 1.1', '>= 1.1.1'
2017-08-17 23:00:15 +05:30
2016-06-16 12:31:48 +05:30
# Misc
2016-09-13 18:27:13 +05:30
-gem 'version_sorter', '~> 2.1.0'
+gem 'version_sorter', '~> 2.1'
2016-06-16 12:31:48 +05:30
2018-10-15 15:54:03 +05:30
# User agent parsing
gem 'device_detector'
2016-06-16 12:31:48 +05:30
# Cache
2018-03-18 12:27:51 +05:30
-gem 'redis-rails', '~> 5.0.2'
+gem 'redis-rails', '~> 5.0', '>= 5.0.2'
2016-06-16 12:31:48 +05:30
# Redis
gem 'redis', '~> 3.2'
gem 'connection_pool', '~> 2.0'
# HipChat integration
-gem 'hipchat', '~> 1.5.0'
+gem 'hipchat', '~> 1.5'
2017-08-17 23:00:15 +05:30
# JIRA integration
2018-03-18 12:27:51 +05:30
gem 'jira-ruby', '~> 1.4'
2017-08-17 23:00:15 +05:30
2016-06-16 12:31:48 +05:30
# Flowdock integration
2016-09-13 18:27:13 +05:30
-gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
+gem 'gitlab-flowdock-git-hook', '~> 1.0', '>= 1.0.1'
# Gemnasium integration
2016-08-24 20:52:28 +05:30
gem 'gemnasium-gitlab-service', '~> 0.2'
2016-06-16 12:31:48 +05:30
# Slack integration
2017-08-17 23:00:15 +05:30
-gem 'slack-notifier', '~> 1.5.1'
+gem 'slack-notifier', '~> 1.5', '>= 1.5.1'
2016-06-16 12:31:48 +05:30
# Asana integration
2017-08-17 23:00:15 +05:30
gem 'asana', '~> 0.6.0'
2018-10-15 15:54:03 +05:30
@@ -219,11 +219,11 @@
2018-05-09 12:38:34 +05:30
gem 'kubeclient', '~> 3.0'
2017-08-17 23:00:15 +05:30
2016-06-16 12:31:48 +05:30
# d3
-gem 'd3_rails', '~> 3.5.0'
+gem 'd3_rails', '~> 3.5'
# Sanitize user input
2018-06-27 16:13:27 +05:30
-gem 'sanitize', '~> 4.6.5'
2016-06-16 12:31:48 +05:30
-gem 'babosa', '~> 1.0.2'
2018-06-27 16:13:27 +05:30
+gem 'sanitize', '~> 4.6', '>= 4.6.5'
2016-06-16 12:31:48 +05:30
+gem 'babosa', '~> 1.0', '>= 1.0.2'
# Sanitizes SVG input
2018-04-04 21:51:30 +05:30
gem 'loofah', '~> 2.2'
2018-10-15 15:54:03 +05:30
@@ -232,13 +232,13 @@
2018-05-09 12:38:34 +05:30
gem 'licensee', '~> 8.9'
2016-06-16 12:31:48 +05:30
# Protect against bruteforcing
2017-08-17 23:00:15 +05:30
-gem 'rack-attack', '~> 4.4.1'
+gem 'rack-attack', '~> 4.4', '>= 4.4.1'
2016-06-16 12:31:48 +05:30
# Ace editor
2016-09-13 18:27:13 +05:30
-gem 'ace-rails-ap', '~> 4.1.0'
+gem 'ace-rails-ap', '~> 4.1'
2016-06-16 12:31:48 +05:30
# Keyboard shortcuts
-gem 'mousetrap-rails', '~> 1.4.6'
2016-08-24 20:52:28 +05:30
+gem 'mousetrap-rails', '~> 1.4', '>= 1.4.6'
2016-06-16 12:31:48 +05:30
# Detect and convert string character encoding
2018-03-18 12:27:51 +05:30
gem 'charlock_holmes', '~> 0.7.5'
2018-10-15 15:54:03 +05:30
@@ -253,42 +253,42 @@
2017-08-17 23:00:15 +05:30
gem 'webpack-rails', '~> 0.9.10'
gem 'rack-proxy', '~> 0.6.0'
2016-06-16 12:31:48 +05:30
2016-11-03 15:15:38 +05:30
-gem 'sass-rails', '~> 5.0.6'
2016-08-24 20:52:28 +05:30
-gem 'uglifier', '~> 2.7.2'
2017-01-15 13:33:34 +05:30
+gem 'sass-rails', '~> 5.0', '>= 5.0.6'
2017-08-17 23:00:15 +05:30
+gem 'uglifier', '~> 2.7', '>= 2.7.2'
2018-03-18 12:27:51 +05:30
-gem 'addressable', '~> 2.5.2'
2017-08-17 23:00:15 +05:30
-gem 'bootstrap-sass', '~> 3.3.0'
2018-03-18 12:27:51 +05:30
+gem 'addressable', '~> 2.5', '>= 2.5.2'
2017-08-17 23:00:15 +05:30
+gem 'bootstrap-sass', '~> 3.3'
gem 'font-awesome-rails', '~> 4.7'
2017-09-10 18:21:32 +05:30
gem 'gemojione', '~> 3.3'
2017-08-17 23:00:15 +05:30
-gem 'gon', '~> 6.1.0'
2016-06-16 12:31:48 +05:30
-gem 'jquery-atwho-rails', '~> 1.3.2'
2017-08-17 23:00:15 +05:30
+gem 'gon', '~> 6.1'
2016-11-03 18:18:01 +05:30
+gem 'jquery-atwho-rails', '~> 1.3', '>= 1.3.2'
2017-08-17 23:00:15 +05:30
gem 'request_store', '~> 1.3'
-gem 'select2-rails', '~> 3.5.9'
-gem 'virtus', '~> 1.0.1'
+gem 'select2-rails', '~> 3.5', '>= 3.5.9'
+gem 'virtus', '~> 1.0', '>= 1.0.1'
gem 'base32', '~> 0.3.0'
2016-06-16 12:31:48 +05:30
# Sentry integration
2018-05-09 12:38:34 +05:30
gem 'sentry-raven', '~> 2.7'
2016-06-16 12:31:48 +05:30
2017-09-10 18:21:32 +05:30
-gem 'premailer-rails', '~> 1.9.7'
+gem 'premailer-rails', '~> 1.9', '>= 1.9.7'
2016-06-16 12:31:48 +05:30
2017-08-17 23:00:15 +05:30
# I18n
2017-09-10 18:21:32 +05:30
gem 'ruby_parser', '~> 3.8', require: false
2018-05-09 12:38:34 +05:30
gem 'rails-i18n', gem_versions['rails-i18n']
2017-08-17 23:00:15 +05:30
-gem 'gettext_i18n_rails', '~> 1.8.0'
+gem 'gettext_i18n_rails', '~> 1.8'
2018-05-09 12:38:34 +05:30
gem 'gettext_i18n_rails_js', '~> 1.3'
gem 'gettext', '~> 3.2.2', require: false, group: :development
2018-03-18 12:27:51 +05:30
-gem 'batch-loader', '~> 1.2.1'
+gem 'batch-loader', '~> 1.2', '>= 1.2.1'
2016-06-16 12:31:48 +05:30
2017-09-10 18:21:32 +05:30
# Perf bar
-gem 'peek', '~> 1.0.1'
+gem 'peek', '~> 1.0', '>= 1.0.1'
gem 'peek-gc', '~> 0.0.2'
-gem 'peek-mysql2', '~> 1.1.0', group: :mysql
-gem 'peek-pg', '~> 1.3.0', group: :postgres
+gem 'peek-mysql2', '~> 1.1', group: :mysql
+gem 'peek-pg', '~> 1.3', group: :postgres
gem 'peek-rblineprof', '~> 0.2.0'
-gem 'peek-redis', '~> 1.2.0'
-gem 'peek-sidekiq', '~> 1.0.3'
+gem 'peek-redis', '~> 1.2'
+gem 'peek-sidekiq', '~> 1.0', '>= 1.0.3'
2017-08-19 19:09:35 +05:30
2017-09-10 18:21:32 +05:30
# Metrics
group :metrics do
2018-10-15 15:54:03 +05:30
@@ -398,15 +398,15 @@
gem 'oauth2', '~> 1.4'
# Health check
-gem 'health_check', '~> 2.6.0'
+gem 'health_check', '~> 2.6'
2017-08-19 19:09:35 +05:30
# System information
-gem 'vmstat', '~> 2.3.0'
-gem 'sys-filesystem', '~> 1.1.6'
+gem 'vmstat', '~> 2.3'
+gem 'sys-filesystem', '~> 1.1', '>= 1.1.6'
2017-09-10 18:21:32 +05:30
# SSH host key support
2018-05-09 12:38:34 +05:30
-gem 'net-ssh', '~> 4.2.0'
2018-03-27 20:24:05 +05:30
-gem 'sshkey', '~> 1.9.0'
2018-05-09 12:38:34 +05:30
+gem 'net-ssh', '~> 4.2'
2018-03-27 20:24:05 +05:30
+gem 'sshkey', '~> 1.9'
2017-09-10 18:21:32 +05:30
# Required for ED25519 SSH host key support
group :ed25519 do
2018-10-15 15:54:03 +05:30
@@ -417,12 +417,12 @@
2018-05-09 12:38:34 +05:30
# Gitaly GRPC client
2018-10-15 15:54:03 +05:30
gem 'gitaly-proto', '~> 0.99.0', require: 'gitaly'
2018-06-03 20:19:11 +05:30
-gem 'grpc', '~> 1.11.0'
+gem 'grpc', '~> 1.11'
2018-05-09 12:38:34 +05:30
2018-03-27 20:24:05 +05:30
# Locked until https://github.com/google/protobuf/issues/4210 is closed
2018-05-09 12:38:34 +05:30
-gem 'google-protobuf', '= 3.5.1'
+gem 'google-protobuf', '~> 3.5', '>= 3.5.1'
2018-03-27 20:24:05 +05:30
-gem 'toml-rb', '~> 1.0.0', require: false
+gem 'toml-rb', '~> 1.0', require: false
# Feature toggles
2018-05-09 12:38:34 +05:30
gem 'flipper', '~> 0.13.0'
2018-10-15 15:54:03 +05:30
@@ -434,4 +434,4 @@
2018-03-18 12:27:51 +05:30
gem 'grape_logging', '~> 1.7'
# Asset synchronization
-gem 'asset_sync', '~> 2.2.0'
+gem 'asset_sync', '~> 2.2'