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:
Praveen Arimbrathodiyil 2016-09-29 10:17:09 +05:30
parent 1e8a0824c8
commit 549c1c3f82
5 changed files with 39 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
debian/patches/0018-loosen-rdoc.patch vendored
View file

@ -2,7 +2,7 @@ Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/2814
--- a/Gemfile
+++ b/Gemfile
@@ -109,7 +109,7 @@
@@ -106,7 +106,7 @@
gem 'github-markup', '~> 1.4'
gem 'redcarpet', '~> 3.3.3'
gem 'RedCloth', '~> 4.3.2'

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

@ -38,12 +38,11 @@ gitlab Gemfile
+gem 'omniauth-auth0', '~> 1.4', '>= 1.4.1'
gem 'omniauth-azure-oauth2', '~> 0.0.6'
gem 'omniauth-bitbucket', '~> 0.0.2'
-gem 'omniauth-cas3', '~> 1.1.2'
-gem 'omniauth-facebook', '~> 3.0.0'
gem 'omniauth-cas3', '~> 1.1.2'
-gem 'omniauth-facebook', '~> 4.0.0'
-gem 'omniauth-github', '~> 1.1.1'
-gem 'omniauth-gitlab', '~> 1.0.0'
+gem 'omniauth-cas3', '~> 1.1', '>= 1.1.2'
+gem 'omniauth-facebook', '>= 3.0', '< 5.0'
+gem 'omniauth-facebook', '~> 4.0'
+gem 'omniauth-github', '~> 1.1', '>= 1.1.1'
+gem 'omniauth-gitlab', '~> 1.0'
gem 'omniauth-google-oauth2', '~> 0.4.1'
@ -73,21 +72,15 @@ gitlab Gemfile
gem 'u2f', '~> 0.2.1'
# Browser detection
@@ -53,12 +53,12 @@
@@ -53,7 +53,7 @@
# Extracting information from a git repository
# Provide access to Gitlab::Git library
-gem 'gitlab_git', '~> 10.4.7'
+gem 'gitlab_git', '~> 10.4', '>= 10.4.7'
-gem 'gitlab_git', '~> 10.6.6'
+gem 'gitlab_git', '~> 10.6', '>= 10.6'
# 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"
# Git Wiki
# Required manually in config/initializers/gollum.rb to control load order
@@ -66,7 +66,7 @@
gem 'gollum-rugged_adapter', '~> 0.4.2', require: false
@ -106,8 +99,8 @@ gitlab Gemfile
# Files attachments
gem 'carrierwave', '~> 0.10.0'
@@ -101,79 +101,79 @@
gem 'six', '~> 0.2.0'
@@ -98,79 +98,79 @@
gem 'unf', '~> 0.1.4'
# Seed data
-gem 'seed-fu', '~> 2.3.5'
@ -205,7 +198,7 @@ gitlab Gemfile
# Asana integration
gem 'asana', '~> 0.4.0'
@@ -182,29 +182,29 @@
@@ -179,29 +179,29 @@
gem 'ruby-fogbugz', '~> 0.2.1'
# d3
@ -293,7 +286,7 @@ gitlab Gemfile
# Metrics
group :metrics do
@@ -327,7 +327,7 @@
@@ -329,7 +329,7 @@
gem 'newrelic_rpm', '~> 3.16'
@ -302,7 +295,7 @@ gitlab Gemfile
gem 'mail_room', '~> 0.8'
@@ -336,18 +336,18 @@
@@ -338,18 +338,18 @@
gem 'ruby-prof', '~> 0.15.9'
## CI

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

@ -2,7 +2,7 @@ Bundler will fail when it can't find these locally
--- a/Gemfile
+++ b/Gemfile
@@ -245,87 +245,67 @@
@@ -245,90 +245,33 @@
gem 'influxdb', '~> 0.2', require: false
end
@ -37,23 +37,14 @@ Bundler will fail when it can't find these locally
- gem 'database_cleaner', '~> 1.5.0'
- gem 'factory_girl_rails', '~> 4.6.0'
- gem 'rspec-rails', '~> 3.5.0'
- gem 'rspec-retry', '~> 0.4.5'
- gem 'spinach-rails', '~> 0.2.1'
- gem 'spinach-rerun-reporter', '~> 0.0.2'
+#group :development, optional: true do
+#group :development, :test do
+if ENV["INCLUDE_TEST_DEPENDS"] == "true"
+# gem 'byebug', '~> 8.2.1', platform: :mri
+# gem 'pry-rails', '~> 0.3.4'
+#
+# gem 'awesome_print', '~> 1.2.0', require: false
+# gem 'fuubar', '~> 2.0.0'
+
+ gem 'database_cleaner', '~> 1.5'
+ gem 'factory_girl_rails', '~> 4.6'
+ gem 'rspec-rails', '~> 3.4'
+ gem 'rspec-retry', '~> 0.4.3'
+# gem 'spinach-rails', '~> 0.2.1'
+# gem 'spinach-rerun-reporter', '~> 0.0.2'
gem 'rspec-retry', '~> 0.4.5'
- gem 'spinach-rails', '~> 0.2.1'
- gem 'spinach-rerun-reporter', '~> 0.0.2'
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
- gem 'minitest', '~> 5.7.0'
@ -61,8 +52,7 @@ Bundler will fail when it can't find these locally
# Generate Fake data
- gem 'ffaker', '~> 2.0.0'
+ gem 'ffaker', '~> 2.0'
-
- gem 'capybara', '~> 2.6.2'
- gem 'capybara-screenshot', '~> 1.0.0'
- gem 'poltergeist', '~> 1.9.0'
@ -75,67 +65,48 @@ Bundler will fail when it can't find these locally
- gem 'spring-commands-spinach', '~> 1.1.0'
- gem 'spring-commands-teaspoon', '~> 0.0.2'
-
- gem 'rubocop', '~> 0.41.2', require: false
- gem 'rubocop', '~> 0.42.0', require: false
- gem 'rubocop-rspec', '~> 1.5.0', require: false
- gem 'scss_lint', '~> 0.47.0', require: false
- gem 'haml_lint', '~> 0.18.2', require: false
- gem 'simplecov', '0.12.0', require: false
- gem 'flog', '~> 4.3.2', require: false
- gem 'flay', '~> 2.6.1', require: false
- gem 'bundler-audit', '~> 0.5.0', require: false
+ gem 'capybara', '~> 2.5'
+ gem 'capybara-screenshot', '~> 1.0'
+ gem 'poltergeist', '~> 1.9'
+
+# gem 'teaspoon', '~> 1.1.0'
+# gem 'teaspoon-jasmine', '~> 2.2.0'
+
+# gem 'spring', '~> 1.7.0'
+# gem 'spring-commands-rspec', '~> 1.0.4'
+# gem 'spring-commands-spinach', '~> 1.1.0'
+# gem 'spring-commands-teaspoon', '~> 0.0.2'
+
+# gem 'rubocop', '~> 0.41.2', require: false
+# gem 'rubocop-rspec', '~> 1.5.0', require: false
+# gem 'scss_lint', '~> 0.47.0', require: false
+# gem 'simplecov', '0.12.0', require: false
+# gem 'flog', '~> 4.3.2', require: false
+# gem 'flay', '~> 2.6.1', require: false
+# gem 'bundler-audit', '~> 0.5.0', require: false
-
- gem 'benchmark-ips', '~> 2.3.0', require: false
+# gem 'benchmark-ips', '~> 2.3.0', require: false
+ gem 'ffaker', '~> 2.0'
- gem 'license_finder', '~> 2.1.0', require: false
- gem 'knapsack', '~> 1.11.0'
+# gem 'license_finder', '~> 2.1.0', require: false
+# gem 'knapsack', '~> 1.11.0'
end
-end
-
-group :test do
- gem 'shoulda-matchers', '~> 2.8.0', require: false
- gem 'email_spec', '~> 1.6.0'
- gem 'json-schema', '~> 2.6.2'
- gem 'webmock', '~> 1.21.0'
- gem 'test_after_commit', '~> 0.4.2'
- gem 'sham_rack', '~> 1.3.6'
+group :test, optional: true do
+ gem 'capybara', '~> 2.5'
+ gem 'capybara-screenshot', '~> 1.0'
+ gem 'poltergeist', '~> 1.9'
+
+ gem 'license_finder', '~> 2.1', require: false
+ gem 'shoulda-matchers', '~> 2.8', require: false
+ gem 'email_spec', '~> 1.6'
+ gem 'json-schema', '~> 2.6', '>= 2.6.2'
+ gem 'webmock', '~> 1.21'
+# gem 'test_after_commit', '~> 0.4.2'
gem 'test_after_commit', '~> 0.4.2'
- gem 'sham_rack', '~> 1.3.6'
+ gem 'sham_rack', '~> 1.3', '>= 1.3.6'
gem 'timecop', '~> 0.8.0'
end
-group :production do
- gem 'gitlab_meta', '7.0'
-end
+#group :production do
+# gem 'gitlab_meta', '7.0'
+#end
-
-gem 'newrelic_rpm', '~> 3.16'
+#gem 'newrelic_rpm', '~> 3.16'
-
gem 'octokit', '~> 4.3'
gem 'mail_room', '~> 0.8'

5
debian/patches/0200-use-jquery-for-jquery2.patch vendored
View file

@ -3,7 +3,10 @@ http://lists.alioth.debian.org/pipermail/pkg-javascript-devel/2015-September/011
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -1,4 +1,4 @@
@@ -4,7 +4,7 @@
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
// the compiled file.
//
-/*= require jquery2 */
+/*= require jquery */
/*= require jquery-ui/autocomplete */

12
debian/patches/052-relax-grape.patch vendored
View file

@ -11,15 +11,3 @@ https://gitlab.com/gitlab-org/gitlab-ce/issues/19670
gem 'grape-entity', '~> 0.5.0'
gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'
@@ -291,9 +291,9 @@
# gem 'license_finder', '~> 2.1.0', require: false
# gem 'knapsack', '~> 1.11.0'
-end
+#end
-group :test, optional: true do
+#group :test, optional: true do
gem 'shoulda-matchers', '~> 2.8', require: false
gem 'email_spec', '~> 1.6'
gem 'json-schema', '~> 2.6', '>= 2.6.2'