From cce9b3743fa1128ffb72b7d2c5f5aa94a52993e9 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Mon, 20 Mar 2017 13:39:43 +0000 Subject: updated json gem to one that compiles --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 87cffd8..8c0ed3c 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ gem "log4r", "=1.0.6" gem "ipaddress", "=0.8.0" gem "webmock", "=1.7.6" gem "ruby_protobuf", "=0.4.11" -gem "json", "=1.5.4" +gem "json", "=1.8.1" gem "datamapper", "=1.2.0" gem "dm-aggregates", "=1.2.0" gem "dm-do-adapter", "=1.2.0" -- cgit v1.2.1 From c1ca338fdb32b05fd047730be9ca6569d22c6806 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Mon, 20 Mar 2017 14:08:34 +0000 Subject: Updated gems to (roughly) jessie versions; removed XMPP support. Also changed the postgres tests to "skip" if no postgres db is available. --- Gemfile | 57 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 28 insertions(+), 29 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 8c0ed3c..0bd6198 100644 --- a/Gemfile +++ b/Gemfile @@ -1,36 +1,35 @@ source "https://rubygems.org" -gem "bcrypt-ruby", "=3.0.1" -gem "timecop", "=0.3.5" -gem "log4r", "=1.0.6" -gem "ipaddress", "=0.8.0" -gem "webmock", "=1.7.6" -gem "ruby_protobuf", "=0.4.11" -gem "json", "=1.8.1" -gem "datamapper", "=1.2.0" -gem "dm-aggregates", "=1.2.0" -gem "dm-do-adapter", "=1.2.0" -gem "dm-migrations", "=1.2.0" -gem "dm-postgres-adapter", "=1.2.0" -gem "dm-sqlite-adapter", "=1.2.0" -gem "dm-transactions", "=1.2.0" -gem "dm-types", "=1.2.0" -gem "dm-validations", "=1.2.0" -gem "sanitize", "=2.0.3" -gem "rmail", "=1.1.0" -gem "xmpp4r", "=0.5.6" -gem "thin", "=1.6.3" -gem "haml", "=3.0.15" -gem "RedCloth" -gem "rack" -gem "rack-protection" -gem "rack-test" -gem "rack-flash3" -gem "tilt", "=1.3.3" -gem "sinatra", "=1.4.6" -gem "locale", "=2.1.0" +gem "bcrypt-ruby", "= 3.1.5" +gem "log4r", "= 1.1.10" +gem "ipaddress", "= 0.8.0" +gem "ruby_protobuf", "= 0.4.11" +gem "json", "= 1.8.1" +gem "datamapper" +gem "dm-aggregates" +gem "dm-do-adapter" +gem "dm-migrations" +gem "dm-postgres-adapter" +gem "dm-sqlite-adapter" +gem "dm-transactions" +gem "dm-types" +gem "dm-validations" +gem "sanitize", "= 2.1.0" +gem "rmail", "= 1.1.0" +gem "thin", "= 1.6.3" +gem "haml", "= 4.0.5" +gem "RedCloth", "= 4.2.9" +gem "rack", "= 1.5.2" +gem "rack-protection", "= 1.5.2" +gem "rack-flash3", "= 1.0.5" +gem "tilt", "= 1.4.1" +gem "sinatra", "~> 1.4.5" +gem "locale", "= 2.1.0" group :test do gem "simplecov", :require => false + gem "rack-test", "= 0.6.3" + gem "webmock", "= 1.19.0" + gem "timecop", "= 0.7.1" end -- cgit v1.2.1 From bcde8969e4ef5acba8ee1fe3a284c9757c73678d Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Mon, 20 Mar 2017 15:36:33 +0000 Subject: Added haml-contrib for the textile filter; updated debian packaging a little --- Gemfile | 1 + 1 file changed, 1 insertion(+) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 0bd6198..5af4b41 100644 --- a/Gemfile +++ b/Gemfile @@ -19,6 +19,7 @@ gem "sanitize", "= 2.1.0" gem "rmail", "= 1.1.0" gem "thin", "= 1.6.3" gem "haml", "= 4.0.5" +gem "haml-contrib" gem "RedCloth", "= 4.2.9" gem "rack", "= 1.5.2" gem "rack-protection", "= 1.5.2" -- cgit v1.2.1 From 28e99f9de3f42a566011985c22e51c907ee27681 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Mon, 20 Mar 2017 15:56:44 +0000 Subject: Moved most gems into debian deps; fixed test "skip" to "omit"; renamed test with duped name --- Gemfile | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 5af4b41..6343365 100644 --- a/Gemfile +++ b/Gemfile @@ -1,11 +1,7 @@ source "https://rubygems.org" - gem "bcrypt-ruby", "= 3.1.5" -gem "log4r", "= 1.1.10" -gem "ipaddress", "= 0.8.0" gem "ruby_protobuf", "= 0.4.11" -gem "json", "= 1.8.1" gem "datamapper" gem "dm-aggregates" gem "dm-do-adapter" @@ -15,22 +11,29 @@ gem "dm-sqlite-adapter" gem "dm-transactions" gem "dm-types" gem "dm-validations" -gem "sanitize", "= 2.1.0" -gem "rmail", "= 1.1.0" -gem "thin", "= 1.6.3" -gem "haml", "= 4.0.5" -gem "haml-contrib" -gem "RedCloth", "= 4.2.9" -gem "rack", "= 1.5.2" -gem "rack-protection", "= 1.5.2" -gem "rack-flash3", "= 1.0.5" -gem "tilt", "= 1.4.1" -gem "sinatra", "~> 1.4.5" -gem "locale", "= 2.1.0" + +group :devlopment do + gem "log4r" + gem "ipaddress" + gem "ruby_protobuf" + gem "json" + gem "sanitize" + gem "rmail" + gem "thin" + gem "haml" + gem "haml-contrib" + gem "RedCloth" + gem "rack" + gem "rack-protection" + gem "rack-flash3" + gem "tilt" + gem "sinatra" + gem "locale" +end group :test do gem "simplecov", :require => false - gem "rack-test", "= 0.6.3" - gem "webmock", "= 1.19.0" - gem "timecop", "= 0.7.1" + gem "rack-test" + gem "webmock" + gem "timecop" end -- cgit v1.2.1 From 1a2ad3bfd7a08b578f675f8a99ff78a5e8d6eae7 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Mon, 20 Mar 2017 16:04:07 +0000 Subject: Removed libxml2/libxslt-dev from gitlab-ci; moved dev gems into a development group. --- Gemfile | 1 - 1 file changed, 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 6343365..62192c7 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,6 @@ gem "dm-validations" group :devlopment do gem "log4r" gem "ipaddress" - gem "ruby_protobuf" gem "json" gem "sanitize" gem "rmail" -- cgit v1.2.1 From e56dc80cbf0bb21e7232173bed465800a1a59e79 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Mon, 20 Mar 2017 22:00:25 +0000 Subject: Updated Gemfile to pull gems in Debian into a separate group --- Gemfile | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 62192c7..7d58599 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,5 @@ source "https://rubygems.org" -gem "bcrypt-ruby", "= 3.1.5" gem "ruby_protobuf", "= 0.4.11" gem "datamapper" gem "dm-aggregates" @@ -12,27 +11,30 @@ gem "dm-transactions" gem "dm-types" gem "dm-validations" -group :devlopment do - gem "log4r" - gem "ipaddress" - gem "json" - gem "sanitize" - gem "rmail" - gem "thin" - gem "haml" - gem "haml-contrib" - gem "RedCloth" - gem "rack" - gem "rack-protection" - gem "rack-flash3" - gem "tilt" - gem "sinatra" - gem "locale" +# +# The versions here are to match Jessie +# +group :development do + gem "log4r", "= 1.1.10" + gem "ipaddress", "= 0.8.0" + gem "json", "= 1.8.1" + gem "sanitize", "= 2.1.0" + gem "rmail", "= 1.1.0" + gem "thin", "= 1.6.3" + gem "haml", "= 4.0.5" + gem "haml-contrib", "= 1.0.0" + gem "RedCloth", "= 4.2.9" + gem "rack", "= 1.5.2" + gem "rack-protection", "= 1.5.2" + gem "rack-flash3", "= 1.0.5" + gem "tilt", "= 1.4.1" + gem "sinatra", "= 1.4.5" + gem "locale", "= 2.1.0" end group :test do gem "simplecov", :require => false - gem "rack-test" - gem "webmock" - gem "timecop" + gem "rack-test", "= 0.6.3" + gem "webmock", "= 1.19.0" + gem "timecop", "= 0.7.1" end -- cgit v1.2.1 From 929c689f3381ac71d80b2dda55a0ddf602efafe2 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Thu, 22 Jun 2017 14:16:29 +0100 Subject: Reconfigure server package to deploy to /srv/mauvealert --- Gemfile | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 7d58599..8acb3ba 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" -gem "ruby_protobuf", "= 0.4.11" +gem "ruby_protobuf", "~> 0.4.11" gem "datamapper" gem "dm-aggregates" gem "dm-do-adapter" @@ -11,30 +11,28 @@ gem "dm-transactions" gem "dm-types" gem "dm-validations" -# +# # The versions here are to match Jessie # -group :development do - gem "log4r", "= 1.1.10" - gem "ipaddress", "= 0.8.0" - gem "json", "= 1.8.1" - gem "sanitize", "= 2.1.0" - gem "rmail", "= 1.1.0" - gem "thin", "= 1.6.3" - gem "haml", "= 4.0.5" - gem "haml-contrib", "= 1.0.0" - gem "RedCloth", "= 4.2.9" - gem "rack", "= 1.5.2" - gem "rack-protection", "= 1.5.2" - gem "rack-flash3", "= 1.0.5" - gem "tilt", "= 1.4.1" - gem "sinatra", "= 1.4.5" - gem "locale", "= 2.1.0" -end +gem "log4r", "~> 1.1.10" +gem "ipaddress", "~> 0.8.0" +gem "json", "~> 1.8.1" +gem "sanitize", "~> 2.1.0" +gem "rmail", "~> 1.1.0" +gem "thin", "~> 1.6.3" +gem "haml", "~> 4.0.5" +gem "haml-contrib", "~> 1.0.0" +gem "RedCloth", "~> 4.2.9" +gem "rack", "~> 1.5.2" +gem "rack-protection", "~> 1.5.2" +gem "rack-flash3", "~> 1.0.5" +gem "tilt", "~> 1.4.1" +gem "sinatra", "~> 1.4.5" +gem "locale", "~> 2.1.0" group :test do gem "simplecov", :require => false - gem "rack-test", "= 0.6.3" - gem "webmock", "= 1.19.0" - gem "timecop", "= 0.7.1" + gem "rack-test", "~> 0.6.3" + gem "webmock", "~> 1.19.0" + gem "timecop", "~> 0.7.1" end -- cgit v1.2.1 From fa9b1e69d7835bce47990648c6d01fc3f67fcded Mon Sep 17 00:00:00 2001 From: telyn Date: Mon, 29 Jan 2018 15:36:25 +0000 Subject: Add changelog entry & remove locale from gemfile --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 8acb3ba..4fc00ac 100644 --- a/Gemfile +++ b/Gemfile @@ -28,9 +28,9 @@ gem "rack-protection", "~> 1.5.2" gem "rack-flash3", "~> 1.0.5" gem "tilt", "~> 1.4.1" gem "sinatra", "~> 1.4.5" -gem "locale", "~> 2.1.0" group :test do + gem "locale", "~> 2.1.0" gem "simplecov", :require => false gem "rack-test", "~> 0.6.3" gem "webmock", "~> 1.19.0" -- cgit v1.2.1