deleted ebuild for gitlabhq-7.6.1, added ebuild for gitlabhq-7.6.2; changed patch for Gemfile/Gemfile.lock to incorporate fix mentioned here:
https://github.com/gitlabhq/gitlabhq/issues/8478#issuecomment-71328552
This commit is contained in:
parent
7ece356533
commit
21c81ec2eb
4 changed files with 16 additions and 404 deletions
|
@ -1,18 +1,8 @@
|
|||
diff --git a/Gemfile b/Gemfile
|
||||
index ce9b833..49ddf1a 100644
|
||||
index ce9b833..c4bd377 100644
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -28,6 +28,9 @@ gem 'omniauth-google-oauth2'
|
||||
gem 'omniauth-twitter'
|
||||
gem 'omniauth-github'
|
||||
gem 'omniauth-shibboleth'
|
||||
+# Version 0.8 does not compile, so let's try tag 0.8.1 from github
|
||||
+# This is a dependency of omniauth-kerberos
|
||||
+gem "timfel-krb5-auth", '0.8.1.1', :require => 'krb5_auth', :git => "https://github.com/fritteli/krb5-auth.git", :tag => "v0.8.1.1"
|
||||
gem 'omniauth-kerberos'
|
||||
|
||||
# Extracting information from a git repository
|
||||
@@ -155,6 +158,10 @@ gem "underscore-rails", "~> 1.4.4"
|
||||
@@ -155,6 +155,10 @@ gem "underscore-rails", "~> 1.4.4"
|
||||
# Sanitize user input
|
||||
gem "sanitize", '~> 2.0'
|
||||
|
||||
|
@ -23,7 +13,7 @@ index ce9b833..49ddf1a 100644
|
|||
# Protect against bruteforcing
|
||||
gem "rack-attack"
|
||||
|
||||
@@ -170,7 +177,6 @@ gem 'semantic-ui-sass', '~> 0.16.1.0'
|
||||
@@ -170,7 +174,6 @@ gem 'semantic-ui-sass', '~> 0.16.1.0'
|
||||
gem "sass-rails", '~> 4.0.2'
|
||||
gem "coffee-rails"
|
||||
gem "uglifier"
|
||||
|
@ -32,28 +22,21 @@ index ce9b833..49ddf1a 100644
|
|||
gem 'jquery-turbolinks'
|
||||
|
||||
diff --git a/Gemfile.lock b/Gemfile.lock
|
||||
index a93935f..66e2c22 100644
|
||||
index a93935f..98721dc 100644
|
||||
--- a/Gemfile.lock
|
||||
+++ b/Gemfile.lock
|
||||
@@ -1,3 +1,17 @@
|
||||
@@ -1,3 +1,10 @@
|
||||
+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/fritteli/krb5-auth.git
|
||||
+ revision: 14e09f7fdd79962b146e0a6513fdb1b8e64c221b
|
||||
+ tag: v0.8.1.1
|
||||
+ specs:
|
||||
+ timfel-krb5-auth (0.8.1.1)
|
||||
+
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
@@ -62,7 +76,6 @@ GEM
|
||||
@@ -62,7 +69,6 @@ GEM
|
||||
json (>= 1.7)
|
||||
celluloid (0.15.2)
|
||||
timers (~> 1.1.0)
|
||||
|
@ -61,7 +44,7 @@ index a93935f..66e2c22 100644
|
|||
cliver (0.3.2)
|
||||
code_analyzer (0.4.3)
|
||||
sexp_processor
|
||||
@@ -280,7 +293,6 @@ GEM
|
||||
@@ -280,7 +286,6 @@ GEM
|
||||
addressable (~> 2.3)
|
||||
letter_opener (1.1.2)
|
||||
launchy (~> 2.2)
|
||||
|
@ -69,7 +52,7 @@ index a93935f..66e2c22 100644
|
|||
listen (2.3.1)
|
||||
celluloid (>= 0.15.2)
|
||||
rb-fsevent (>= 0.9.3)
|
||||
@@ -426,7 +438,6 @@ GEM
|
||||
@@ -426,7 +431,6 @@ GEM
|
||||
redis-store (~> 1.1.0)
|
||||
redis-store (1.1.4)
|
||||
redis (>= 2.2)
|
||||
|
@ -77,7 +60,7 @@ index a93935f..66e2c22 100644
|
|||
request_store (1.0.5)
|
||||
require_all (1.3.2)
|
||||
rest-client (1.6.7)
|
||||
@@ -525,9 +536,6 @@ GEM
|
||||
@@ -525,9 +529,6 @@ GEM
|
||||
term-ansicolor (1.2.2)
|
||||
tins (~> 0.8)
|
||||
test_after_commit (0.2.2)
|
||||
|
@ -87,15 +70,16 @@ index a93935f..66e2c22 100644
|
|||
thin (1.6.1)
|
||||
daemons (>= 1.0.9)
|
||||
eventmachine (>= 1.0.0)
|
||||
@@ -536,7 +544,6 @@ GEM
|
||||
@@ -536,7 +537,7 @@ GEM
|
||||
thread_safe (0.3.4)
|
||||
tilt (1.4.1)
|
||||
timers (1.1.0)
|
||||
- timfel-krb5-auth (0.8)
|
||||
+ timfel-krb5-auth (0.8.2)
|
||||
tinder (1.9.3)
|
||||
eventmachine (~> 1.0)
|
||||
faraday (~> 0.8)
|
||||
@@ -606,6 +613,7 @@ DEPENDENCIES
|
||||
@@ -606,6 +607,7 @@ DEPENDENCIES
|
||||
bootstrap-sass (~> 3.0)
|
||||
capybara (~> 2.2.1)
|
||||
carrierwave
|
||||
|
@ -103,13 +87,11 @@ index a93935f..66e2c22 100644
|
|||
coffee-rails
|
||||
colored
|
||||
coveralls
|
||||
@@ -704,8 +712,8 @@ DEPENDENCIES
|
||||
@@ -704,7 +706,6 @@ DEPENDENCIES
|
||||
stamp
|
||||
state_machine
|
||||
test_after_commit
|
||||
- therubyracer
|
||||
thin
|
||||
+ timfel-krb5-auth (= 0.8.1.1)!
|
||||
tinder (~> 1.9.2)
|
||||
turbolinks
|
||||
uglifier
|
Loading…
Add table
Add a link
Reference in a new issue