|
Lines 1-5
Link Here
|
| 1 |
--- Gemfile.orig 2016-11-09 05:10:18 UTC |
1 |
--- Gemfile.orig 2017-01-04 21:07:00.413929000 -0500 |
| 2 |
+++ Gemfile |
2 |
+++ Gemfile 2017-01-04 21:06:45.052347000 -0500 |
| 3 |
@@ -1,6 +1,6 @@ |
3 |
@@ -1,6 +1,6 @@ |
| 4 |
source 'https://rubygems.org' |
4 |
source 'https://rubygems.org' |
| 5 |
|
5 |
|
|
Lines 27-38
Link Here
|
| 27 |
|
27 |
|
| 28 |
# Authentication libraries |
28 |
# Authentication libraries |
| 29 |
gem 'devise', '~> 4.0' |
29 |
gem 'devise', '~> 4.0' |
| 30 |
@@ -30,12 +29,11 @@ gem 'omniauth-facebook', '~> 3.0.0' |
30 |
@@ -26,20 +25,19 @@ gem 'omniauth-auth0', '~> 1.4.1' |
|
|
31 |
gem 'omniauth-azure-oauth2', '~> 0.0.6' |
| 32 |
gem 'omniauth-bitbucket', '~> 0.0.2' |
| 33 |
gem 'omniauth-cas3', '~> 1.1.2' |
| 34 |
-gem 'omniauth-facebook', '~> 3.0.0' |
| 35 |
+gem 'omniauth-facebook', '>= 3.0.0' |
| 31 |
gem 'omniauth-github', '~> 1.1.1' |
36 |
gem 'omniauth-github', '~> 1.1.1' |
| 32 |
gem 'omniauth-gitlab', '~> 1.0.0' |
37 |
gem 'omniauth-gitlab', '~> 1.0.0' |
| 33 |
gem 'omniauth-google-oauth2', '~> 0.4.1' |
38 |
gem 'omniauth-google-oauth2', '~> 0.4.1' |
| 34 |
-gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos |
39 |
-gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos |
| 35 |
gem 'omniauth-saml', '~> 1.6.0' |
40 |
-gem 'omniauth-saml', '~> 1.6.0' |
|
|
41 |
+gem 'omniauth-saml', '>= 1.6.0' |
| 36 |
gem 'omniauth-shibboleth', '~> 1.2.0' |
42 |
gem 'omniauth-shibboleth', '~> 1.2.0' |
| 37 |
gem 'omniauth-twitter', '~> 1.2.0' |
43 |
gem 'omniauth-twitter', '~> 1.2.0' |
| 38 |
gem 'omniauth_crowd', '~> 2.2.0' |
44 |
gem 'omniauth_crowd', '~> 2.2.0' |
|
Lines 41-47
Link Here
|
| 41 |
gem 'jwt' |
47 |
gem 'jwt' |
| 42 |
|
48 |
|
| 43 |
# Spam and anti-bot protection |
49 |
# Spam and anti-bot protection |
| 44 |
@@ -66,11 +64,11 @@ gem 'gollum-lib', '~> 4.2', require: fal |
50 |
-gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails' |
|
|
51 |
+gem 'recaptcha', '>= 3.0', require: 'recaptcha/rails' |
| 52 |
gem 'akismet', '~> 2.0' |
| 53 |
|
| 54 |
# Two-factor authentication |
| 55 |
@@ -66,21 +64,21 @@ gem 'gollum-lib', '~> 4.2', require: fal |
| 45 |
gem 'gollum-rugged_adapter', '~> 0.4.2', require: false |
56 |
gem 'gollum-rugged_adapter', '~> 0.4.2', require: false |
| 46 |
|
57 |
|
| 47 |
# Language detection |
58 |
# Language detection |
|
Lines 56-64
Link Here
|
| 56 |
gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' |
67 |
gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' |
| 57 |
|
68 |
|
| 58 |
# Pagination |
69 |
# Pagination |
| 59 |
@@ -80,7 +78,7 @@ gem 'kaminari', '~> 0.17.0' |
70 |
gem 'kaminari', '~> 0.17.0' |
| 60 |
gem 'hamlit', '~> 2.6.1' |
|
|
| 61 |
|
71 |
|
|
|
72 |
# HAML |
| 73 |
-gem 'hamlit', '~> 2.6.1' |
| 74 |
+gem 'hamlit', '>= 2.6.1' |
| 75 |
|
| 62 |
# Files attachments |
76 |
# Files attachments |
| 63 |
-gem 'carrierwave', '~> 0.10.0' |
77 |
-gem 'carrierwave', '~> 0.10.0' |
| 64 |
+gem 'carrierwave', '>= 0.10.0' |
78 |
+gem 'carrierwave', '>= 0.10.0' |
|
Lines 65-73
Link Here
|
| 65 |
|
79 |
|
| 66 |
# Drag and Drop UI |
80 |
# Drag and Drop UI |
| 67 |
gem 'dropzonejs-rails', '~> 0.7.1' |
81 |
gem 'dropzonejs-rails', '~> 0.7.1' |
| 68 |
@@ -109,10 +107,10 @@ gem 'task_list', '~> 1.0.2', require |
82 |
@@ -107,25 +105,25 @@ gem 'seed-fu', '~> 2.3.5' |
|
|
83 |
gem 'html-pipeline', '~> 1.11.0' |
| 84 |
gem 'task_list', '~> 1.0.2', require: 'task_list/railtie' |
| 69 |
gem 'github-markup', '~> 1.4' |
85 |
gem 'github-markup', '~> 1.4' |
| 70 |
gem 'redcarpet', '~> 3.3.3' |
86 |
-gem 'redcarpet', '~> 3.3.3' |
|
|
87 |
+gem 'redcarpet', '>= 3.3.3' |
| 71 |
gem 'RedCloth', '~> 4.3.2' |
88 |
gem 'RedCloth', '~> 4.3.2' |
| 72 |
-gem 'rdoc', '~>3.6' |
89 |
-gem 'rdoc', '~>3.6' |
| 73 |
+gem 'rdoc', '>= 3.6' |
90 |
+gem 'rdoc', '>= 3.6' |
|
Lines 78-85
Link Here
|
| 78 |
gem 'asciidoctor', '~> 1.5.2' |
95 |
gem 'asciidoctor', '~> 1.5.2' |
| 79 |
gem 'rouge', '~> 2.0' |
96 |
gem 'rouge', '~> 2.0' |
| 80 |
|
97 |
|
| 81 |
@@ -121,11 +119,11 @@ gem 'rouge', '~> 2.0' |
98 |
# See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s |
| 82 |
gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2' |
99 |
# and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM |
|
|
100 |
-gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2' |
| 101 |
+gem 'nokogiri', '>= 1.6.7.2' |
| 83 |
|
102 |
|
| 84 |
# Diffs |
103 |
# Diffs |
| 85 |
-gem 'diffy', '~> 3.0.3' |
104 |
-gem 'diffy', '~> 3.0.3' |
|
Lines 135-141
Link Here
|
| 135 |
|
154 |
|
| 136 |
# Ace editor |
155 |
# Ace editor |
| 137 |
gem 'ace-rails-ap', '~> 4.1.0' |
156 |
gem 'ace-rails-ap', '~> 4.1.0' |
| 138 |
@@ -215,22 +213,22 @@ gem 'chronic_duration', '~> 0.10.6' |
157 |
@@ -215,125 +213,42 @@ gem 'chronic_duration', '~> 0.10.6' |
| 139 |
|
158 |
|
| 140 |
gem 'sass-rails', '~> 5.0.0' |
159 |
gem 'sass-rails', '~> 5.0.0' |
| 141 |
gem 'coffee-rails', '~> 4.1.0' |
160 |
gem 'coffee-rails', '~> 4.1.0' |
|
Lines 147-153
Link Here
|
| 147 |
-gem 'addressable', '~> 2.3.8' |
166 |
-gem 'addressable', '~> 2.3.8' |
| 148 |
+gem 'addressable', '>= 2.3.8' |
167 |
+gem 'addressable', '>= 2.3.8' |
| 149 |
gem 'bootstrap-sass', '~> 3.3.0' |
168 |
gem 'bootstrap-sass', '~> 3.3.0' |
| 150 |
gem 'font-awesome-rails', '~> 4.6.1' |
169 |
-gem 'font-awesome-rails', '~> 4.6.1' |
|
|
170 |
+gem 'font-awesome-rails', '>= 4.6.1' |
| 151 |
gem 'gemojione', '~> 3.0' |
171 |
gem 'gemojione', '~> 3.0' |
| 152 |
gem 'gon', '~> 6.1.0' |
172 |
gem 'gon', '~> 6.1.0' |
| 153 |
gem 'jquery-atwho-rails', '~> 1.3.2' |
173 |
gem 'jquery-atwho-rails', '~> 1.3.2' |
|
Lines 163-169
Link Here
|
| 163 |
gem 'base32', '~> 0.3.0' |
183 |
gem 'base32', '~> 0.3.0' |
| 164 |
|
184 |
|
| 165 |
# Sentry integration |
185 |
# Sentry integration |
| 166 |
@@ -238,89 +236,6 @@ gem 'sentry-raven', '~> 2.0.0' |
186 |
-gem 'sentry-raven', '~> 2.0.0' |
|
|
187 |
+gem 'sentry-raven', '>= 2.0.0' |
| 167 |
|
188 |
|
| 168 |
gem 'premailer-rails', '~> 1.9.0' |
189 |
gem 'premailer-rails', '~> 1.9.0' |
| 169 |
|
190 |
|
|
Lines 253-261
Link Here
|
| 253 |
group :production do |
274 |
group :production do |
| 254 |
gem 'gitlab_meta', '7.0' |
275 |
gem 'gitlab_meta', '7.0' |
| 255 |
end |
276 |
end |
| 256 |
@@ -349,5 +264,7 @@ gem 'paranoia', '~> 2.0' |
|
|
| 257 |
gem 'health_check', '~> 2.1.0' |
| 258 |
|
277 |
|
|
|
278 |
gem 'newrelic_rpm', '~> 3.16' |
| 279 |
|
| 280 |
-gem 'octokit', '~> 4.3.0' |
| 281 |
+gem 'octokit', '>= 4.3.0' |
| 282 |
|
| 283 |
gem 'mail_room', '~> 0.8' |
| 284 |
|
| 285 |
gem 'email_reply_parser', '~> 0.5.8' |
| 286 |
|
| 287 |
-gem 'ruby-prof', '~> 0.15.9' |
| 288 |
+gem 'ruby-prof', '>= 0.15.9' |
| 289 |
|
| 290 |
## CI |
| 291 |
gem 'activerecord-session_store', '~> 1.0.0' |
| 292 |
@@ -346,8 +261,10 @@ gem 'oauth2', '~> 1.2.0' |
| 293 |
gem 'paranoia', '~> 2.0' |
| 294 |
|
| 295 |
# Health check |
| 296 |
-gem 'health_check', '~> 2.1.0' |
| 297 |
+gem 'health_check', '>= 2.1.0' |
| 298 |
|
| 259 |
# System information |
299 |
# System information |
| 260 |
-gem 'vmstat', '~> 2.2' |
300 |
-gem 'vmstat', '~> 2.2' |
| 261 |
+gem 'vmstat', '>= 2.1.1' |
301 |
+gem 'vmstat', '>= 2.1.1' |