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

Refresh patches

Browse source
This commit is contained in:
Pirate Praveen 2018-03-18 12:27:51 +05:30
parent 59f9a1be02
commit d9f41d8139
25 changed files with 162 additions and 196 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
debian/patches/0005-use-debian-omniauth-ldap.patch vendored
View file

@ -1,14 +0,0 @@
Debian package contains gitlab patches
Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/13280
--- a/Gemfile
+++ b/Gemfile
@@ -64,7 +64,7 @@
# 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
-gem 'gitlab_omniauth-ldap', '~> 2.0.3', require: 'omniauth-ldap'
+gem 'omniauth-ldap', '~> 1.0.4', require: 'omniauth-ldap'
gem 'net-ldap'
# Git Wiki

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

@ -6,9 +6,8 @@ gitlab Gemfile
@@ -1,59 +1,59 @@
source 'https://rubygems.org'
-gem 'rails', '4.2.8'
gem 'rails', '4.2.10'
-gem 'rails-deprecated_sanitizer', '~> 1.0.3'
+gem 'rails', '~> 4.2', '>= 4.2.8'
+gem 'rails-deprecated_sanitizer', '~> 1.0', '>= 1.0.3'
# Responders respond_to and respond_with
@ -22,26 +21,26 @@ gitlab Gemfile
+gem 'default_value_for', '~> 3.0'
# Supported DBs
gem 'mysql2', '~> 0.4.5', group: :mysql
gem 'mysql2', '~> 0.4.10', group: :mysql
gem 'pg', '~> 0.18.2', group: :postgres
gem 'rugged', '~> 0.26.0'
-gem 'grape-route-helpers', '~> 2.0.0'
+gem 'grape-route-helpers', '~> 2.0'
-gem 'grape-route-helpers', '~> 2.1.0'
+gem 'grape-route-helpers', '~> 2.1'
gem 'faraday', '~> 0.12'
# Authentication libraries
gem 'devise', '~> 4.2'
-gem 'doorkeeper', '~> 4.2.0'
-gem 'doorkeeper-openid_connect', '~> 1.1.0'
-gem 'doorkeeper-openid_connect', '~> 1.2.0'
-gem 'omniauth', '~> 1.4.2'
-gem 'omniauth-auth0', '~> 1.4.1'
+gem 'doorkeeper', '~> 4.2'
+gem 'doorkeeper-openid_connect', '~> 1.1'
+gem 'doorkeeper-openid_connect', '~> 1.2'
+gem 'omniauth', '~> 1.4', '>= 1.4.2'
+gem 'omniauth-auth0', '~> 1.4', '>= 1.4.1'
gem 'omniauth-azure-oauth2', '~> 0.0.6'
gem 'omniauth-azure-oauth2', '~> 0.0.9'
-gem 'omniauth-cas3', '~> 1.1.4'
-gem 'omniauth-facebook', '~> 4.0.0'
-gem 'omniauth-github', '~> 1.1.1'
@ -49,8 +48,8 @@ gitlab Gemfile
+gem 'omniauth-cas3', '~> 1.1', '>= 1.1.4'
+gem 'omniauth-facebook', '~> 4.0'
+gem 'omniauth-github', '~> 1.1', '>= 1.1.1'
+gem 'omniauth-gitlab', '~> 1.0', '>= 1.0.2'
gem 'omniauth-google-oauth2', '~> 0.4.1'
+gem 'omniauth-gitlab', '~> 1.1', '>= 1.0.2'
gem 'omniauth-google-oauth2', '~> 0.5.2'
gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
gem 'omniauth-oauth2-generic', '~> 0.2.2'
-gem 'omniauth-saml', '~> 1.7.0'
@ -85,16 +84,7 @@ gitlab Gemfile
# Browser detection
gem 'browser', '~> 2.2'
@@ -64,7 +64,7 @@
# 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
-gem 'omniauth-ldap', '~> 1.0.4', require: 'omniauth-ldap'
+gem 'omniauth-ldap', '~> 1.0', '>= 1.0.4', require: 'omniauth-ldap'
gem 'net-ldap'
# Git Wiki
@@ -73,7 +73,7 @@
@@ -81,12 +81,12 @@
gem 'gollum-rugged_adapter', '~> 0.4.4', require: false
# Language detection
@ -102,8 +92,14 @@ gitlab Gemfile
+gem 'github-linguist', '~> 4.7', require: 'linguist'
# API
gem 'grape', '~> 0.19.2'
@@ -87,7 +87,7 @@
gem 'grape', '~> 1.0'
gem 'grape-entity', '~> 0.6.0'
-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'
@@ -95,7 +95,7 @@
gem 'kaminari', '~> 1.0'
# HAML
@ -111,17 +107,21 @@ gitlab Gemfile
+gem 'hamlit', '~> 2.6', '>= 2.6.1'
# Files attachments
gem 'carrierwave', '~> 1.1'
@@ -114,35 +114,35 @@
gem 'seed-fu', '~> 2.3.5'
gem 'carrierwave', '~> 1.2'
@@ -119,31 +119,31 @@
gem 'unf', '~> 0.1.4'
# Seed data
-gem 'seed-fu', '~> 2.3.7'
+gem 'seed-fu', '~> 2.3', '>= 2.3.7'
# Markdown and HTML processing
-gem 'html-pipeline', '~> 1.11.0'
-gem 'deckar01-task_list', '2.0.0'
-gem 'gitlab-markup', '~> 1.5.1'
-gem 'gitlab-markup', '~> 1.6.2'
+gem 'html-pipeline', '~> 1.11'
+gem 'deckar01-task_list', '~> 2.0'
+gem 'gitlab-markup', '~> 1.5', '>= 1.5.1'
+gem 'deckar01-task_list', '2.0'
+gem 'gitlab-markup', '~> 1.6', '>= 1.6.2'
gem 'redcarpet', '~> 3.4'
-gem 'RedCloth', '~> 4.3.2'
+gem 'RedCloth', '~> 4.3', '>= 4.3.2'
@ -135,9 +135,9 @@ gitlab Gemfile
gem 'rouge', '~> 2.0'
gem 'truncato', '~> 0.7.9'
-gem 'bootstrap_form', '~> 2.7.0'
-gem 'nokogiri', '~> 1.8.0'
-gem 'nokogiri', '~> 1.8.2'
+gem 'bootstrap_form', '~> 2.7'
+gem 'nokogiri', '~> 1.8'
+gem 'nokogiri', '~> 1.8', '>= 1.8.2'
# Diffs
-gem 'diffy', '~> 3.1.0'
@ -150,15 +150,7 @@ gitlab Gemfile
gem 'unicorn-worker-killer', '~> 0.4.4'
end
# State machine
gem 'state_machines-activerecord', '~> 0.4.0'
# Run events after state machine commits
-gem 'after_commit_queue', '~> 1.3.0'
+gem 'after_commit_queue', '~> 1.3'
# Issue tags
gem 'acts-as-taggable-on', '~> 4.0'
@@ -150,7 +150,7 @@
@@ -156,7 +156,7 @@
# Background jobs
gem 'sidekiq', '~> 5.0'
gem 'sidekiq-cron', '~> 0.6.0'
@ -167,7 +159,7 @@ gitlab Gemfile
gem 'sidekiq-limit_fetch', '~> 3.4', require: false
# Cron Parser
@@ -163,36 +163,36 @@
@@ -169,36 +169,36 @@
gem 'rainbow', '~> 2.2'
# GitLab settings
@ -184,8 +176,8 @@ gitlab Gemfile
+gem 'version_sorter', '~> 2.1'
# Cache
-gem 'redis-rails', '~> 5.0.1'
+gem 'redis-rails', '~> 5.0', '>= 5.0.1'
-gem 'redis-rails', '~> 5.0.2'
+gem 'redis-rails', '~> 5.0', '>= 5.0.2'
# Redis
gem 'redis', '~> 3.2'
@ -196,8 +188,7 @@ gitlab Gemfile
+gem 'hipchat', '~> 1.5'
# JIRA integration
-gem 'jira-ruby', '~> 1.1.2'
+gem 'jira-ruby', '~> 1.1', '>= 1.1.2'
gem 'jira-ruby', '~> 1.4'
# Flowdock integration
-gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
@ -212,7 +203,7 @@ gitlab Gemfile
# Asana integration
gem 'asana', '~> 0.6.0'
@@ -201,38 +201,38 @@
@@ -207,35 +207,35 @@
gem 'ruby-fogbugz', '~> 0.2.1'
# Kubernetes integration
@ -223,10 +214,6 @@ gitlab Gemfile
-gem 'd3_rails', '~> 3.5.0'
+gem 'd3_rails', '~> 3.5'
# underscore-rails
-gem 'underscore-rails', '~> 1.8.0'
+gem 'underscore-rails', '~> 1.8'
# Sanitize user input
gem 'sanitize', '~> 2.0'
-gem 'babosa', '~> 1.0.2'
@ -253,15 +240,15 @@ gitlab Gemfile
+gem 'mousetrap-rails', '~> 1.4', '>= 1.4.6'
# Detect and convert string character encoding
gem 'charlock_holmes', '~> 0.7.3'
gem 'charlock_holmes', '~> 0.7.5'
# Faster JSON
-gem 'oj', '~> 2.17.4'
+gem 'oj', '~> 2.17', '>= 2.17.4'
# Parse time & duration
gem 'chronic', '~> 0.10.2'
@@ -241,43 +241,43 @@
# Faster blank
gem 'fast_blank'
@@ -247,45 +247,45 @@
gem 'webpack-rails', '~> 0.9.10'
gem 'rack-proxy', '~> 0.6.0'
@ -270,18 +257,18 @@ gitlab Gemfile
+gem 'sass-rails', '~> 5.0', '>= 5.0.6'
+gem 'uglifier', '~> 2.7', '>= 2.7.2'
-gem 'addressable', '~> 2.3.8'
-gem 'addressable', '~> 2.5.2'
-gem 'bootstrap-sass', '~> 3.3.0'
+gem 'addressable', '~> 2.3', '>= 2.3.8'
+gem 'addressable', '~> 2.5', '>= 2.5.2'
+gem 'bootstrap-sass', '~> 3.3'
gem 'font-awesome-rails', '~> 4.7'
gem 'gemojione', '~> 3.3'
-gem 'gon', '~> 6.1.0'
-gem 'jquery-atwho-rails', '~> 1.3.2'
-gem 'jquery-rails', '~> 4.1.0'
-gem 'jquery-rails', '~> 4.3.1'
+gem 'gon', '~> 6.1'
+gem 'jquery-atwho-rails', '~> 1.3', '>= 1.3.2'
+gem 'jquery-rails', '~> 4.1'
+gem 'jquery-rails', '~> 4.3', '>= 4.3.1'
gem 'request_store', '~> 1.3'
-gem 'select2-rails', '~> 3.5.9'
-gem 'virtus', '~> 1.0.1'
@ -301,10 +288,14 @@ gitlab Gemfile
-gem 'rails-i18n', '~> 4.0.9'
-gem 'gettext_i18n_rails', '~> 1.8.0'
-gem 'gettext_i18n_rails_js', '~> 1.2.0'
-gem 'gettext', '~> 3.2.2', require: false, group: :development
+gem 'rails-i18n', '~> 4.0', '>= 4.0.9'
+gem 'gettext_i18n_rails', '~> 1.8'
+gem 'gettext_i18n_rails_js', '~> 1.2'
gem 'gettext', '~> 3.2.2', require: false, group: :development
+gem 'gettext', '~> 3.2', '>= 3.2.2', require: false, group: :development
-gem 'batch-loader', '~> 1.2.1'
+gem 'batch-loader', '~> 1.2', '>= 1.2.1'
# Perf bar
-gem 'peek', '~> 1.0.1'
@ -326,8 +317,8 @@ gitlab Gemfile
# Metrics
group :metrics do
@@ -365,7 +365,7 @@
gem 'concurrent-ruby', '~> 1.0.5'
@@ -380,7 +380,7 @@
gem 'test-prof', '~> 0.2.5'
end
-gem 'octokit', '~> 4.6.2'
@ -335,13 +326,9 @@ gitlab Gemfile
gem 'mail_room', '~> 0.9.1'
@@ -378,17 +378,17 @@
@@ -393,14 +393,14 @@
gem 'oauth2', '~> 1.4'
# Soft deletion
-gem 'paranoia', '~> 2.3.1'
+gem 'paranoia', '~> 2.3', '>= 2.3.1'
# Health check
-gem 'health_check', '~> 2.6.0'
+gem 'health_check', '~> 2.6'
@ -358,3 +345,9 @@ gitlab Gemfile
# Required for ED25519 SSH host key support
group :ed25519 do
@@ -426,4 +426,4 @@
gem 'grape_logging', '~> 1.7'
# Asset synchronization
-gem 'asset_sync', '~> 2.2.0'
+gem 'asset_sync', '~> 2.2'

10
debian/patches/0100-remove-development-test.patch vendored
View file

@ -2,15 +2,15 @@ Bundler will fail when it can't find these locally
--- a/Gemfile
+++ b/Gemfile
@@ -266,7 +266,6 @@
@@ -272,7 +272,6 @@
gem 'rails-i18n', '~> 4.0', '>= 4.0.9'
gem 'gettext_i18n_rails', '~> 1.8'
gem 'gettext_i18n_rails_js', '~> 1.2'
-gem 'gettext', '~> 3.2.2', require: false, group: :development
-gem 'gettext', '~> 3.2', '>= 3.2.2', require: false, group: :development
# Perf bar
gem 'peek', '~> 1.0', '>= 1.0.1'
@@ -290,21 +289,6 @@
gem 'batch-loader', '~> 1.2', '>= 1.2.1'
@@ -298,21 +297,6 @@
gem 'raindrops', '~> 0.18'
end

10
debian/patches/0108-make-mysql-optional.patch vendored
View file

@ -13,11 +13,11 @@ Subject: [PATCH] allow specifying DB choice via ENV variable
gem 'default_value_for', '~> 3.0'
# Supported DBs
-gem 'mysql2', '~> 0.4.5', group: :mysql
-gem 'mysql2', '~> 0.4.10', group: :mysql
-gem 'pg', '~> 0.18.2', group: :postgres
+ENV["DB"] ||= "mysql"
+gem "mysql2", '~> 0.4.5' if ENV["DB"] == "all" || ENV["DB"] == "mysql"
+gem "pg", '~> 0.18.2' if ENV["DB"] == "all" || ENV["DB"] == "postgres"
+ENV["DB"] ||= "postgresql"
+gem 'mysql2', '~> 0.4.10' if ENV["DB"] == "all" || ENV["DB"] == "mysql"
+gem 'pg', '~> 0.18.2' if ENV["DB"] == "all" || ENV["DB"] == "postgres"
gem 'rugged', '~> 0.26.0'
gem 'grape-route-helpers', '~> 2.0'
gem 'grape-route-helpers', '~> 2.1'

13
debian/patches/0110-make-test-dependencies-conditional.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -290,7 +290,7 @@
@@ -298,7 +298,7 @@
gem 'raindrops', '~> 0.18'
end
@ -9,14 +9,15 @@
gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
gem 'pry-byebug', '~> 3.4.1', platform: :mri
gem 'pry-rails', '~> 0.3.4'
@@ -337,9 +337,8 @@
gem 'activerecord_sane_schema_dumper', '0.2'
@@ -351,9 +351,9 @@
gem 'stackprof', '~> 0.2.10', require: false
gem 'stackprof', '~> 0.2.10'
gem 'simple_po_parser', '~> 1.1.2', require: false
-end
+#end
-group :test do
+# group test
+#group :test do
gem 'shoulda-matchers', '~> 3.1.2', require: false
gem 'email_spec', '~> 1.6.0'
gem 'json-schema', '~> 2.6.2'
gem 'json-schema', '~> 2.8.0'

4
debian/patches/0220-relax-dependencies.patch → debian/patches/0220-relax-webmock.patch vendored
View file

@ -1,9 +1,9 @@
--- a/Gemfile
+++ b/Gemfile
@@ -342,7 +342,7 @@
@@ -357,7 +357,7 @@
gem 'shoulda-matchers', '~> 3.1.2', require: false
gem 'email_spec', '~> 1.6.0'
gem 'json-schema', '~> 2.6.2'
gem 'json-schema', '~> 2.8.0'
- gem 'webmock', '~> 2.3.2'
+ gem 'webmock', '>= 2.3.2'
gem 'test_after_commit', '~> 1.1'

11
debian/patches/0240-relax-google-api-client.patch vendored
View file

@ -1,11 +0,0 @@
--- a/Gemfile
+++ b/Gemfile
@@ -106,7 +106,7 @@
gem 'fog-aliyun', '~> 0.1.0'
# for Google storage
-gem 'google-api-client', '~> 0.8.6'
+gem 'google-api-client', '~> 0.8'
# for aws storage
gem 'unf', '~> 0.1.4'

2
debian/patches/0250-relax-licensee.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -218,7 +218,7 @@
@@ -221,7 +221,7 @@
gem 'loofah', '~> 2.0', '>= 2.0.3'
# Working with license

8
debian/patches/0270-relax-toml-rb.patch vendored
View file

@ -1,11 +1,11 @@
--- a/Gemfile
+++ b/Gemfile
@@ -384,7 +384,7 @@
# Gitaly GRPC client
gem 'gitaly', '~> 0.26.0'
@@ -399,7 +399,7 @@
# Locked until https://github.com/google/protobuf/issues/4210 is closed
gem 'google-protobuf', '= 3.5.1'
-gem 'toml-rb', '~> 0.3.15', require: false
+gem 'toml-rb', '>= 0.3.15', require: false
# Feature toggles
gem 'flipper', '~> 0.10.2'
gem 'flipper', '~> 0.11.0'

10
debian/patches/0280-relax-pg.patch vendored
View file

@ -2,10 +2,10 @@
+++ b/Gemfile
@@ -14,7 +14,7 @@
# Supported DBs
ENV["DB"] ||= "mysql"
gem "mysql2", '~> 0.4.5' if ENV["DB"] == "all" || ENV["DB"] == "mysql"
-gem "pg", '~> 0.18.2' if ENV["DB"] == "all" || ENV["DB"] == "postgres"
+gem "pg", '~> 0.18' if ENV["DB"] == "all" || ENV["DB"] == "postgres"
ENV["DB"] ||= "postgresql"
gem 'mysql2', '~> 0.4.10' if ENV["DB"] == "all" || ENV["DB"] == "mysql"
-gem 'pg', '~> 0.18.2' if ENV["DB"] == "all" || ENV["DB"] == "postgres"
+gem 'pg', '~> 0.19' if ENV["DB"] == "all" || ENV["DB"] == "postgres"
gem 'rugged', '~> 0.26.0'
gem 'grape-route-helpers', '~> 2.0'
gem 'grape-route-helpers', '~> 2.1'

2
debian/patches/0290-skip-peek-mysql2.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -272,7 +272,7 @@
@@ -280,7 +280,7 @@
gem 'peek', '~> 1.0', '>= 1.0.1'
gem 'peek-gc', '~> 0.0.2'
gem 'peek-host', '~> 1.0'

9
debian/patches/0300-relax-rbnacl.patch vendored
View file

@ -1,12 +1,11 @@
--- a/Gemfile
+++ b/Gemfile
@@ -376,8 +376,7 @@
@@ -390,7 +390,7 @@
# Required for ED25519 SSH host key support
group :ed25519 do
- gem 'rbnacl-libsodium'
- gem 'rbnacl', '~> 3.2'
+ gem 'rbnacl', '>= 3.2'
gem 'rbnacl-libsodium'
- gem 'rbnacl', '~> 4.0'
+ gem 'rbnacl', '~> 5.0'
gem 'bcrypt_pbkdf', '~> 1.0'
end

11
debian/patches/0310-relax-rack-cors.patch vendored
View file

@ -1,11 +0,0 @@
--- a/Gemfile
+++ b/Gemfile
@@ -79,7 +79,7 @@
# API
gem 'grape', '~> 0.19.2'
gem 'grape-entity', '~> 0.6.0'
-gem 'rack-cors', '~> 0.4.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'

2
debian/patches/0320-relax-fog-aws.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -97,7 +97,7 @@
@@ -105,7 +105,7 @@
gem 'dropzonejs-rails', '~> 0.7.1'
# for backups

4
debian/patches/0330-relax-acts-as-taggable-on.patch vendored
View file

@ -1,7 +1,7 @@
--- a/Gemfile
+++ b/Gemfile
@@ -146,7 +146,7 @@
gem 'after_commit_queue', '~> 1.3'
@@ -152,7 +152,7 @@
gem 'state_machines-activerecord', '~> 0.4.0'
# Issue tags
-gem 'acts-as-taggable-on', '~> 4.0'

2
debian/patches/0340-relax-httparty.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -158,7 +158,7 @@
@@ -164,7 +164,7 @@
gem 'rufus-scheduler', '~> 3.4'
# HTTP requests

8
debian/patches/0350-relax-oj.patch vendored
View file

@ -1,11 +1,11 @@
--- a/Gemfile
+++ b/Gemfile
@@ -233,7 +233,7 @@
gem 'charlock_holmes', '~> 0.7.3'
@@ -236,7 +236,7 @@
gem 'charlock_holmes', '~> 0.7.5'
# Faster JSON
-gem 'oj', '~> 2.17', '>= 2.17.4'
+gem 'oj', '>= 2.17.4'
# Parse time & duration
gem 'chronic', '~> 0.10.2'
# Faster blank
gem 'fast_blank'

4
debian/patches/0360-relax-rdoc.patch vendored
View file

@ -1,7 +1,7 @@
--- a/Gemfile
+++ b/Gemfile
@@ -120,7 +120,7 @@
gem 'gitlab-markup', '~> 1.5', '>= 1.5.1'
@@ -128,7 +128,7 @@
gem 'gitlab-markup', '~> 1.6', '>= 1.6.2'
gem 'redcarpet', '~> 3.4'
gem 'RedCloth', '~> 4.3', '>= 4.3.2'
-gem 'rdoc', '~> 4.2'

2
debian/patches/0370-relax-prof.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -356,7 +356,7 @@
@@ -372,7 +372,7 @@
gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text'

2
debian/patches/0410-set-webpack-root.patch vendored
View file

@ -1,6 +1,6 @@
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -10,7 +10,7 @@
@@ -12,7 +12,7 @@
var BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
var WatchMissingNodeModulesPlugin = require('react-dev-utils/WatchMissingNodeModulesPlugin');

82
debian/patches/0420-use-system-libs.patch vendored
View file

@ -1,63 +1,77 @@
--- a/package.json
+++ b/package.json
@@ -12,17 +12,10 @@
"webpack-prod": "NODE_ENV=production webpack --config config/webpack.config.js"
},
@@ -15,56 +15,28 @@
"dependencies": {
+ "npm": "5.6.0",
"axios": "^0.16.2",
- "babel-core": "^6.22.1",
- "babel-eslint": "^7.2.1",
- "babel-loader": "^7.1.1",
- "babel-plugin-transform-define": "^1.2.0",
- "babel-preset-latest": "^6.24.0",
- "babel-preset-stage-2": "^6.22.0",
"autosize": "^4.0.0",
"axios": "^0.17.1",
- "babel-core": "^6.26.0",
- "babel-eslint": "^8.0.2",
- "babel-loader": "^7.1.2",
- "babel-plugin-transform-define": "^1.3.0",
- "babel-preset-latest": "^6.24.1",
- "babel-preset-stage-2": "^6.24.1",
"blackst0ne-mermaid": "^7.1.0-fixed",
- "bootstrap-sass": "^3.3.6",
"compression-webpack-plugin": "^0.3.2",
"brace-expansion": "^1.1.8",
"classlist-polyfill": "^1.2.0",
"clipboard": "^1.7.1",
"compression-webpack-plugin": "^1.0.0",
"copy-webpack-plugin": "^4.0.1",
- "core-js": "^2.4.1",
"cropper": "^2.3.0",
"css-loader": "^0.28.0",
"d3": "^3.5.11",
@@ -30,25 +23,14 @@
"document-register-element": "^1.3.0",
- "d3-array": "^1.2.1",
- "d3-axis": "^1.0.8",
- "d3-brush": "^1.0.4",
- "d3-scale": "^1.0.7",
- "d3-selection": "^1.2.0",
- "d3-shape": "^1.2.0",
- "d3-time": "^1.0.8",
- "d3-time-format": "^2.1.1",
"deckar01-task_list": "^2.0.0",
"diff": "^3.4.0",
"document-register-element": "1.3.0",
"dropzone": "^4.2.0",
"emoji-unicode-version": "^0.2.1",
- "eslint-plugin-html": "^2.0.1",
- "exports-loader": "^0.6.4",
- "file-loader": "^0.11.1",
- "imports-loader": "^0.7.1",
"fuzzaldrin-plus": "^0.5.0",
- "glob": "^7.1.2",
"imports-loader": "^0.7.1",
- "jed": "^1.1.1",
- "jquery": "^2.2.1",
"jquery-ujs": "^1.2.1",
- "jquery": "^2.2.4",
"jquery-ujs": "1.2.2",
- "js-cookie": "^2.1.3",
- "jszip": "^3.1.3",
"jszip-utils": "^0.0.2",
- "marked": "^0.3.6",
"monaco-editor": "0.8.3",
- "jszip-utils": "^0.0.2",
- "katex": "^0.8.3",
- "marked": "^0.3.12",
"monaco-editor": "0.10.0",
- "mousetrap": "^1.4.6",
"name-all-modules-plugin": "^1.0.1",
"pikaday": "^1.5.1",
"pikaday": "^1.6.1",
"prismjs": "^1.6.0",
"raphael": "^2.2.7",
"raven-js": "^3.14.0",
"raven-js": "^3.22.1",
- "raw-loader": "^0.5.1",
"react-dev-utils": "^0.5.2",
"sanitize-html": "^1.16.1",
"select2": "3.5.2-browserify",
"sql.js": "^0.4.0",
@@ -56,15 +38,11 @@
@@ -75,8 +47,6 @@
"three-orbit-controls": "^82.1.0",
"three-stl-loader": "^1.0.4",
"timeago.js": "^2.0.5",
"timeago.js": "^3.0.2",
- "underscore": "^1.8.3",
- "url-loader": "^0.5.8",
"visibilityjs": "^1.2.4",
"vue": "^2.2.6",
"vue-loader": "^11.3.4",
"vue-resource": "^1.3.4",
"vue-template-compiler": "^2.2.6",
- "webpack": "^3.4.0",
"vue": "^2.5.13",
"vue-loader": "^13.7.0",
@@ -84,8 +54,6 @@
"vue-router": "^3.0.1",
"vue-template-compiler": "^2.5.13",
"vuex": "^3.0.1",
- "webpack": "^3.5.5",
- "webpack-bundle-analyzer": "^2.8.2",
"webpack-stats-plugin": "^0.1.5"
"webpack-stats-plugin": "^0.1.5",
"worker-loader": "^1.1.0"
},
"devDependencies": {

10
debian/patches/890757.patch vendored
View file

@ -8,14 +8,12 @@ Thanks, Libor Klepáč.
--- a/lib/banzai/filter/markdown_filter.rb
+++ b/lib/banzai/filter/markdown_filter.rb
@@ -13,9 +13,9 @@
end
@@ -26,7 +26,7 @@
def self.renderer
@renderer ||= begin
Thread.current[:banzai_markdown_renderer] ||= begin
- renderer = Banzai::Renderer::HTML.new
+ renderer = Redcarpet::Render::HTML.new
Redcarpet::Markdown.new(renderer, redcarpet_options)
+ renderer = Redcarpet::Renderer::HTML.new
Redcarpet::Markdown.new(renderer, REDCARPET_OPTIONS)
end
end

6
debian/patches/add-system-lib-path-for-webpack.patch vendored
View file

@ -1,6 +1,6 @@
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -245,6 +245,7 @@
@@ -331,6 +331,7 @@
resolve: {
extensions: ['.js'],
@ -8,7 +8,7 @@
alias: {
'~': path.join(ROOT_PATH, 'app/assets/javascripts'),
'emojis': path.join(ROOT_PATH, 'fixtures/emojis'),
@@ -254,7 +255,12 @@
@@ -340,7 +341,12 @@
'vendor': path.join(ROOT_PATH, 'vendor/assets/javascripts'),
'vue$': 'vue/dist/vue.esm.js',
}
@ -20,4 +20,4 @@
+
}
if (IS_PRODUCTION) {
config.entry = Object.assign({}, autoEntries, config.entry);

4
debian/patches/remove-bundle-analyzer.patch vendored
View file

@ -1,6 +1,6 @@
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -7,7 +7,6 @@
@@ -9,7 +9,6 @@
var CopyWebpackPlugin = require('copy-webpack-plugin');
var CompressionPlugin = require('compression-webpack-plugin');
var NameAllModulesPlugin = require('name-all-modules-plugin');
@ -8,7 +8,7 @@
var WatchMissingNodeModulesPlugin = require('react-dev-utils/WatchMissingNodeModulesPlugin');
var ROOT_PATH = '/usr/share/gitlab';
@@ -310,16 +309,4 @@
@@ -393,16 +392,4 @@
}
}

5
debian/patches/series vendored
View file

@ -1,18 +1,15 @@
0005-use-debian-omniauth-ldap.patch
0050-relax-stable-libs.patch
0100-remove-development-test.patch
0108-make-mysql-optional.patch
0110-make-test-dependencies-conditional.patch
source-init-functions.patch
pid-log-paths.patch
0220-relax-dependencies.patch
0240-relax-google-api-client.patch
0220-relax-webmock.patch
0250-relax-licensee.patch
0270-relax-toml-rb.patch
0280-relax-pg.patch
0290-skip-peek-mysql2.patch
0300-relax-rbnacl.patch
0310-relax-rack-cors.patch
0320-relax-fog-aws.patch
0330-relax-acts-as-taggable-on.patch
0340-relax-httparty.patch