Skip to content

Commit

Permalink
Merge 5ecbdc8 into 1d36f66
Browse files Browse the repository at this point in the history
  • Loading branch information
hellcp committed Nov 12, 2022
2 parents 1d36f66 + 5ecbdc8 commit 9359f69
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 8 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,4 @@ public/upload*
upload*
.byebug_history
docker-compose.yml
VERSION
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ gem 'devise'
gem 'devise_ichain_authenticatable', '>= 0.3.0'
gem 'espinita', git: 'https://github.com/michelson/espinita.git',
ref: '2dc027edc838ee5de0d68558f1758273ccc01636'
gem 'git'
gem 'inherited_resources'
gem 'kaminari'
# Newer prawn lost the template support in Document
Expand Down
5 changes: 5 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,9 @@ GEM
activesupport (>= 4.0, < 7)
execjs (2.8.1)
ffi (1.15.5)
git (1.12.0)
addressable (~> 2.8)
rchardet (~> 1.8)
globalid (1.0.0)
activesupport (>= 5.0)
haml (5.2.2)
Expand Down Expand Up @@ -280,6 +283,7 @@ GEM
activesupport (>= 5.0)
i18n
polyamorous (= 2.3.0)
rchardet (1.8.0)
rdoc (6.3.3)
redcarpet (3.5.1)
regexp_parser (2.6.0)
Expand Down Expand Up @@ -423,6 +427,7 @@ DEPENDENCIES
devise_ichain_authenticatable (>= 0.3.0)
espinita!
exception_notification
git
haml-rails
inherited_resources
jquery-rails
Expand Down
1 change: 0 additions & 1 deletion config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ class Application < Rails::Application

# Custom directories with classes and modules you want to be autoloadable.
# config.autoload_paths += %W(#{config.root}/extras)
config.autoload_once_paths += %W(#{config.root}/lib)

# Only load the plugins named here, in the order given (default is alphabetical).
# :all can be used as a placeholder for all plugins not explicitly named.
Expand Down
15 changes: 15 additions & 0 deletions config/initializers/version.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
if Rails.root.join('.git').exist?
git = Git.open(Rails.root)
begin
version = git.describe
rescue
version = '0.0.0'
end
File.write(Rails.root.join('VERSION'), version)
end

module TravelSupport
# If we are outside of the version control, this file needs to be created
# manually
VERSION = File.read(Rails.root.join('VERSION')).strip
end
7 changes: 0 additions & 7 deletions lib/travel_support/version.rb

This file was deleted.

0 comments on commit 9359f69

Please sign in to comment.