Compare commits

..

No commits in common. "f5942d80772c402d54abb517c33e7618b4f003ce" and "902f2daecc99ad0a44357cec4aeb682b167d9870" have entirely different histories.

3 changed files with 216 additions and 220 deletions

View File

@ -1,9 +1,9 @@
source 'http://rubygems.org' source 'http://rubygems.org'
gem 'rails', '4.2.10' gem 'rails', '4.2.6'
gem 'pg', '~> 0.20' gem "pg"
gem 'pg_search' gem 'pg_search'
gem 'sass-rails', '5.0.3' gem 'sass-rails', '5.0.3'
@ -36,6 +36,9 @@ 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 'web-console', '~> 2.0' gem 'web-console', '~> 2.0'

View File

@ -1,317 +1,307 @@
GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
actionmailer (4.2.10) actionmailer (4.2.6)
actionpack (= 4.2.10) actionpack (= 4.2.6)
actionview (= 4.2.10) actionview (= 4.2.6)
activejob (= 4.2.10) activejob (= 4.2.6)
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.6)
actionview (= 4.2.10) actionview (= 4.2.6)
activesupport (= 4.2.10) activesupport (= 4.2.6)
rack (~> 1.6) rack (~> 1.6)
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.2)
actionview (4.2.10) actionview (4.2.6)
activesupport (= 4.2.10) activesupport (= 4.2.6)
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.2)
activejob (4.2.10) activejob (4.2.6)
activesupport (= 4.2.10) activesupport (= 4.2.6)
globalid (>= 0.3.0) globalid (>= 0.3.0)
activemodel (4.2.10) activemodel (4.2.6)
activesupport (= 4.2.10) activesupport (= 4.2.6)
builder (~> 3.1) builder (~> 3.1)
activerecord (4.2.10) activerecord (4.2.6)
activemodel (= 4.2.10) activemodel (= 4.2.6)
activesupport (= 4.2.10) activesupport (= 4.2.6)
arel (~> 6.0) arel (~> 6.0)
activesupport (4.2.10) activesupport (4.2.6)
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.3)
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) concurrent-ruby (1.0.2)
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) curb (0.8.8)
curb (0.9.11) currencies (0.4.2)
debug_inspector (1.1.0) debug_inspector (0.0.2)
elasticsearch (7.12.0) debugger-linecache (1.2.0)
elasticsearch-api (= 7.12.0) elasticsearch (1.0.15)
elasticsearch-transport (= 7.12.0) elasticsearch-api (= 1.0.15)
elasticsearch-api (7.12.0) elasticsearch-transport (= 1.0.15)
elasticsearch-api (1.0.15)
multi_json multi_json
elasticsearch-model (7.1.1) elasticsearch-model (0.1.8)
activesupport (> 3) activesupport (> 3)
elasticsearch (> 1) elasticsearch (> 0.4)
hashie hashie
elasticsearch-rails (7.1.1) elasticsearch-rails (0.1.8)
elasticsearch-transport (7.12.0) elasticsearch-transport (1.0.15)
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.9.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)
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)
globalid (0.4.2) globalid (0.3.6)
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)
hashie (4.1.0) hashie (3.4.3)
html2haml (2.2.0) highline (1.7.8)
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)
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.3)
jwt (2.2.3) jwt (1.5.1)
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.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)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
mail (2.7.1) mail (2.6.4)
mini_mime (>= 0.1.1) mime-types (>= 1.16, < 4)
mime-types (3.3.1) mime-types (3.1)
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2021.0225) mime-types-data (3.2016.0521)
mini_mime (1.1.0) mini_portile2 (2.1.0)
mini_portile2 (2.4.0) minitest (5.9.0)
minitest (5.14.4) multi_json (1.12.1)
multi_json (1.15.0) multi_xml (0.5.5)
multi_xml (0.6.0) multipart-post (2.0.0)
multipart-post (2.1.1) net-scp (1.2.1)
nokogiri (1.10.10) net-ssh (>= 2.6.5)
mini_portile2 (~> 2.4.0) net-sftp (2.1.2)
oauth2 (1.4.7) net-ssh (>= 2.6.5)
faraday (>= 0.8, < 2.0) net-ssh (2.7.0)
jwt (>= 1.0, < 3.0) net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
nokogiri (1.6.8)
mini_portile2 (~> 2.1.0)
pkg-config (~> 1.1.7)
oauth2 (1.1.0)
faraday (>= 0.8, < 0.10)
jwt (~> 1.0, < 1.5.2)
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.3.1)
hashie (>= 3.4.6) hashie (>= 1.2, < 4)
rack (>= 1.6.2, < 3) rack (>= 1.0, < 3)
rack-protection omniauth-facebook (3.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)
pg (0.21.0) pg (0.21.0)
pg_search (2.3.0) pg_search (2.1.0)
activerecord (>= 4.2) activerecord (>= 4.2)
activesupport (>= 4.2) activesupport (>= 4.2)
posix-spawn (0.3.15) arel (>= 6)
pygments.rb (2.2.0) pkg-config (1.1.7)
rack (1.6.13) posix-spawn (0.3.11)
rack-protection (2.1.0) pygments.rb (0.6.3)
rack posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.2.0)
rack (1.6.4)
rack-test (0.6.3) rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)
rails (4.2.10) rails (4.2.6)
actionmailer (= 4.2.10) actionmailer (= 4.2.6)
actionpack (= 4.2.10) actionpack (= 4.2.6)
actionview (= 4.2.10) actionview (= 4.2.6)
activejob (= 4.2.10) activejob (= 4.2.6)
activemodel (= 4.2.10) activemodel (= 4.2.6)
activerecord (= 4.2.10) activerecord (= 4.2.6)
activesupport (= 4.2.10) activesupport (= 4.2.6)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.2.10) railties (= 4.2.6)
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.7)
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.3)
loofah (~> 2.3) loofah (~> 2.0)
railties (4.2.10) railties (4.2.6)
actionpack (= 4.2.10) actionpack (= 4.2.6)
activesupport (= 4.2.10) activesupport (= 4.2.6)
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 (11.2.2)
rb-fsevent (0.11.0) rdoc (4.2.0)
rb-inotify (0.10.1) json (~> 1.4)
ffi (~> 1.0) redcarpet (3.3.4)
rdoc (4.3.0) ref (1.0.5)
redcarpet (3.5.1) 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)
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-listen (~> 4.0.0) sass (3.4.22)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (5.0.3) sass-rails (5.0.3)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 5.0)
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) 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 (3.6.2)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
rack (> 1, < 3) rack (> 1, < 3)
sprockets-rails (3.2.2) sprockets-rails (3.0.4)
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.19.1)
thread_safe (0.3.6) thread_safe (0.3.5)
tilt (1.4.1) tilt (1.4.1)
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.2)
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)
wicked_pdf (2.1.0) wicked_pdf (0.11.0)
activesupport rails
zip_tricks (5.5.0) yajl-ruby (1.2.1)
zipline (1.3.0) zip_tricks (4.2.3)
actionpack (>= 3.2.1, < 7.0) zipline (0.0.12)
zip_tricks (>= 4.2.1, < 6.0) curb (>= 0.8.0, < 0.10)
rails (>= 3.2.1, < 5.1)
zip_tricks (>= 4.0.0, <= 5.0.0)
PLATFORMS PLATFORMS
ruby ruby
@ -321,6 +311,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
@ -337,18 +328,20 @@ DEPENDENCIES
jbuilder (~> 2.0) jbuilder (~> 2.0)
jquery-rails jquery-rails
kaminari-bootstrap kaminari-bootstrap
net-ssh (~> 2.7.0)
nokogiri nokogiri
ogone-rails ogone-rails
omniauth-facebook omniauth-facebook
pg (~> 0.20) pg
pg_search pg_search
posix-spawn posix-spawn
pygments.rb pygments.rb
rails (= 4.2.10) rails (= 4.2.6)
redcarpet redcarpet
rmagick rmagick
roo (~> 2.1.0) roo (~> 2.1.0)
roo-xls roo-xls
rvm-capistrano (= 1.4.1)
sass-rails (= 5.0.3) sass-rails (= 5.0.3)
sdoc (~> 0.4.0) sdoc (~> 0.4.0)
spring spring
@ -364,4 +357,4 @@ DEPENDENCIES
zipline zipline
BUNDLED WITH BUNDLED WITH
1.17.3 1.13.7

View File

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