Compare commits

..

No commits in common. "4a948bca26a27db36e0c31c362cbbc9694abaa03" and "fb893ed4c3375292eb9363d121c7cef845008b84" have entirely different histories.

3 changed files with 174 additions and 171 deletions

View File

@ -3,7 +3,7 @@ source 'http://rubygems.org'
gem 'rails', '4.2.10' gem 'rails', '4.2.10'
gem "mysql2", "0.4.10" gem "mysql2"
gem 'sass-rails', '5.0.6' gem 'sass-rails', '5.0.6'
@ -36,6 +36,12 @@ group :development, :test do
#gem 'capistrano-rails' #gem 'capistrano-rails'
#gem "rvm-capistrano" #gem "rvm-capistrano"
gem "capistrano", '2.15.9', group: :development, require: false
gem "rvm-capistrano",'1.4.1', group: :development
#gem 'net-ssh', '~>2.7.0'
#gem 'net-sftp'
gem 'net-ssh', '~> 5.1.0'
#gem 'openssl', '~> 2.0.0.beta.1' #gem 'openssl', '~> 2.0.0.beta.1'

View File

@ -36,182 +36,176 @@ GEM
thread_safe (~> 0.3, >= 0.3.4) thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1) tzinfo (~> 1.1)
acts_as_commentable (4.0.2) acts_as_commentable (4.0.2)
acts_as_tree (2.9.1) acts_as_tree (2.1.0)
activerecord (>= 3.0.0) activerecord (>= 3.0.0)
addressable (2.4.0)
arel (6.0.4) arel (6.0.4)
bcrypt (3.1.16) bcrypt (3.1.10)
binding_of_caller (1.0.0) binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1) debug_inspector (>= 0.0.1)
builder (3.2.4) builder (3.2.3)
byebug (11.1.3) byebug (3.5.1)
carrierwave (1.3.2) columnize (~> 0.8)
activemodel (>= 4.0.0) debugger-linecache (~> 1.2)
activesupport (>= 4.0.0) slop (~> 3.6)
capistrano (2.15.9)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
carrierwave (0.10.0)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
json (>= 1.7)
mime-types (>= 1.16) mime-types (>= 1.16)
ssrf_filter (~> 1.0)
chronic (0.10.2) chronic (0.10.2)
coffee-rails (4.1.1) coffee-rails (4.1.0)
coffee-script (>= 2.2.0) coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.1.x) railties (>= 4.0.0, < 5.0)
coffee-script (2.4.1) coffee-script (2.3.0)
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.12.2) coffee-script-source (1.9.1)
commander (4.6.0) columnize (0.9.0)
highline (~> 2.0.0) commander (4.4.6)
commonjs (0.2.7) highline (~> 1.7.2)
concurrent-ruby (1.1.8) concurrent-ruby (1.1.3)
countries (3.1.0) countries (1.2.2)
i18n_data (~> 0.11.0) currencies (~> 0.4.2)
sixarm_ruby_unaccent (~> 1.1) i18n_data (~> 0.7.0)
unicode_utils (~> 1.4) country_select (2.5.1)
country_select (4.0.0) countries (~> 1.2.0)
countries (~> 3.0)
sort_alphabetical (~> 1.0) sort_alphabetical (~> 1.0)
crass (1.0.6) crass (1.0.4)
curb (0.9.10) curb (0.9.10)
debug_inspector (1.1.0) currencies (0.4.2)
debug_inspector (0.0.2)
debugger-linecache (1.2.0)
domain_name (0.5.20190701) domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0) unf (>= 0.0.5, < 1.0.0)
elasticsearch (7.12.0) elasticsearch (6.0.1)
elasticsearch-api (= 7.12.0) elasticsearch-api (= 6.0.1)
elasticsearch-transport (= 7.12.0) elasticsearch-transport (= 6.0.1)
elasticsearch-api (7.12.0) elasticsearch-api (6.0.1)
multi_json multi_json
elasticsearch-transport (7.12.0) elasticsearch-transport (6.0.1)
faraday (~> 1) faraday
multi_json multi_json
erubis (2.7.0) erubis (2.7.0)
execjs (2.8.1) execjs (2.3.0)
faraday (1.4.1) faraday (0.12.2)
faraday-excon (~> 1.1)
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.1)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
ruby2_keywords (>= 0.0.4) fastimage (1.8.1)
faraday-excon (1.1.0) addressable (~> 2.3, >= 2.3.5)
faraday-net_http (1.0.1) ffi (1.9.25)
faraday-net_http_persistent (1.1.0)
fastimage (2.2.3)
ffi (1.15.0)
formtastic (2.3.0) formtastic (2.3.0)
actionpack (>= 3.0) actionpack (>= 3.0)
formtastic-bootstrap (3.0.0) formtastic-bootstrap (3.0.0)
formtastic (>= 2.2) formtastic (>= 2.2)
geocoder (1.6.7) geocoder (1.2.9)
gibbon (3.4.0) gibbon (3.1.1)
faraday (>= 0.16.0) faraday (>= 0.9.1)
multi_json (>= 1.11.0) multi_json (>= 1.11.0)
globalid (0.4.2) globalid (0.4.1)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
gravatar_image_tag (1.2.0) gravatar_image_tag (1.2.0)
haml (5.2.1) haml (4.0.6)
temple (>= 0.8.0)
tilt tilt
haml-rails (1.0.0) haml-rails (0.8.2)
actionpack (>= 4.0.1) actionpack (>= 4.0.1)
activesupport (>= 4.0.1) activesupport (>= 4.0.1)
haml (>= 4.0.6, < 6.0) haml (>= 3.1, < 5.0)
html2haml (>= 1.0.1) html2haml (>= 1.0.1)
railties (>= 4.0.1) railties (>= 4.0.1)
hashie (4.1.0) hashie (3.5.7)
highline (2.0.3) highline (1.7.8)
houston (2.4.0) houston (2.4.0)
commander (~> 4.4) commander (~> 4.4)
json json
html2haml (2.2.0) html2haml (2.0.0)
erubis (~> 2.7.0) erubis (~> 2.7.0)
haml (>= 4.0, < 6) haml (~> 4.0.0)
nokogiri (>= 1.6.0) nokogiri (~> 1.6.0)
ruby_parser (~> 3.5) ruby_parser (~> 3.5)
http-accept (1.7.0) http-accept (1.7.0)
http-cookie (1.0.3) http-cookie (1.0.3)
domain_name (~> 0.5) domain_name (~> 0.5)
i18n (0.9.5) i18n (0.9.5)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
i18n_data (0.11.0) i18n_data (0.7.0)
iban-tools (1.1.0) iban-tools (1.1.0)
idn-ruby (0.1.0) jbuilder (2.2.8)
jbuilder (2.9.1) activesupport (>= 3.0.0, < 5)
activesupport (>= 4.2.0) multi_json (~> 1.2)
jquery-rails (4.4.0) jquery-rails (4.0.3)
rails-dom-testing (>= 1, < 3) rails-dom-testing (~> 1.0)
railties (>= 4.2.0) railties (>= 4.2.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
json (1.8.6) json (1.8.6)
jwt (2.2.3) jwt (1.5.6)
kaminari (1.2.1) kaminari (0.16.3)
activesupport (>= 4.1.0) actionpack (>= 3.0.0)
kaminari-actionview (= 1.2.1) activesupport (>= 3.0.0)
kaminari-activerecord (= 1.2.1)
kaminari-core (= 1.2.1)
kaminari-actionview (1.2.1)
actionview
kaminari-core (= 1.2.1)
kaminari-activerecord (1.2.1)
activerecord
kaminari-core (= 1.2.1)
kaminari-bootstrap (3.0.1) kaminari-bootstrap (3.0.1)
kaminari (>= 0.13.0) kaminari (>= 0.13.0)
rails rails
kaminari-core (1.2.1) kgio (2.9.3)
kgio (2.11.3) libv8 (3.16.14.7)
less (2.6.0) loofah (2.2.3)
commonjs (~> 0.2.7)
less-rails (4.0.0)
actionpack (>= 4)
less (~> 2.6.0)
sprockets (>= 2)
libv8 (3.16.14.19)
loofah (2.9.1)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
mail (2.7.1) mail (2.7.0)
mini_mime (>= 0.1.1) mini_mime (>= 0.1.1)
mailjet (1.6.0) mailjet (1.5.4)
activesupport (>= 3.1.0) activesupport (>= 3.1.0)
rack (>= 1.4.0) rack (>= 1.4.0)
rest-client (>= 2.0.0) rest-client
mime-types (3.3.1) mime-types (3.2.2)
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2021.0225) mime-types-data (3.2018.0812)
mini_mime (1.1.0) mini_mime (1.0.1)
mini_portile2 (2.4.0) mini_portile2 (2.1.0)
minitest (5.14.4) minitest (5.11.3)
multi_json (1.15.0) multi_json (1.13.1)
multi_xml (0.6.0) multi_xml (0.6.0)
multipart-post (2.1.1) multipart-post (2.0.0)
mysql2 (0.4.10) mysql2 (0.4.10)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (5.1.0)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
netrc (0.11.0) netrc (0.11.0)
nokogiri (1.10.10) nokogiri (1.6.8.1)
mini_portile2 (~> 2.4.0) mini_portile2 (~> 2.1.0)
oauth2 (1.4.7) oauth2 (1.4.0)
faraday (>= 0.8, < 2.0) faraday (>= 0.8, < 0.13)
jwt (>= 1.0, < 3.0) jwt (~> 1.0)
multi_json (~> 1.3) multi_json (~> 1.3)
multi_xml (~> 0.5) multi_xml (~> 0.5)
rack (>= 1.2, < 3) rack (>= 1.2, < 3)
ogone-rails (0.1.10) ogone-rails (0.1.10)
activesupport activesupport
omniauth (2.0.4) omniauth (1.6.1)
hashie (>= 3.4.6) hashie (>= 3.4.6, < 3.6.0)
rack (>= 1.6.2, < 3) rack (>= 1.6.2, < 3)
rack-protection omniauth-facebook (4.0.0)
omniauth-facebook (8.0.0)
omniauth-oauth2 (~> 1.2) omniauth-oauth2 (~> 1.2)
omniauth-oauth2 (1.7.1) omniauth-oauth2 (1.4.0)
oauth2 (~> 1.4) oauth2 (~> 1.0)
omniauth (>= 1.9, < 3) omniauth (~> 1.2)
paypal-sdk-core (0.3.4) paypal-sdk-core (0.3.4)
multi_json (~> 1.0) multi_json (~> 1.0)
xml-simple xml-simple
paypal-sdk-merchant (1.117.2) paypal-sdk-merchant (1.117.2)
paypal-sdk-core (~> 0.3.0) paypal-sdk-core (~> 0.3.0)
posix-spawn (0.3.15) posix-spawn (0.3.13)
pygments.rb (2.2.0) pygments.rb (1.2.1)
rack (1.6.13) multi_json (>= 1.0.0)
rack-protection (2.1.0) rack (1.6.11)
rack
rack-test (0.6.3) rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)
rails (4.2.10) rails (4.2.10)
@ -225,14 +219,14 @@ GEM
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.2.10) railties (= 4.2.10)
sprockets-rails sprockets-rails
rails-deprecated_sanitizer (1.0.4) rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha) activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.9) rails-dom-testing (1.0.9)
activesupport (>= 4.2.0, < 5.0) activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6) nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1) rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.3.0) rails-html-sanitizer (1.0.4)
loofah (~> 2.3) loofah (~> 2.2, >= 2.2.2)
rails_autolink (1.1.6) rails_autolink (1.1.6)
rails (> 3.1) rails (> 3.1)
railties (4.2.10) railties (4.2.10)
@ -240,33 +234,35 @@ GEM
activesupport (= 4.2.10) activesupport (= 4.2.10)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
raindrops (0.19.1) raindrops (0.13.0)
rake (13.0.3) rake (12.3.1)
rb-fsevent (0.11.0) rb-fsevent (0.10.3)
rb-inotify (0.10.1) rb-inotify (0.9.10)
ffi (~> 1.0) ffi (>= 0.5.0, < 2)
rdoc (4.3.0) rdoc (4.2.0)
redcarpet (3.5.1) json (~> 1.4)
ref (2.0.0) redcarpet (3.3.4)
ref (1.0.5)
rest-client (2.1.0) rest-client (2.1.0)
http-accept (>= 1.7.0, < 2.0) http-accept (>= 1.7.0, < 2.0)
http-cookie (>= 1.0.2, < 2.0) http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0) mime-types (>= 1.16, < 4.0)
netrc (~> 0.8) netrc (~> 0.8)
rmagick (4.2.2) rmagick (2.15.4)
roo (2.1.1) roo (2.1.1)
nokogiri (~> 1) nokogiri (~> 1)
rubyzip (~> 1.1, < 2.0.0) rubyzip (~> 1.1, < 2.0.0)
roo-xls (1.2.0) roo-xls (1.0.0)
nokogiri nokogiri
roo (>= 2.0.0, < 3) roo (>= 2.0.0beta1, < 3)
spreadsheet (> 0.9.0) spreadsheet (> 0.9.0)
ruby-ole (1.2.12.2) ruby-ole (1.2.11.8)
ruby2_keywords (0.0.4) ruby_parser (3.6.4)
ruby_parser (3.15.1) sexp_processor (~> 4.1)
sexp_processor (~> 4.9) rubyzip (1.1.7)
rubyzip (1.3.0) rvm-capistrano (1.4.1)
sass (3.7.4) capistrano (>= 2.0.0)
sass (3.7.2)
sass-listen (~> 4.0.0) sass-listen (~> 4.0.0)
sass-listen (4.0.0) sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4) rb-fsevent (~> 0.9, >= 0.9.4)
@ -277,68 +273,66 @@ GEM
sprockets (>= 2.8, < 4.0) sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0) sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3) tilt (>= 1.1, < 3)
sdoc (0.4.2) sdoc (0.4.1)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0) rdoc (~> 4.0)
searchkick (3.1.3) searchkick (2.4.0)
activemodel (>= 4.2) activemodel (>= 4.1)
elasticsearch (>= 5) elasticsearch (>= 1)
hashie hashie
sexp_processor (4.15.2) sexp_processor (4.4.5)
sixarm_ruby_unaccent (1.2.0) slop (3.6.0)
sort_alphabetical (1.1.0) sort_alphabetical (1.0.2)
unicode_utils (>= 1.2.2) unicode_utils (>= 1.2.2)
spreadsheet (1.2.8) spreadsheet (1.0.9)
ruby-ole ruby-ole (>= 1.0)
spring (2.1.1) spring (1.3.2)
sprockets (3.7.2) sprockets (3.7.2)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
rack (> 1, < 3) rack (> 1, < 3)
sprockets-rails (3.2.2) sprockets-rails (3.2.1)
actionpack (>= 4.0) actionpack (>= 4.0)
activesupport (>= 4.0) activesupport (>= 4.0)
sprockets (>= 3.0.0) sprockets (>= 3.0.0)
ssrf_filter (1.0.7) therubyracer (0.12.1)
temple (0.8.2) libv8 (~> 3.16.14.0)
therubyracer (0.12.3)
libv8 (~> 3.16.14.15)
ref ref
thor (1.1.0) thor (0.20.3)
thread_safe (0.3.6) thread_safe (0.3.6)
tilt (2.0.10) tilt (2.0.8)
truncate_html (0.9.3) truncate_html (0.9.3)
turbolinks (5.2.1) turbolinks (2.5.3)
turbolinks-source (~> 5.2) coffee-rails
turbolinks-source (5.2.0) twitter-bootstrap-rails (3.2.0)
twitter-bootstrap-rails (3.2.2) actionpack (~> 4.1)
actionpack (>= 3.1) execjs (~> 2.2)
execjs (>= 2.2.2, >= 2.2) rails (~> 4.1)
less-rails (>= 2.5.0) railties (~> 4.1)
railties (>= 3.1) twitter-text (1.13.4)
twitter-text (3.1.0)
idn-ruby
unf (~> 0.1.0) unf (~> 0.1.0)
tzinfo (1.2.9) tzinfo (1.2.5)
thread_safe (~> 0.1) thread_safe (~> 0.1)
uglifier (4.2.0) uglifier (2.7.0)
execjs (>= 0.3.0, < 3) execjs (>= 0.3.0)
json (>= 1.8.0)
unf (0.1.4) unf (0.1.4)
unf_ext unf_ext
unf_ext (0.0.7.7) unf_ext (0.0.7.2)
unicode_utils (1.4.0) unicode_utils (1.4.0)
unicorn (6.0.0) unicorn (4.8.3)
kgio (~> 2.6) kgio (~> 2.6)
rack
raindrops (~> 0.7) raindrops (~> 0.7)
web-console (2.3.0) web-console (2.0.0)
activemodel (>= 4.0) activemodel (~> 4.0)
binding_of_caller (>= 0.7.2) binding_of_caller (>= 0.7.2)
railties (>= 4.0) railties (~> 4.0)
sprockets-rails (>= 2.0, < 4.0) sprockets-rails (>= 2.0, < 4.0)
whenever (1.0.0) whenever (1.0.0)
chronic (>= 0.6.3) chronic (>= 0.6.3)
wicked_pdf (2.1.0) wicked_pdf (0.11.0)
activesupport rails
xml-simple (1.1.8) xml-simple (1.1.5)
PLATFORMS PLATFORMS
ruby ruby
@ -348,6 +342,7 @@ DEPENDENCIES
acts_as_tree acts_as_tree
bcrypt (~> 3.1.7) bcrypt (~> 3.1.7)
byebug byebug
capistrano (= 2.15.9)
carrierwave carrierwave
coffee-rails (~> 4.1.0) coffee-rails (~> 4.1.0)
country_select country_select
@ -365,7 +360,8 @@ DEPENDENCIES
jquery-rails jquery-rails
kaminari-bootstrap kaminari-bootstrap
mailjet mailjet
mysql2 (= 0.4.10) mysql2
net-ssh (~> 5.1.0)
nokogiri nokogiri
ogone-rails ogone-rails
omniauth-facebook omniauth-facebook
@ -378,6 +374,7 @@ DEPENDENCIES
rmagick rmagick
roo (~> 2.1.0) roo (~> 2.1.0)
roo-xls roo-xls
rvm-capistrano (= 1.4.1)
sass-rails (= 5.0.6) sass-rails (= 5.0.6)
sdoc (~> 0.4.0) sdoc (~> 0.4.0)
searchkick searchkick

View File

@ -1,5 +1,5 @@
APP_RUBY=2.6.0 APP_RUBY=2.3.0
ENV=production ENV=production
APP_ROOT=/srv/www/web/kaps_app/current/ APP_ROOT=/srv/www/web/kaps_app/current/
GEM_HOME=/srv/www/web/.rvm/gems/ruby-$APP_RUBY GEM_HOME=/srv/www/web/.rvm/gems/ruby-$APP_RUBY