Compare commits

..

No commits in common. "3d27e71dceac1e426a263bdc6fa30c0f90f0f88b" and "ad4364be6bb151b4f5b2853dc641ef8a9715530a" have entirely different histories.

3 changed files with 186 additions and 185 deletions

View File

@ -1,9 +1,9 @@
source 'https://rubygems.org' source 'https://rubygems.org'
gem 'rails', '4.2.10' gem 'rails', '4.2.0'
gem 'mysql2', "0.4.10" gem "mysql2"
gem 'sass-rails', '~> 5.0' gem 'sass-rails', '~> 5.0'
@ -25,7 +25,7 @@ gem 'unicorn'
gem 'haml-rails' gem 'haml-rails'
gem "therubyracer", group: :production gem "therubyracer"
gem "country_select" gem "country_select"
@ -34,6 +34,9 @@ group :development, :test do
#gem 'capistrano-rails' #gem 'capistrano-rails'
#gem "rvm-capistrano" #gem "rvm-capistrano"
gem "capistrano", '2.15.5', group: :development, require: false
gem "rvm-capistrano",'1.4.1', group: :development
gem 'net-ssh', '~>2.7.0'
gem 'web-console', '~> 2.0' gem 'web-console', '~> 2.0'

View File

@ -1,247 +1,244 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actionmailer (4.2.10) actionmailer (4.2.0)
actionpack (= 4.2.10) actionpack (= 4.2.0)
actionview (= 4.2.10) actionview (= 4.2.0)
activejob (= 4.2.10) activejob (= 4.2.0)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5) rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.10) actionpack (4.2.0)
actionview (= 4.2.10) actionview (= 4.2.0)
activesupport (= 4.2.10) activesupport (= 4.2.0)
rack (~> 1.6) rack (~> 1.6.0)
rack-test (~> 0.6.2) rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5) rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2) rails-html-sanitizer (~> 1.0, >= 1.0.1)
actionview (4.2.10) actionview (4.2.0)
activesupport (= 4.2.10) activesupport (= 4.2.0)
builder (~> 3.1) builder (~> 3.1)
erubis (~> 2.7.0) erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5) rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.3) rails-html-sanitizer (~> 1.0, >= 1.0.1)
activejob (4.2.10) activejob (4.2.0)
activesupport (= 4.2.10) activesupport (= 4.2.0)
globalid (>= 0.3.0) globalid (>= 0.3.0)
activemodel (4.2.10) activemodel (4.2.0)
activesupport (= 4.2.10) activesupport (= 4.2.0)
builder (~> 3.1) builder (~> 3.1)
activerecord (4.2.10) activerecord (4.2.0)
activemodel (= 4.2.10) activemodel (= 4.2.0)
activesupport (= 4.2.10) activesupport (= 4.2.0)
arel (~> 6.0) arel (~> 6.0)
activesupport (4.2.10) activesupport (4.2.0)
i18n (~> 0.7) i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1) minitest (~> 5.1)
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)
arel (6.0.4) addressable (2.4.0)
bcrypt (3.1.16) arel (6.0.0)
binding_of_caller (1.0.0) bcrypt (3.1.10)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1) debug_inspector (>= 0.0.1)
builder (3.2.4) builder (3.2.2)
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.5)
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) coffee-rails (4.1.0)
coffee-rails (4.1.1)
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)
commonjs (0.2.7) columnize (0.9.0)
concurrent-ruby (1.1.8) countries (1.2.2)
countries (3.1.0) currencies (~> 0.4.2)
i18n_data (~> 0.11.0) i18n_data (~> 0.7.0)
sixarm_ruby_unaccent (~> 1.1) country_select (2.5.1)
unicode_utils (~> 1.4) countries (~> 1.2.0)
country_select (4.0.0)
countries (~> 3.0)
sort_alphabetical (~> 1.0) sort_alphabetical (~> 1.0)
crass (1.0.6) curb (0.8.8)
curb (0.9.11) currencies (0.4.2)
debug_inspector (1.1.0) debug_inspector (0.0.2)
debugger-linecache (1.2.0)
erubis (2.7.0) erubis (2.7.0)
execjs (2.8.1) execjs (2.3.0)
fastimage (2.2.3) fastimage (1.8.1)
ffi (1.15.0) addressable (~> 2.3, >= 2.3.5)
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)
globalid (0.4.2) globalid (0.3.3)
activesupport (>= 4.2.0) activesupport (>= 4.1.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)
html2haml (2.2.0) highline (1.7.2)
hike (1.2.3)
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)
i18n (0.9.5) i18n (0.7.0)
concurrent-ruby (~> 1.0) i18n_data (0.7.0)
i18n_data (0.11.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.2)
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.0.1)
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)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
mail (2.7.1) mail (2.6.3)
mini_mime (>= 0.1.1) mime-types (>= 1.16, < 3)
mime-types (3.3.1) mime-types (2.4.3)
mime-types-data (~> 3.2015) mini_portile (0.6.2)
mime-types-data (3.2021.0225) minitest (5.5.1)
mini_mime (1.1.0) multi_json (1.10.1)
mini_portile2 (2.4.0) mysql2 (0.3.18)
minitest (5.14.4) net-scp (1.2.1)
mysql2 (0.4.10) net-ssh (>= 2.6.5)
nokogiri (1.10.10) net-sftp (2.1.2)
mini_portile2 (~> 2.4.0) net-ssh (>= 2.6.5)
rack (1.6.13) net-ssh (2.7.0)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
rack (1.6.0)
rack-test (0.6.3) rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)
rails (4.2.10) rails (4.2.0)
actionmailer (= 4.2.10) actionmailer (= 4.2.0)
actionpack (= 4.2.10) actionpack (= 4.2.0)
actionview (= 4.2.10) actionview (= 4.2.0)
activejob (= 4.2.10) activejob (= 4.2.0)
activemodel (= 4.2.10) activemodel (= 4.2.0)
activerecord (= 4.2.10) activerecord (= 4.2.0)
activesupport (= 4.2.10) activesupport (= 4.2.0)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.2.10) railties (= 4.2.0)
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.5)
activesupport (>= 4.2.0, < 5.0) activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6) nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1) rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.3.0) rails-html-sanitizer (1.0.1)
loofah (~> 2.3) loofah (~> 2.0)
railties (4.2.10) railties (4.2.0)
actionpack (= 4.2.10) actionpack (= 4.2.0)
activesupport (= 4.2.10) activesupport (= 4.2.0)
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 (10.4.2)
rb-fsevent (0.11.0) rdoc (4.2.0)
rb-inotify (0.10.1) json (~> 1.4)
ffi (~> 1.0) ref (1.0.5)
rdoc (4.3.0) rmagick (2.13.4)
ref (2.0.0)
rmagick (4.2.2)
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)
ruby_parser (3.15.1) ruby_parser (3.6.4)
sexp_processor (~> 4.9) sexp_processor (~> 4.1)
rubyzip (1.3.0) rubyzip (1.1.7)
sass (3.7.4) rvm-capistrano (1.4.1)
sass-listen (~> 4.0.0) capistrano (>= 2.0.0)
sass-listen (4.0.0) sass (3.4.12)
rb-fsevent (~> 0.9, >= 0.9.4) sass-rails (5.0.1)
rb-inotify (~> 0.9, >= 0.9.7) railties (>= 4.0.0, < 5.0)
sass-rails (5.0.7)
railties (>= 4.0.0, < 6)
sass (~> 3.1) sass (~> 3.1)
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)
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)
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 (2.12.3)
concurrent-ruby (~> 1.0) hike (~> 1.2)
rack (> 1, < 3) multi_json (~> 1.0)
sprockets-rails (3.2.2) rack (~> 1.0)
actionpack (>= 4.0) tilt (~> 1.1, != 1.3.0)
activesupport (>= 4.0) sprockets-rails (2.2.4)
sprockets (>= 3.0.0) actionpack (>= 3.0)
ssrf_filter (1.0.7) activesupport (>= 3.0)
temple (0.8.2) sprockets (>= 2.8, < 4.0)
therubyracer (0.12.3) therubyracer (0.12.1)
libv8 (~> 3.16.14.15) libv8 (~> 3.16.14.0)
ref ref
thor (1.1.0) thor (0.19.1)
thread_safe (0.3.6) thread_safe (0.3.4)
tilt (2.0.10) tilt (1.4.1)
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) tzinfo (1.2.2)
tzinfo (1.2.9)
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)
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)
PLATFORMS PLATFORMS
@ -252,6 +249,7 @@ DEPENDENCIES
acts_as_tree acts_as_tree
bcrypt (~> 3.1.7) bcrypt (~> 3.1.7)
byebug byebug
capistrano (= 2.15.5)
carrierwave carrierwave
coffee-rails (~> 4.1.0) coffee-rails (~> 4.1.0)
country_select country_select
@ -264,11 +262,13 @@ DEPENDENCIES
jbuilder (~> 2.0) jbuilder (~> 2.0)
jquery-rails jquery-rails
kaminari-bootstrap kaminari-bootstrap
mysql2 (= 0.4.10) mysql2
rails (= 4.2.10) net-ssh (~> 2.7.0)
rails (= 4.2.0)
rmagick rmagick
roo (~> 2.1.0) roo (~> 2.1.0)
roo-xls roo-xls
rvm-capistrano (= 1.4.1)
sass-rails (~> 5.0) sass-rails (~> 5.0)
sdoc (~> 0.4.0) sdoc (~> 0.4.0)
spring spring
@ -278,6 +278,3 @@ DEPENDENCIES
uglifier (>= 1.3.0) uglifier (>= 1.3.0)
unicorn unicorn
web-console (~> 2.0) web-console (~> 2.0)
BUNDLED WITH
1.17.3

View File

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