View | Details | Raw Unified | Return to bug 209225 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-1 / +1 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	gitlab
4
PORTNAME=	gitlab
5
PORTVERSION=	8.5.5
5
PORTVERSION=	8.5.11
6
DISTVERSIONPREFIX=	v
6
DISTVERSIONPREFIX=	v
7
CATEGORIES=	www devel
7
CATEGORIES=	www devel
8
8
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (gitlabhq-gitlabhq-v8.5.5_GH0.tar.gz) = 859ec6142095d459b1587616df6c83063e87a8c7417ab8606100588525d03e2d
1
SHA256 (gitlabhq-gitlabhq-v8.5.11_GH0.tar.gz) = 084853403d55e53587d2d03a30ffc03acd36561fcc3783f0d7c8e048d3303c49
2
SIZE (gitlabhq-gitlabhq-v8.5.5_GH0.tar.gz) = 15179973
2
SIZE (gitlabhq-gitlabhq-v8.5.11_GH0.tar.gz) = 15181985
(-)files/patch-Gemfile (-2 / +3 lines)
Lines 1-4 Link Here
1
--- Gemfile.orig	2016-03-10 19:32:49 UTC
1
--- Gemfile.orig	2016-04-20 15:59:09 UTC
2
+++ Gemfile
2
+++ Gemfile
3
@@ -1,6 +1,6 @@
3
@@ -1,6 +1,6 @@
4
 source "https://rubygems.org"
4
 source "https://rubygems.org"
Lines 55-61 Link Here
55
-gem 'devise-two-factor', '~> 2.0.0'
55
-gem 'devise-two-factor', '~> 2.0.0'
56
+gem 'devise-two-factor', '>= 2.0.0'
56
+gem 'devise-two-factor', '>= 2.0.0'
57
 gem 'rqrcode-rails3', '~> 0.1.7'
57
 gem 'rqrcode-rails3', '~> 0.1.7'
58
 gem 'attr_encrypted', '~> 1.3.4'
58
-gem 'attr_encrypted', '~> 1.3.4'
59
+gem 'attr_encrypted', '>= 1.3.4'
59
 
60
 
60
 # Browser detection
61
 # Browser detection
61
-gem "browser", '~> 1.0.0'
62
-gem "browser", '~> 1.0.0'
(-)pkg-plist (+5 lines)
Lines 1419-1424 Link Here
1419
%%WWWDIR%%/config/initializers/public_key.rb
1419
%%WWWDIR%%/config/initializers/public_key.rb
1420
%%WWWDIR%%/config/initializers/rack_attack_git_basic_auth.rb
1420
%%WWWDIR%%/config/initializers/rack_attack_git_basic_auth.rb
1421
%%WWWDIR%%/config/initializers/rack_lineprof.rb
1421
%%WWWDIR%%/config/initializers/rack_lineprof.rb
1422
%%WWWDIR%%/config/initializers/redis_config.rb
1422
%%WWWDIR%%/config/initializers/relative_url.rb.sample
1423
%%WWWDIR%%/config/initializers/relative_url.rb.sample
1423
%%WWWDIR%%/config/initializers/secret_token.rb
1424
%%WWWDIR%%/config/initializers/secret_token.rb
1424
%%WWWDIR%%/config/initializers/sentry.rb
1425
%%WWWDIR%%/config/initializers/sentry.rb
Lines 2548-2553 Link Here
2548
%%WWWDIR%%/lib/gitlab/email/message/repository_push.rb
2549
%%WWWDIR%%/lib/gitlab/email/message/repository_push.rb
2549
%%WWWDIR%%/lib/gitlab/email/receiver.rb
2550
%%WWWDIR%%/lib/gitlab/email/receiver.rb
2550
%%WWWDIR%%/lib/gitlab/email/reply_parser.rb
2551
%%WWWDIR%%/lib/gitlab/email/reply_parser.rb
2552
%%WWWDIR%%/lib/gitlab/exclusive_lease.rb
2551
%%WWWDIR%%/lib/gitlab/fogbugz_import/client.rb
2553
%%WWWDIR%%/lib/gitlab/fogbugz_import/client.rb
2552
%%WWWDIR%%/lib/gitlab/fogbugz_import/importer.rb
2554
%%WWWDIR%%/lib/gitlab/fogbugz_import/importer.rb
2553
%%WWWDIR%%/lib/gitlab/fogbugz_import/project_creator.rb
2555
%%WWWDIR%%/lib/gitlab/fogbugz_import/project_creator.rb
Lines 2775-2780 Link Here
2775
%%WWWDIR%%/spec/controllers/projects_controller_spec.rb
2777
%%WWWDIR%%/spec/controllers/projects_controller_spec.rb
2776
%%WWWDIR%%/spec/controllers/root_controller_spec.rb
2778
%%WWWDIR%%/spec/controllers/root_controller_spec.rb
2777
%%WWWDIR%%/spec/controllers/sent_notification_controller_spec.rb
2779
%%WWWDIR%%/spec/controllers/sent_notification_controller_spec.rb
2780
%%WWWDIR%%/spec/controllers/sessions_controller_spec.rb
2778
%%WWWDIR%%/spec/controllers/snippets_controller_spec.rb
2781
%%WWWDIR%%/spec/controllers/snippets_controller_spec.rb
2779
%%WWWDIR%%/spec/controllers/uploads_controller_spec.rb
2782
%%WWWDIR%%/spec/controllers/uploads_controller_spec.rb
2780
%%WWWDIR%%/spec/controllers/users_controller_spec.rb
2783
%%WWWDIR%%/spec/controllers/users_controller_spec.rb
Lines 2884-2889 Link Here
2884
%%WWWDIR%%/spec/helpers/blob_helper_spec.rb
2887
%%WWWDIR%%/spec/helpers/blob_helper_spec.rb
2885
%%WWWDIR%%/spec/helpers/broadcast_messages_helper_spec.rb
2888
%%WWWDIR%%/spec/helpers/broadcast_messages_helper_spec.rb
2886
%%WWWDIR%%/spec/helpers/ci_status_helper_spec.rb
2889
%%WWWDIR%%/spec/helpers/ci_status_helper_spec.rb
2890
%%WWWDIR%%/spec/helpers/commits_helper_spec.rb
2887
%%WWWDIR%%/spec/helpers/diff_helper_spec.rb
2891
%%WWWDIR%%/spec/helpers/diff_helper_spec.rb
2888
%%WWWDIR%%/spec/helpers/emails_helper_spec.rb
2892
%%WWWDIR%%/spec/helpers/emails_helper_spec.rb
2889
%%WWWDIR%%/spec/helpers/events_helper_spec.rb
2893
%%WWWDIR%%/spec/helpers/events_helper_spec.rb
Lines 2994-2999 Link Here
2994
%%WWWDIR%%/spec/lib/gitlab/email/message/repository_push_spec.rb
2998
%%WWWDIR%%/spec/lib/gitlab/email/message/repository_push_spec.rb
2995
%%WWWDIR%%/spec/lib/gitlab/email/receiver_spec.rb
2999
%%WWWDIR%%/spec/lib/gitlab/email/receiver_spec.rb
2996
%%WWWDIR%%/spec/lib/gitlab/email/reply_parser_spec.rb
3000
%%WWWDIR%%/spec/lib/gitlab/email/reply_parser_spec.rb
3001
%%WWWDIR%%/spec/lib/gitlab/exclusive_lease_spec.rb
2997
%%WWWDIR%%/spec/lib/gitlab/git_access_spec.rb
3002
%%WWWDIR%%/spec/lib/gitlab/git_access_spec.rb
2998
%%WWWDIR%%/spec/lib/gitlab/git_access_wiki_spec.rb
3003
%%WWWDIR%%/spec/lib/gitlab/git_access_wiki_spec.rb
2999
%%WWWDIR%%/spec/lib/gitlab/github_import/client_spec.rb
3004
%%WWWDIR%%/spec/lib/gitlab/github_import/client_spec.rb

Return to bug 209225