Sovia 5 on rails 5

.gitignore

@@ -9,12 +9,18 @@
 
 # Ignore all logfiles and tempfiles.
 /log/*
+/tmp/*
 !/log/.keep
-/tmp
+!/tmp/.keep
+
+# Ignore Byebug command history file.
+.byebug_history
 
 /config/database.yml
 /config/secrets.yml
 
+/public/uploads
+
 /spec/examples.txt
 
-/public/uploads/*
+.env

Gemfile

@@ -2,65 +2,56 @@ source 'https://rubygems.org'
 
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 4.2.6'
+gem 'rails', '~> 5.0.0'
 # Use postgresql as the database for Active Record
-gem 'pg', '~> 0.15'
+gem 'pg', '~> 0.18'
+# Use Puma as the app server
+gem 'puma', '~> 3.0'
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 5.0'
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '>= 1.3.0'
 # Use CoffeeScript for .coffee assets and views
-gem 'coffee-rails', '~> 4.1.0'
+gem 'coffee-rails', '~> 4.2'
 # See https://github.com/rails/execjs#readme for more supported runtimes
 # gem 'therubyracer', platforms: :ruby
 
 # Use jquery as the JavaScript library
 gem 'jquery-rails'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 2.0'
-# bundle exec rake doc:rails generates the API under doc/api.
-gem 'sdoc', '~> 0.4.0', group: :doc
+gem 'jbuilder', '~> 2.5'
+# Use Redis adapter to run Action Cable in production
+# gem 'redis', '~> 3.0'
 
-# Use ActiveModel has_secure_password
 gem 'bcrypt', '~> 3.1.7'
 
-gem 'kaminari'
-gem 'rails-i18n', '~> 4.0.0'
-gem 'puma'
-
-# Backport from rails 5
-gem 'has_secure_token'
-
-# Auto-prefix CSS for old browsers
+# Автоматическая расстановка префиксов в CSS
 gem 'autoprefixer-rails'
 
-# Processing images
-gem 'mini_magick'
-
-# Attaching uploaded files to models
-gem 'carrierwave'
-gem 'carrierwave-bombshelter'
-
-# Аутентификация через OAuth
-gem 'omniauth-twitter'
-gem 'omniauth-facebook'
-gem 'omniauth-vkontakte'
+gem 'kaminari'
+gem 'rails-i18n', '~> 5.0.0'
 
 group :development, :test do
-  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
-  gem 'byebug'
   gem 'rspec-rails'
   gem 'database_cleaner'
   gem 'factory_girl_rails'
 end
 
-group :development do
-  # Access an IRB console on exception pages or by using <%= console %> in views
-  gem 'web-console', '~> 2.0'
+group :development, :test do
+  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
+  gem 'byebug', platform: :mri
+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 'mina'
 end
 
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]