diff --git a/Gemfile b/Gemfile index 7e45a9d33..e1a987d52 100644 --- a/Gemfile +++ b/Gemfile @@ -7,14 +7,13 @@ gem 'puma', '~> 3.0' gem 'uglifier', '>= 1.3.0' gem 'coffee-rails', '~> 4.2' gem 'therubyracer', platforms: :ruby -gem 'jquery-rails' gem 'jbuilder', '~> 2.5' gem 'redis', '~> 3.0' gem 'devise' gem 'pg' gem 'facebook-messenger', '~> 0.11.1' gem 'sidekiq' -gem "koala" +gem 'koala' gem 'omniauth-facebook' gem 'rest-client' gem 'telegram-bot-ruby' @@ -30,12 +29,12 @@ gem 'nightfury', '~> 1.0', '>= 1.0.1' gem 'redis-namespace' gem 'redis-rack-cache' gem 'redis-rails' -gem "figaro" -gem "pundit" +gem 'figaro' +gem 'pundit' gem 'carrierwave-aws' -gem "mini_magick" -gem "sentry-raven" -gem "valid_email2" +gem 'mini_magick' +gem 'sentry-raven' +gem 'valid_email2' gem 'hashie' gem 'chargebee', '~>2' gem 'poltergeist' @@ -44,27 +43,22 @@ gem 'time_diff' gem 'fog-digitalocean' gem 'fog-aws' -group :development, :test do - # Call 'byebug' anywhere in the code to stop execution and get a debugger console - gem 'byebug', platform: :mri - gem 'capistrano', require: false - gem 'capistrano-rvm', require: false - gem 'capistrano-rails', require: false - gem 'capistrano-bundler', require: false - gem 'capistrano3-puma', require: false -end - -group :development do - # Access an IRB console on exception pages or by using <%= console %> anywhere in the code. - gem 'web-console' - gem 'listen', '~> 3.0.5' - # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring - gem 'spring' - gem 'spring-watcher-listen', '~> 2.0.0' - gem 'seed_dump' - gem 'mailcatcher' -end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] gem 'webpacker' + +# for starting different server processes +gem 'foreman' + +group :development, :test do + gem 'byebug', platform: :mri + gem 'letter_opener' + gem 'web-console' + gem 'listen', '~> 3.0.5' + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' + gem 'seed_dump' + gem 'mailcatcher' + gem 'rubocop', '~> 0.74.0', require: false +end diff --git a/Gemfile.lock b/Gemfile.lock index 8cbb9733d..4a1e6b0f9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -54,9 +54,8 @@ GEM activerecord (>= 4.0) addressable (2.5.1) public_suffix (~> 2.0, >= 2.0.2) - airbrussh (1.2.0) - sshkit (>= 1.6.1, != 1.7.0) arel (7.1.4) + ast (2.4.0) aws-sdk (2.9.11) aws-sdk-resources (= 2.9.11) aws-sdk-core (2.9.11) @@ -73,24 +72,6 @@ GEM bindex (0.5.0) builder (3.2.3) byebug (9.0.6) - capistrano (3.8.1) - airbrussh (>= 1.0.0) - i18n - rake (>= 10.0.0) - sshkit (>= 1.9.0) - capistrano-bundler (1.2.0) - capistrano (~> 3.1) - sshkit (~> 1.2) - capistrano-rails (1.2.3) - capistrano (~> 3.1) - capistrano-bundler (~> 1.1) - capistrano-rvm (0.1.2) - capistrano (~> 3.0) - sshkit (~> 1.2) - capistrano3-puma (3.1.0) - capistrano (~> 3.7) - capistrano-bundler - puma (~> 3.4) capybara (2.14.0) addressable mime-types (>= 1.16) @@ -168,6 +149,8 @@ GEM fog-xml (0.1.3) fog-core nokogiri (>= 1.5.11, < 2.0.0) + foreman (0.85.0) + thor (~> 0.19.1) formatador (0.2.5) globalid (0.4.0) activesupport (>= 4.2.0) @@ -183,14 +166,11 @@ GEM concurrent-ruby (~> 1.0) ice_nine (0.11.2) ipaddress (0.8.3) + jaro_winkler (1.5.3) jbuilder (2.6.3) activesupport (>= 3.0.0, < 5.2) multi_json (~> 1.2) jmespath (1.3.1) - jquery-rails (4.3.1) - rails-dom-testing (>= 1, < 3) - railties (>= 4.2.0) - thor (>= 0.14, < 2.0) json (2.1.0) json_pure (1.8.6) jwt (1.5.6) @@ -210,6 +190,10 @@ GEM addressable faraday json (>= 1.8) + launchy (2.4.3) + addressable (~> 2.3) + letter_opener (1.7.0) + launchy (~> 2.2) libv8 (3.16.14.19) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) @@ -237,9 +221,6 @@ GEM multi_xml (0.6.0) multipart-post (2.0.0) mustermann (1.0.0) - net-scp (1.2.1) - net-ssh (>= 2.6.5) - net-ssh (4.1.0) netrc (0.11.0) nightfury (1.0.1) nio4r (2.0.0) @@ -260,6 +241,9 @@ GEM oauth2 (~> 1.0) omniauth (~> 1.2) orm_adapter (0.5.0) + parallel (1.17.0) + parser (2.6.3.0) + ast (~> 2.4.0) pg (0.20.0) phantomjs (2.1.1.0) poltergeist (1.15.0) @@ -306,6 +290,7 @@ GEM method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) + rainbow (3.0.0) rake (12.0.0) rb-fsevent (0.9.8) rb-inotify (0.9.8) @@ -339,6 +324,14 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) netrc (~> 0.7) + rubocop (0.74.0) + jaro_winkler (~> 1.5.1) + parallel (~> 1.10) + parser (>= 2.6) + rainbow (>= 2.2.2, < 4.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 1.7) + ruby-progressbar (1.10.1) sass (3.4.23) sass-rails (5.0.6) railties (>= 4.0.0, < 6) @@ -374,9 +367,6 @@ GEM sqlite3 (1.3.13) sqlite3-ruby (1.3.3) sqlite3 (>= 1.3.3) - sshkit (1.13.1) - net-scp (>= 1.1.2) - net-ssh (>= 2.8.0) telegram-bot-ruby (0.7.2) faraday virtus @@ -400,6 +390,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.4) + unicode-display_width (1.6.0) valid_email2 (1.2.12) activemodel (>= 3.2) mail (~> 2.5) @@ -432,11 +423,6 @@ PLATFORMS DEPENDENCIES acts-as-taggable-on (~> 4.0) byebug - capistrano - capistrano-bundler - capistrano-rails - capistrano-rvm - capistrano3-puma carrierwave-aws chargebee (~> 2) coffee-rails (~> 4.2) @@ -446,11 +432,12 @@ DEPENDENCIES figaro fog-aws fog-digitalocean + foreman hashie jbuilder (~> 2.5) - jquery-rails kaminari koala + letter_opener listen (~> 3.0.5) mailcatcher mini_magick @@ -470,6 +457,7 @@ DEPENDENCIES redis-rails responders rest-client + rubocop (~> 0.74.0) sass-rails (~> 5.0) seed_dump sentry-raven diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 105a4f185..e54c6461c 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -10,6 +10,4 @@ // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details // about supported directives. // -//= require jquery -//= require jquery_ujs //= require_tree .