deleted old ebuilds. I will also delete the ebuild for gitlabhq-6.5.1 as soon as cvut's overlay (https://github.com/cvut/gentoo-overlay) has fixed the digests on the available gitlabhq ebuilds.
This commit is contained in:
parent
cb9f94c11e
commit
6a9a77da46
9 changed files with 0 additions and 1004 deletions
|
@ -1,84 +0,0 @@
|
|||
--- Gemfile.orig 2014-01-17 17:27:47.960000000 +0100
|
||||
+++ Gemfile 2014-01-17 17:28:20.620000000 +0100
|
||||
@@ -134,13 +134,16 @@
|
||||
# Sanitize user input
|
||||
gem "sanitize"
|
||||
|
||||
+# The newer revision of charlock_holmes that is finally fixed to
|
||||
+# be compatible with Gentoo
|
||||
+gem "charlock_holmes", git: "https://github.com/brianmario/charlock_holmes.git", ref: "dde194609b3513b0d2369ce8f916ae52566154b4"
|
||||
+
|
||||
# Protect against bruteforcing
|
||||
gem "rack-attack"
|
||||
|
||||
gem "sass-rails"
|
||||
gem "coffee-rails"
|
||||
gem "uglifier"
|
||||
-gem "therubyracer"
|
||||
gem 'turbolinks'
|
||||
gem 'jquery-turbolinks'
|
||||
|
||||
--- Gemfile.lock.orig 2014-01-17 17:29:53.490000000 +0100
|
||||
+++ Gemfile.lock 2014-01-17 17:33:01.660000000 +0100
|
||||
@@ -1,4 +1,11 @@
|
||||
GIT
|
||||
+ remote: https://github.com/brianmario/charlock_holmes.git
|
||||
+ revision: dde194609b3513b0d2369ce8f916ae52566154b4
|
||||
+ ref: dde194609b3513b0d2369ce8f916ae52566154b4
|
||||
+ specs:
|
||||
+ charlock_holmes (0.6.9.4)
|
||||
+
|
||||
+GIT
|
||||
remote: https://github.com/gitlabhq/gon.git
|
||||
revision: 58ca8e17273051cb370182cabd3602d1da6783ab
|
||||
ref: 58ca8e17273051cb370182cabd3602d1da6783ab
|
||||
@@ -72,7 +79,6 @@
|
||||
json (>= 1.7)
|
||||
celluloid (0.15.2)
|
||||
timers (~> 1.1.0)
|
||||
- charlock_holmes (0.6.9.4)
|
||||
chosen-rails (1.0.1)
|
||||
coffee-rails (>= 3.2)
|
||||
compass-rails (>= 1.0)
|
||||
@@ -278,7 +284,6 @@
|
||||
addressable (~> 2.3)
|
||||
letter_opener (1.1.2)
|
||||
launchy (~> 2.2)
|
||||
- libv8 (3.16.14.3)
|
||||
listen (2.3.1)
|
||||
celluloid (>= 0.15.2)
|
||||
rb-fsevent (>= 0.9.3)
|
||||
@@ -412,7 +417,6 @@
|
||||
redis-store (~> 1.1.0)
|
||||
redis-store (1.1.4)
|
||||
redis (>= 2.2)
|
||||
- ref (1.0.5)
|
||||
require_all (1.3.2)
|
||||
rest-client (1.6.7)
|
||||
mime-types (>= 1.16)
|
||||
@@ -499,9 +503,6 @@
|
||||
term-ansicolor (1.2.2)
|
||||
tins (~> 0.8)
|
||||
test_after_commit (0.2.2)
|
||||
- therubyracer (0.12.0)
|
||||
- libv8 (~> 3.16.14.0)
|
||||
- ref
|
||||
thin (1.6.1)
|
||||
daemons (>= 1.0.9)
|
||||
eventmachine (>= 1.0.0)
|
||||
@@ -572,6 +573,7 @@
|
||||
bootstrap-sass (~> 2.3)
|
||||
capybara
|
||||
carrierwave
|
||||
+ charlock_holmes!
|
||||
chosen-rails (= 1.0.1)
|
||||
coffee-rails
|
||||
colored
|
||||
@@ -655,7 +657,6 @@
|
||||
stamp
|
||||
state_machine
|
||||
test_after_commit
|
||||
- therubyracer
|
||||
thin
|
||||
tinder (~> 1.9.2)
|
||||
turbolinks
|
|
@ -1,28 +0,0 @@
|
|||
--- lib/gitlab/regex.rb.orig 2013-12-23 19:43:59.000000000 +0100
|
||||
+++ lib/gitlab/regex.rb 2014-01-17 17:43:00.020000000 +0100
|
||||
@@ -1,3 +1,5 @@
|
||||
+# encoding: utf-8
|
||||
+
|
||||
module Gitlab
|
||||
module Regex
|
||||
extend self
|
||||
@@ -7,7 +9,7 @@
|
||||
end
|
||||
|
||||
def project_name_regex
|
||||
- /\A[a-zA-Z0-9][a-zA-Z0-9_\-\. ]*\z/
|
||||
+ /\A\p{Word}[\p{Word}\-:\. ]*\z/
|
||||
end
|
||||
|
||||
def name_regex
|
||||
--- app/models/project.rb.orig 2014-01-17 17:40:02.050000000 +0100
|
||||
+++ app/models/project.rb 2014-01-17 17:44:09.150000000 +0100
|
||||
@@ -85,7 +85,7 @@
|
||||
validates :description, length: { maximum: 2000 }, allow_blank: true
|
||||
validates :name, presence: true, length: { within: 0..255 },
|
||||
format: { with: Gitlab::Regex.project_name_regex,
|
||||
- message: "only letters, digits, spaces & '_' '-' '.' allowed. Letter or digit should be first" }
|
||||
+ message: "only letters, digits, spaces & '_' '-' '.' ':' allowed. Letter or digit should be first" }
|
||||
validates :path, presence: true, length: { within: 0..255 },
|
||||
exclusion: { in: Gitlab::Blacklist.path },
|
||||
format: { with: Gitlab::Regex.path_regex,
|
|
@ -1,20 +0,0 @@
|
|||
diff --git a/config/environments/production.rb b/gitlab-6/environments/production.rb
|
||||
index 82eb250..10e25e5 100644
|
||||
--- a/config/environments/production.rb
|
||||
+++ b/config/environments/production.rb
|
||||
@@ -73,11 +73,10 @@ Gitlab::Application.configure do
|
||||
# config.active_record.auto_explain_threshold_in_seconds = 0.5
|
||||
|
||||
config.action_mailer.delivery_method = :sendmail
|
||||
- # Defaults to:
|
||||
- # # config.action_mailer.sendmail_settings = {
|
||||
- # # location: '/usr/sbin/sendmail',
|
||||
- # # arguments: '-i -t'
|
||||
- # # }
|
||||
+ config.action_mailer.sendmail_settings = {
|
||||
+ location: '/usr/sbin/sendmail',
|
||||
+ arguments: '-i'
|
||||
+ }
|
||||
config.action_mailer.perform_deliveries = true
|
||||
config.action_mailer.raise_delivery_errors = true
|
||||
end
|
|
@ -1,84 +0,0 @@
|
|||
--- Gemfile.orig 2014-01-22 14:39:19.620000000 +0100
|
||||
+++ Gemfile 2014-01-22 14:40:24.120000000 +0100
|
||||
@@ -137,13 +137,16 @@
|
||||
# Sanitize user input
|
||||
gem "sanitize"
|
||||
|
||||
+# The newer revision of charlock_holmes that is finally fixed to
|
||||
+# be compatible with Gentoo
|
||||
+gem "charlock_holmes", git: "https://github.com/brianmario/charlock_holmes.git", ref: "dde194609b3513b0d2369ce8f916ae52566154b4"
|
||||
+
|
||||
# Protect against bruteforcing
|
||||
gem "rack-attack"
|
||||
|
||||
gem "sass-rails"
|
||||
gem "coffee-rails"
|
||||
gem "uglifier"
|
||||
-gem "therubyracer"
|
||||
gem 'turbolinks'
|
||||
gem 'jquery-turbolinks'
|
||||
|
||||
--- Gemfile.lock.orig 2014-01-22 14:40:35.780000000 +0100
|
||||
+++ Gemfile.lock 2014-01-22 14:52:42.590000000 +0100
|
||||
@@ -1,4 +1,11 @@
|
||||
GIT
|
||||
+ remote: https://github.com/brianmario/charlock_holmes.git
|
||||
+ revision: dde194609b3513b0d2369ce8f916ae52566154b4
|
||||
+ ref: dde194609b3513b0d2369ce8f916ae52566154b4
|
||||
+ specs:
|
||||
+ charlock_holmes (0.6.9.4)
|
||||
+
|
||||
+GIT
|
||||
remote: https://github.com/gitlabhq/markup.git
|
||||
revision: 61ade389c1e1c159359338f570d18464a44ddbc4
|
||||
ref: 61ade389c1e1c159359338f570d18464a44ddbc4
|
||||
@@ -70,7 +77,6 @@
|
||||
json (>= 1.7)
|
||||
celluloid (0.15.2)
|
||||
timers (~> 1.1.0)
|
||||
- charlock_holmes (0.6.9.4)
|
||||
cliver (0.2.2)
|
||||
code_analyzer (0.4.3)
|
||||
sexp_processor
|
||||
@@ -267,7 +273,6 @@
|
||||
addressable (~> 2.3)
|
||||
letter_opener (1.1.2)
|
||||
launchy (~> 2.2)
|
||||
- libv8 (3.16.14.3)
|
||||
listen (2.3.1)
|
||||
celluloid (>= 0.15.2)
|
||||
rb-fsevent (>= 0.9.3)
|
||||
@@ -401,7 +406,6 @@
|
||||
redis-store (~> 1.1.0)
|
||||
redis-store (1.1.4)
|
||||
redis (>= 2.2)
|
||||
- ref (1.0.5)
|
||||
require_all (1.3.2)
|
||||
rest-client (1.6.7)
|
||||
mime-types (>= 1.16)
|
||||
@@ -488,9 +492,6 @@
|
||||
term-ansicolor (1.2.2)
|
||||
tins (~> 0.8)
|
||||
test_after_commit (0.2.2)
|
||||
- therubyracer (0.12.0)
|
||||
- libv8 (~> 3.16.14.0)
|
||||
- ref
|
||||
thin (1.6.1)
|
||||
daemons (>= 1.0.9)
|
||||
eventmachine (>= 1.0.0)
|
||||
@@ -561,6 +562,7 @@
|
||||
bootstrap-sass (~> 3.0)
|
||||
capybara
|
||||
carrierwave
|
||||
+ charlock_holmes!
|
||||
coffee-rails
|
||||
colored
|
||||
coveralls
|
||||
@@ -644,7 +646,6 @@
|
||||
stamp
|
||||
state_machine
|
||||
test_after_commit
|
||||
- therubyracer
|
||||
thin
|
||||
tinder (~> 1.9.2)
|
||||
turbolinks
|
|
@ -1,11 +0,0 @@
|
|||
--- config/initializers/session_store.rb.broken 2014-01-22 22:15:38.530000000 +0100
|
||||
+++ config/initializers/session_store.rb 2014-01-22 22:06:53.020000000 +0100
|
||||
@@ -4,7 +4,7 @@
|
||||
:redis_store, # Using the cookie_store would enable session replay attacks.
|
||||
servers: Gitlab::Application.config.cache_store.last, # re-use the Redis config from the Rails cache store
|
||||
key: '_gitlab_session',
|
||||
- secure: Gitlab.config.gitlab.https,
|
||||
+ secure: Gitlab::Application.config.force_ssl,
|
||||
httponly: true,
|
||||
path: (Rails.application.config.relative_url_root.nil?) ? '/' : Rails.application.config.relative_url_root
|
||||
)
|
|
@ -1,28 +0,0 @@
|
|||
--- lib/gitlab/regex.rb.orig 2013-12-23 19:43:59.000000000 +0100
|
||||
+++ lib/gitlab/regex.rb 2014-01-17 17:43:00.020000000 +0100
|
||||
@@ -1,3 +1,5 @@
|
||||
+# encoding: utf-8
|
||||
+
|
||||
module Gitlab
|
||||
module Regex
|
||||
extend self
|
||||
@@ -7,7 +9,7 @@
|
||||
end
|
||||
|
||||
def project_name_regex
|
||||
- /\A[a-zA-Z0-9][a-zA-Z0-9_\-\. ]*\z/
|
||||
+ /\A\p{Word}[\p{Word}\-:\. ]*\z/
|
||||
end
|
||||
|
||||
def name_regex
|
||||
--- app/models/project.rb.orig 2014-01-17 17:40:02.050000000 +0100
|
||||
+++ app/models/project.rb 2014-01-17 17:44:09.150000000 +0100
|
||||
@@ -85,7 +85,7 @@
|
||||
validates :description, length: { maximum: 2000 }, allow_blank: true
|
||||
validates :name, presence: true, length: { within: 0..255 },
|
||||
format: { with: Gitlab::Regex.project_name_regex,
|
||||
- message: "only letters, digits, spaces & '_' '-' '.' allowed. Letter or digit should be first" }
|
||||
+ message: "only letters, digits, spaces & '_' '-' '.' ':' allowed. Letter or digit should be first" }
|
||||
validates :path, presence: true, length: { within: 0..255 },
|
||||
exclusion: { in: Gitlab::Blacklist.path },
|
||||
format: { with: Gitlab::Regex.path_regex,
|
|
@ -1,20 +0,0 @@
|
|||
diff --git a/config/environments/production.rb b/gitlab-6/environments/production.rb
|
||||
index 82eb250..10e25e5 100644
|
||||
--- a/config/environments/production.rb
|
||||
+++ b/config/environments/production.rb
|
||||
@@ -73,11 +73,10 @@ Gitlab::Application.configure do
|
||||
# config.active_record.auto_explain_threshold_in_seconds = 0.5
|
||||
|
||||
config.action_mailer.delivery_method = :sendmail
|
||||
- # Defaults to:
|
||||
- # # config.action_mailer.sendmail_settings = {
|
||||
- # # location: '/usr/sbin/sendmail',
|
||||
- # # arguments: '-i -t'
|
||||
- # # }
|
||||
+ config.action_mailer.sendmail_settings = {
|
||||
+ location: '/usr/sbin/sendmail',
|
||||
+ arguments: '-i'
|
||||
+ }
|
||||
config.action_mailer.perform_deliveries = true
|
||||
config.action_mailer.raise_delivery_errors = true
|
||||
end
|
Loading…
Add table
Add a link
Reference in a new issue