diff --git a/.dockerignore b/.dockerignore index df2f4a120..b1c33292b 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,7 +1,6 @@ .env .env.* .bundle -.git log/* tmp/* vendor/bundle/* \ No newline at end of file diff --git a/Gemfile b/Gemfile index 3ce90303e..02c406e63 100644 --- a/Gemfile +++ b/Gemfile @@ -55,8 +55,8 @@ gem 'faraday_middleware-aws-sigv4', '~> 0.2.4' gem 'rack-utf8_sanitizer', '~> 1.6' gem 'oj_mimic_json', '~> 1.0', '>= 1.0.1' gem 'turnout', '~> 2.5' -# gem 'paper_trail', '~> 10.2' gem 'audited', '~> 4.8' +gem 'git', '~> 1.5' group :development, :test do gem 'rspec-rails', '~> 3.5', '>= 3.5.2' diff --git a/Gemfile.lock b/Gemfile.lock index 839fda3b5..6d1cce32a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - aasm (5.0.1) + aasm (5.0.2) concurrent-ruby (~> 1.0) actioncable (5.2.2) actionpack (= 5.2.2) @@ -56,8 +56,8 @@ GEM arel (9.0.0) audited (4.8.0) activerecord (>= 4.0, < 5.3) - aws-eventstream (1.0.1) - aws-partitions (1.143.0) + aws-eventstream (1.0.2) + aws-partitions (1.144.0) aws-sdk-core (3.46.2) aws-eventstream (~> 1.0) aws-partitions (~> 1.0) @@ -66,7 +66,7 @@ GEM aws-sdk-kms (1.13.0) aws-sdk-core (~> 3, >= 3.39.0) aws-sigv4 (~> 1.0) - aws-sdk-s3 (1.30.1) + aws-sdk-s3 (1.31.0) aws-sdk-core (~> 3, >= 3.39.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.0) @@ -223,6 +223,7 @@ GEM flipper (~> 0.16.1) gender_detector (0.1.2) unicode_utils (>= 1.3.0) + git (1.5.0) globalid (0.4.2) activesupport (>= 4.2.0) haml (5.0.4) @@ -306,7 +307,7 @@ GEM minitest (5.11.3) money (6.13.2) i18n (>= 0.6.4, <= 2) - msgpack (1.2.7) + msgpack (1.2.8) multi_json (1.13.1) multipart-post (2.0.0) mysql2 (0.4.10) @@ -519,6 +520,7 @@ DEPENDENCIES flipper (~> 0.16.0) flipper-active_support_cache_store gender_detector (~> 0.1.2) + git (~> 1.5) iso8601 (~> 0.9.0) json (~> 1.8, >= 1.8.5) jsonlint (~> 0.2.0) diff --git a/config/initializers/_version.rb b/config/initializers/_version.rb index 40f38280f..5e6c11b3a 100644 --- a/config/initializers/_version.rb +++ b/config/initializers/_version.rb @@ -1,6 +1,7 @@ module Lupo class Application + g = Git.open(Rails.root, :log => Logger.new(STDOUT)) VERSION = "2.3.43" - REVISION = `git rev-parse HEAD` + REVISION = g.object('HEAD').sha end end \ No newline at end of file