diff --git a/Gemfile b/Gemfile index e05bda0..d81d751 100644 --- a/Gemfile +++ b/Gemfile @@ -1,9 +1,9 @@ source 'https://rubygems.org' -gem 'rails', '4.2.0' +gem 'rails', '4.2.11' -gem "mysql2" +gem "mysql2", "0.4.10" gem 'sass-rails', '~> 5.0' @@ -25,7 +25,7 @@ gem 'unicorn' gem 'haml-rails' -gem "therubyracer" +gem "therubyracer", group: :production gem "country_select" @@ -34,9 +34,6 @@ group :development, :test do #gem 'capistrano-rails' #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' diff --git a/Gemfile.lock b/Gemfile.lock index 6270288..39a9436 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,244 +1,247 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.0) - actionpack (= 4.2.0) - actionview (= 4.2.0) - activejob (= 4.2.0) + actionmailer (4.2.11) + actionpack (= 4.2.11) + actionview (= 4.2.11) + activejob (= 4.2.11) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.0) - actionview (= 4.2.0) - activesupport (= 4.2.0) - rack (~> 1.6.0) + actionpack (4.2.11) + actionview (= 4.2.11) + activesupport (= 4.2.11) + rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.1) - actionview (4.2.0) - activesupport (= 4.2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (4.2.11) + activesupport (= 4.2.11) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.1) - activejob (4.2.0) - activesupport (= 4.2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (4.2.11) + activesupport (= 4.2.11) globalid (>= 0.3.0) - activemodel (4.2.0) - activesupport (= 4.2.0) + activemodel (4.2.11) + activesupport (= 4.2.11) builder (~> 3.1) - activerecord (4.2.0) - activemodel (= 4.2.0) - activesupport (= 4.2.0) + activerecord (4.2.11) + activemodel (= 4.2.11) + activesupport (= 4.2.11) arel (~> 6.0) - activesupport (4.2.0) + activesupport (4.2.11) i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) acts_as_commentable (4.0.2) - acts_as_tree (2.1.0) + acts_as_tree (2.9.1) activerecord (>= 3.0.0) - addressable (2.4.0) - arel (6.0.0) - bcrypt (3.1.10) - binding_of_caller (0.7.2) + arel (6.0.4) + bcrypt (3.1.16) + binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) - builder (3.2.2) - byebug (3.5.1) - columnize (~> 0.8) - debugger-linecache (~> 1.2) - 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) + builder (3.2.4) + byebug (11.1.3) + carrierwave (1.3.2) + activemodel (>= 4.0.0) + activesupport (>= 4.0.0) mime-types (>= 1.16) - coffee-rails (4.1.0) + ssrf_filter (~> 1.0) + coffee-rails (4.1.1) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.0) - coffee-script (2.3.0) + railties (>= 4.0.0, < 5.1.x) + coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.9.1) - columnize (0.9.0) - countries (1.2.2) - currencies (~> 0.4.2) - i18n_data (~> 0.7.0) - country_select (2.5.1) - countries (~> 1.2.0) + coffee-script-source (1.12.2) + commonjs (0.2.7) + concurrent-ruby (1.1.8) + countries (3.1.0) + i18n_data (~> 0.11.0) + sixarm_ruby_unaccent (~> 1.1) + unicode_utils (~> 1.4) + country_select (4.0.0) + countries (~> 3.0) sort_alphabetical (~> 1.0) - curb (0.8.8) - currencies (0.4.2) - debug_inspector (0.0.2) - debugger-linecache (1.2.0) + crass (1.0.6) + curb (0.9.11) + debug_inspector (1.1.0) erubis (2.7.0) - execjs (2.3.0) - fastimage (1.8.1) - addressable (~> 2.3, >= 2.3.5) + execjs (2.8.1) + fastimage (2.2.3) + ffi (1.15.0) formtastic (2.3.0) actionpack (>= 3.0) formtastic-bootstrap (3.0.0) formtastic (>= 2.2) - globalid (0.3.3) - activesupport (>= 4.1.0) + globalid (0.4.2) + activesupport (>= 4.2.0) gravatar_image_tag (1.2.0) - haml (4.0.6) + haml (5.2.1) + temple (>= 0.8.0) tilt - haml-rails (0.8.2) + haml-rails (1.0.0) actionpack (>= 4.0.1) activesupport (>= 4.0.1) - haml (>= 3.1, < 5.0) + haml (>= 4.0.6, < 6.0) html2haml (>= 1.0.1) railties (>= 4.0.1) - highline (1.7.2) - hike (1.2.3) - html2haml (2.0.0) + html2haml (2.2.0) erubis (~> 2.7.0) - haml (~> 4.0.0) - nokogiri (~> 1.6.0) + haml (>= 4.0, < 6) + nokogiri (>= 1.6.0) ruby_parser (~> 3.5) - i18n (0.7.0) - i18n_data (0.7.0) - jbuilder (2.2.8) - activesupport (>= 3.0.0, < 5) - multi_json (~> 1.2) - jquery-rails (4.0.3) - rails-dom-testing (~> 1.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + i18n_data (0.11.0) + jbuilder (2.9.1) + activesupport (>= 4.2.0) + jquery-rails (4.4.0) + rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (1.8.2) - kaminari (0.16.3) - actionpack (>= 3.0.0) - activesupport (>= 3.0.0) + json (1.8.6) + kaminari (1.2.1) + activesupport (>= 4.1.0) + kaminari-actionview (= 1.2.1) + 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 (>= 0.13.0) rails - kgio (2.9.3) - libv8 (3.16.14.7) - loofah (2.0.1) + kaminari-core (1.2.1) + kgio (2.11.3) + less (2.6.0) + 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) - mail (2.6.3) - mime-types (>= 1.16, < 3) - mime-types (2.4.3) - mini_portile (0.6.2) - minitest (5.5.1) - multi_json (1.10.1) - mysql2 (0.3.18) - net-scp (1.2.1) - net-ssh (>= 2.6.5) - net-sftp (2.1.2) - net-ssh (>= 2.6.5) - 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) + mail (2.7.1) + mini_mime (>= 0.1.1) + mime-types (3.3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2021.0225) + mini_mime (1.1.0) + mini_portile2 (2.4.0) + minitest (5.14.4) + mysql2 (0.4.10) + nokogiri (1.10.10) + mini_portile2 (~> 2.4.0) + rack (1.6.13) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.0) - actionmailer (= 4.2.0) - actionpack (= 4.2.0) - actionview (= 4.2.0) - activejob (= 4.2.0) - activemodel (= 4.2.0) - activerecord (= 4.2.0) - activesupport (= 4.2.0) + rails (4.2.11) + actionmailer (= 4.2.11) + actionpack (= 4.2.11) + actionview (= 4.2.11) + activejob (= 4.2.11) + activemodel (= 4.2.11) + activerecord (= 4.2.11) + activesupport (= 4.2.11) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.0) + railties (= 4.2.11) sprockets-rails - rails-deprecated_sanitizer (1.0.3) + rails-deprecated_sanitizer (1.0.4) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.5) - activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.6.0) + rails-dom-testing (1.0.9) + activesupport (>= 4.2.0, < 5.0) + nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.1) - loofah (~> 2.0) - railties (4.2.0) - actionpack (= 4.2.0) - activesupport (= 4.2.0) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (4.2.11) + actionpack (= 4.2.11) + activesupport (= 4.2.11) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - raindrops (0.13.0) - rake (10.4.2) - rdoc (4.2.0) - json (~> 1.4) - ref (1.0.5) - rmagick (2.13.4) + raindrops (0.19.1) + rake (13.0.3) + rb-fsevent (0.11.0) + rb-inotify (0.10.1) + ffi (~> 1.0) + rdoc (4.3.0) + ref (2.0.0) + rmagick (4.2.2) roo (2.1.1) nokogiri (~> 1) rubyzip (~> 1.1, < 2.0.0) - roo-xls (1.0.0) + roo-xls (1.2.0) nokogiri - roo (>= 2.0.0beta1, < 3) + roo (>= 2.0.0, < 3) spreadsheet (> 0.9.0) - ruby-ole (1.2.11.8) - ruby_parser (3.6.4) - sexp_processor (~> 4.1) - rubyzip (1.1.7) - rvm-capistrano (1.4.1) - capistrano (>= 2.0.0) - sass (3.4.12) - sass-rails (5.0.1) - railties (>= 4.0.0, < 5.0) + ruby-ole (1.2.12.2) + ruby_parser (3.15.1) + sexp_processor (~> 4.9) + rubyzip (1.3.0) + sass (3.7.4) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sass-rails (5.0.7) + railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) - tilt (~> 1.1) - sdoc (0.4.1) + tilt (>= 1.1, < 3) + sdoc (0.4.2) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) - sexp_processor (4.4.5) - slop (3.6.0) - sort_alphabetical (1.0.2) + sexp_processor (4.15.2) + sixarm_ruby_unaccent (1.2.0) + sort_alphabetical (1.1.0) unicode_utils (>= 1.2.2) - spreadsheet (1.0.9) - ruby-ole (>= 1.0) - spring (1.3.2) - sprockets (2.12.3) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.4) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (>= 2.8, < 4.0) - therubyracer (0.12.1) - libv8 (~> 3.16.14.0) + spreadsheet (1.2.8) + ruby-ole + spring (2.1.1) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.2) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + ssrf_filter (1.0.7) + temple (0.8.2) + therubyracer (0.12.3) + libv8 (~> 3.16.14.15) ref - thor (0.19.1) - thread_safe (0.3.4) - tilt (1.4.1) - turbolinks (2.5.3) - coffee-rails - twitter-bootstrap-rails (3.2.0) - actionpack (~> 4.1) - execjs (~> 2.2) - rails (~> 4.1) - railties (~> 4.1) - tzinfo (1.2.2) + thor (1.1.0) + thread_safe (0.3.6) + tilt (2.0.10) + turbolinks (5.2.1) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) + twitter-bootstrap-rails (3.2.2) + actionpack (>= 3.1) + execjs (>= 2.2.2, >= 2.2) + less-rails (>= 2.5.0) + railties (>= 3.1) + tzinfo (1.2.9) thread_safe (~> 0.1) - uglifier (2.7.0) - execjs (>= 0.3.0) - json (>= 1.8.0) + uglifier (4.2.0) + execjs (>= 0.3.0, < 3) unicode_utils (1.4.0) - unicorn (4.8.3) + unicorn (6.0.0) kgio (~> 2.6) - rack raindrops (~> 0.7) - web-console (2.0.0) - activemodel (~> 4.0) + web-console (2.3.0) + activemodel (>= 4.0) binding_of_caller (>= 0.7.2) - railties (~> 4.0) + railties (>= 4.0) sprockets-rails (>= 2.0, < 4.0) PLATFORMS @@ -249,7 +252,6 @@ DEPENDENCIES acts_as_tree bcrypt (~> 3.1.7) byebug - capistrano (= 2.15.5) carrierwave coffee-rails (~> 4.1.0) country_select @@ -262,13 +264,11 @@ DEPENDENCIES jbuilder (~> 2.0) jquery-rails kaminari-bootstrap - mysql2 - net-ssh (~> 2.7.0) - rails (= 4.2.0) + mysql2 (= 0.4.10) + rails (= 4.2.11) rmagick roo (~> 2.1.0) roo-xls - rvm-capistrano (= 1.4.1) sass-rails (~> 5.0) sdoc (~> 0.4.0) spring @@ -278,3 +278,6 @@ DEPENDENCIES uglifier (>= 1.3.0) unicorn web-console (~> 2.0) + +BUNDLED WITH + 1.17.3 diff --git a/config/env_init b/config/env_init index d4850fd..6a3d2c9 100644 --- a/config/env_init +++ b/config/env_init @@ -1,5 +1,5 @@ -APP_RUBY=2.1.2 +APP_RUBY=2.6.0 ENV=production APP_ROOT=/srv/www/web/ballalama3_app/current/ GEM_HOME=/srv/www/web/.rvm/gems/ruby-$APP_RUBY