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

344 lines
9.3 KiB
Diff
Raw Normal View History

2019-05-04 01:01:32 +05:30
We should be able to update minor versions of stable libs without breaking
2016-04-05 22:57:46 +05:30
gitlab Gemfile
2017-01-15 13:33:34 +05:30
--- a/Gemfile
+++ b/Gemfile
@@ -10,10 +10,10 @@
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
-gem 'default_value_for', '~> 3.2.0'
+gem 'default_value_for', '~> 3.2'
# Supported DBs
gem 'pg', '~> 1.1'
@@ -28,25 +28,25 @@
2018-05-09 12:38:34 +05:30
gem 'doorkeeper', '~> 4.3'
2018-11-08 20:39:57 +05:30
gem 'doorkeeper-openid_connect', '~> 1.5'
2018-05-09 12:38:34 +05:30
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'
+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'
+gem 'omniauth-gitlab', '~> 1.0', '>= 1.0.2'
2019-02-15 18:28:22 +05:30
gem 'omniauth-google-oauth2', '~> 0.6.0'
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'
2018-11-08 20:39:57 +05:30
-gem 'omniauth-shibboleth', '~> 1.3.0'
+gem 'omniauth-shibboleth', '~> 1.3'
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'
2018-11-08 20:39:57 +05:30
gem 'omniauth-authentiq', '~> 0.3.3'
gem 'omniauth_openid_connect', '~> 0.3.1'
2019-07-31 23:45:35 +05:30
gem "omniauth-ultraauth", '~> 0.0.2'
-gem 'omniauth-salesforce', '~> 1.0.5'
2019-05-18 00:59:38 +05:30
-gem 'rack-oauth2', '~> 1.9.3'
2019-02-15 18:28:22 +05:30
-gem 'jwt', '~> 2.1.0'
+gem 'omniauth-salesforce', '~> 1.0', '>= 1.0.5'
+gem 'rack-oauth2', '~> 1.9', '>= 1.9.3'
2019-02-15 18:28:22 +05:30
+gem 'jwt', '~> 2.1'
2016-06-16 12:31:48 +05:30
2019-12-04 21:09:36 +05:30
# Kerberos authentication. EE-only
gem 'gssapi', group: :kerberos
@@ -57,41 +57,41 @@
gem 'invisible_captcha', '~> 0.12.1'
2016-06-16 12:31:48 +05:30
# 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'
2019-02-15 18:28:22 +05:30
-gem 'rubyzip', '~> 1.2.2', require: 'zip'
+gem 'validates_hostname', '~> 1.0', '>= 1.0.6'
+gem 'rubyzip', '~> 1.2', '>= 1.2.2', require: 'zip'
# GitLab Pages letsencrypt support
-gem 'acme-client', '~> 2.0.2'
+gem 'acme-client', '~> 2.0', '>= 2.0.2'
2016-08-25 14:58:19 +05:30
2017-08-17 23:00:15 +05:30
# Browser detection
2018-11-20 21:00:51 +05:30
gem 'browser', '~> 2.5'
2019-02-15 18:28:22 +05:30
# GPG
-gem 'gpgme', '~> 2.0.18'
+gem 'gpgme', '~> 2.0', '>= 2.0.18'
2019-02-15 18:28:22 +05:30
2018-12-13 14:23:24 +05:30
# LDAP Auth
# GitLab fork with several improvements to original library. For full list of changes
# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
2019-05-18 00:59:38 +05:30
-gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap'
+gem 'gitlab_omniauth-ldap', '~> 2.1', '>= 2.1.1', require: 'omniauth-ldap'
2018-12-13 14:23:24 +05:30
gem 'net-ldap'
2016-06-16 12:31:48 +05:30
# API
2019-02-15 18:28:22 +05:30
-gem 'grape', '~> 1.1.0'
+gem 'grape', '~> 1.1'
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'
2018-11-08 20:39:57 +05:30
# GraphQL API
2019-12-04 21:09:36 +05:30
-gem 'graphql', '~> 1.9.11'
+gem 'graphql', '~> 1.9', '>= 1.9.11'
2019-12-21 21:33:11 +05:30
# NOTE: graphiql-rails v1.5+ doesn't work: https://gitlab.com/gitlab-org/gitlab/issues/31771
2019-12-04 21:09:36 +05:30
# TODO: remove app/views/graphiql/rails/editors/show.html.erb when https://github.com/rmosolgo/graphiql-rails/pull/71 is released:
2019-12-21 21:33:11 +05:30
# https://gitlab.com/gitlab-org/gitlab/issues/31747
2018-12-06 11:33:01 +05:30
-gem 'graphiql-rails', '~> 1.4.10'
2019-07-31 23:45:35 +05:30
-gem 'apollo_upload_server', '~> 2.0.0.beta3'
+gem 'graphiql-rails', '~> 1.4', '>= 1.4.10'
+gem 'apollo_upload_server', '>= 2.0.0.beta3'
gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
2018-11-08 20:39:57 +05:30
2018-03-18 12:27:51 +05:30
# Disable strong_params so that Mash does not respond to :permitted?
2019-12-04 21:09:36 +05:30
@@ -101,7 +101,7 @@
2017-09-10 18:21:32 +05:30
gem 'kaminari', '~> 1.0'
2016-09-13 18:27:13 +05:30
# HAML
2018-11-18 11:20:06 +05:30
-gem 'hamlit', '~> 2.8.8'
+gem 'hamlit', '~> 2.8', '>= 2.8.8'
2016-09-13 18:27:13 +05:30
# Files attachments
2019-02-15 18:28:22 +05:30
gem 'carrierwave', '~> 1.3'
2019-12-04 21:09:36 +05:30
@@ -111,7 +111,7 @@
gem 'fog-aws', '~> 3.5'
2019-05-18 00:59:38 +05:30
# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
# Also see config/initializers/fog_core_patch.rb.
-gem 'fog-core', '= 2.1.0'
+gem 'fog-core', '= 2.1'
2019-12-04 21:09:36 +05:30
gem 'fog-google', '~> 1.9'
2019-05-18 00:59:38 +05:30
gem 'fog-local', '~> 0.6'
gem 'fog-openstack', '~> 1.0'
2019-12-05 19:14:26 +05:30
@@ -125,46 +125,46 @@
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
2019-12-04 21:09:36 +05:30
# Search
gem 'elasticsearch-model', '~> 0.1.9'
2019-12-05 19:14:26 +05:30
gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation'
-gem 'elasticsearch-api', '5.0.3'
+gem 'elasticsearch-api', '~> 5.0', '>= 5.0.3'
gem 'aws-sdk'
gem 'faraday_middleware-aws-signers-v4'
2019-12-04 21:09:36 +05:30
2016-03-15 21:57:01 +05:30
# Markdown and HTML processing
2018-11-08 20:39:57 +05:30
gem 'html-pipeline', '~> 2.8'
-gem 'deckar01-task_list', '2.2.0'
2019-05-18 00:59:38 +05:30
-gem 'gitlab-markup', '~> 1.7.0'
2018-12-06 11:33:01 +05:30
-gem 'github-markup', '~> 1.7.0', require: 'github/markup'
2019-07-31 23:45:35 +05:30
+gem 'deckar01-task_list', '2.2'
2019-05-18 00:59:38 +05:30
+gem 'gitlab-markup', '~> 1.7'
2018-12-06 11:33:01 +05:30
+gem 'github-markup', '~> 1.7', require: 'github/markup'
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'
2018-11-08 20:39:57 +05:30
gem 'rdoc', '~> 6.0'
2017-08-17 23:00:15 +05:30
gem 'org-ruby', '~> 0.9.12'
gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1'
-gem 'asciidoctor', '~> 2.0.10'
+gem 'asciidoctor', '~> 2.0', '>= 2.0.10'
gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
gem 'asciidoctor-plantuml', '0.0.9'
2019-12-22 23:14:24 +05:30
-gem 'rouge', '~> 3.11.0'
+gem 'rouge', '~> 3.11'
gem 'truncato', '~> 0.7.11'
2019-05-18 00:59:38 +05:30
-gem 'bootstrap_form', '~> 4.2.0'
-gem 'nokogiri', '~> 1.10.4'
2019-05-18 00:59:38 +05:30
+gem 'bootstrap_form', '~> 4.2'
+gem 'nokogiri', '~> 1.10', '>= 1.10.4'
2018-12-13 14:23:24 +05:30
gem 'escape_utils', '~> 1.1'
2016-06-16 12:31:48 +05:30
2018-11-08 20:39:57 +05:30
# Calendar rendering
gem 'icalendar'
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
2019-07-31 23:45:35 +05:30
-gem 'rack', '~> 2.0.7'
+gem 'rack', '~> 2.0', '>= 2.0.7'
2018-12-24 00:09:40 +05:30
2016-06-16 12:31:48 +05:30
group :unicorn do
2019-05-18 00:59:38 +05:30
- gem 'unicorn', '~> 5.4.1'
+ gem 'unicorn', '~> 5.4', '>= 5.4.1'
2016-11-03 15:15:38 +05:30
gem 'unicorn-worker-killer', '~> 0.4.4'
2016-06-16 12:31:48 +05:30
end
2019-12-04 21:09:36 +05:30
@@ -181,13 +181,13 @@
2019-05-18 00:59:38 +05:30
gem 'acts-as-taggable-on', '~> 6.0'
2018-12-06 11:33:01 +05:30
2016-06-16 12:31:48 +05:30
# Background jobs
2019-07-31 23:45:35 +05:30
-gem 'sidekiq', '~> 5.2.7'
+gem 'sidekiq', '~> 5.2', '>= 5.2.7'
gem 'sidekiq-cron', '~> 1.0'
2018-11-08 20:39:57 +05:30
-gem 'redis-namespace', '~> 1.6.0'
+gem 'redis-namespace', '~> 1.6'
2019-12-04 21:09:36 +05:30
gem 'gitlab-sidekiq-fetcher', '0.5.2', require: 'sidekiq-reliable-fetch'
2017-08-17 23:00:15 +05:30
# Cron Parser
-gem 'fugit', '~> 1.2.1'
+gem 'fugit', '~> 1.2', '>= 1.2.1'
# HTTP requests
gem 'httparty', '~> 0.16.4'
2019-12-04 21:09:36 +05:30
@@ -199,14 +199,14 @@
2018-11-08 20:39:57 +05:30
gem 'ruby-progressbar'
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
2019-05-18 00:59:38 +05:30
-gem 'version_sorter', '~> 2.2.4'
+gem 'version_sorter', '~> 2.2', '>= 2.2.4'
2016-06-16 12:31:48 +05:30
2018-11-20 21:00:51 +05:30
# Export Ruby Regex to Javascript
gem 'js_regex', '~> 3.1'
2019-12-04 21:09:36 +05:30
@@ -219,13 +219,13 @@
gem 'connection_pool', '~> 2.0'
2018-10-15 15:54:03 +05:30
# Redis session store
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
# Discord integration
2018-12-24 00:09:40 +05:30
gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
2016-06-16 12:31:48 +05:30
# HipChat integration
-gem 'hipchat', '~> 1.5.0'
+gem 'hipchat', '~> 1.5'
# Jira integration
2019-12-04 21:09:36 +05:30
gem 'jira-ruby', '~> 1.7'
@@ -235,7 +235,7 @@
2018-12-13 14:23:24 +05:30
gem 'flowdock', '~> 0.7'
2016-09-13 18:27:13 +05:30
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
2018-11-18 11:20:06 +05:30
# Hangouts Chat integration
gem 'hangouts-chat', '~> 0.0.5'
2019-12-04 21:09:36 +05:30
@@ -247,11 +247,11 @@
2018-11-08 20:39:57 +05:30
gem 'ruby-fogbugz', '~> 0.2.1'
2017-08-17 23:00:15 +05:30
2018-11-08 20:39:57 +05:30
# Kubernetes integration
2019-12-04 21:09:36 +05:30
-gem 'kubeclient', '~> 4.4.0'
+gem 'kubeclient', '~> 4.4'
2016-06-16 12:31:48 +05:30
# Sanitize user input
2018-11-18 11:20:06 +05:30
gem 'sanitize', '~> 4.6'
2016-06-16 12:31:48 +05:30
-gem 'babosa', '~> 1.0.2'
2019-05-18 00:59:38 +05:30
+gem 'babosa', '~> 1.0', '>= 1.0.2'
2016-06-16 12:31:48 +05:30
# Sanitizes SVG input
2018-04-04 21:51:30 +05:30
gem 'loofah', '~> 2.2'
2019-12-04 21:09:36 +05:30
@@ -260,10 +260,10 @@
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
# Detect and convert string character encoding
2018-03-18 12:27:51 +05:30
gem 'charlock_holmes', '~> 0.7.5'
2019-12-04 21:09:36 +05:30
@@ -281,10 +281,10 @@
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
2019-07-31 23:45:35 +05:30
-gem 'sassc-rails', '~> 2.1.0'
2019-02-15 18:28:22 +05:30
-gem 'uglifier', '~> 2.7.2'
2019-07-31 23:45:35 +05:30
+gem 'sassc-rails', '~> 2.1'
+gem 'uglifier', '~> 2.7', '>=2.7.2'
2017-08-17 23:00:15 +05:30
2018-03-18 12:27:51 +05:30
-gem 'addressable', '~> 2.5.2'
+gem 'addressable', '~> 2.5', '>=2.5.2'
2017-08-17 23:00:15 +05:30
gem 'font-awesome-rails', '~> 4.7'
2017-09-10 18:21:32 +05:30
gem 'gemojione', '~> 3.3'
2018-11-08 20:39:57 +05:30
gem 'gon', '~> 6.2'
2019-12-04 21:09:36 +05:30
@@ -296,7 +296,7 @@
2016-06-16 12:31:48 +05:30
# Sentry integration
gem 'sentry-raven', '~> 2.9'
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
2019-07-31 23:45:35 +05:30
# LabKit: Tracing and Correlation
2019-12-04 21:09:36 +05:30
gem 'gitlab-labkit', '~> 0.5'
@@ -304,11 +304,11 @@
2017-08-17 23:00:15 +05:30
# I18n
2017-09-10 18:21:32 +05:30
gem 'ruby_parser', '~> 3.8', require: false
2019-02-15 18:28:22 +05:30
gem 'rails-i18n', '~> 5.1'
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'
2019-02-15 18:28:22 +05:30
-gem 'gettext', '~> 3.2.2', require: false, group: :development
+gem 'gettext', '~> 3.2', '>= 3.2.2', require: false, group: :development
2018-03-18 12:27:51 +05:30
2019-07-31 23:45:35 +05:30
-gem 'batch-loader', '~> 1.4.0'
+gem 'batch-loader', '~> 1.4'
2016-06-16 12:31:48 +05:30
2017-09-10 18:21:32 +05:30
# Perf bar
2019-12-21 21:33:11 +05:30
# https://gitlab.com/gitlab-org/gitlab/issues/13996
2019-12-04 21:09:36 +05:30
@@ -426,11 +426,11 @@
2018-10-15 15:54:03 +05:30
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'
2019-12-04 21:09:36 +05:30
# NTP client
gem 'net-ntp'
@@ -446,13 +446,13 @@
2018-11-20 21:00:51 +05:30
end
2018-05-09 12:38:34 +05:30
# Gitaly GRPC protocol definitions
2019-12-21 21:33:11 +05:30
-gem 'gitaly', '~> 1.65.0'
+gem 'gitaly', '~> 1.65'
2019-07-07 11:29:07 +05:30
2019-07-31 23:45:35 +05:30
-gem 'grpc', '~> 1.19.0'
+gem 'grpc', '~> 1.19'
2018-12-13 14:23:24 +05:30
2019-07-31 23:45:35 +05:30
-gem 'google-protobuf', '~> 3.7.1'
+gem 'google-protobuf', '~> 3.7', '>= 3.7.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'