Merge pull request #578 from coopdevs/develop

Release v3.1.0

Author: sauloperez

.gitignore

@@ -15,38 +15,27 @@
 /log/*.log
 /tmp
 
+# Ignore .vagrant folder with images
+.vagrant
+.metadata
+
+# CTAGS generated files
+.tags
+tags
+
+# Misc
 *.rbc
 *.sassc
+**.orig
 .sass-cache
 capybara-*.html
-.rspec
-/.bundle
 /vendor/bundle
-/log/*
-/tmp/*
-/db/*.sqlite3
-/public/system/*
 /coverage/
 /spec/tmp/*
-**.orig
-rerun.txt
-pickle-email-*.html
 timeoverflow_development
 timeoverflow_test
-
+.byebug_history
 .env
 .DS_Store
 .idea/
-sgemset
-
-# Ignore .vagrant folder with images
-.vagrant
-.metadata
-
-# CTAGS generated files
-.tags
-tags
-
 .localeapp
-
-.byebug_history

.rspec

@@ -0,0 +1 @@
+--require spec_helper

.rubocop.yml

@@ -1,10 +1,15 @@
+require: rubocop-rails
+
 AllCops:
   Exclude:
     - db/schema.rb
 
 Naming/AccessorMethodName:
   Enabled: false
 
+Rails/HttpPositionalArguments:
+  Enabled: true
+
 Style/Alias:
   Enabled: false
 

.travis.yml

@@ -11,10 +11,9 @@ env:
   global:
     - DATABASE_URL=postgres://postgres@localhost/timeoverflow_test
     - CC_TEST_REPORTER_ID=025bc15a0fa9afa52d86ee24fea845cf1d363f48a466bcf2cef8ab80c29acb28
-before_install:
-  - gem install bundler:1.17.3
 before_script:
-  - bundle exec rake db:setup
+  - psql -c 'create database timeoverflow_test;' -U postgres
+  - psql -U postgres -q -d timeoverflow_test -f db/structure.sql
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
   - chmod +x ./cc-test-reporter
   - ./cc-test-reporter before-build

Gemfile

@@ -2,61 +2,61 @@ source 'https://rubygems.org'
 
 ruby File.read('.ruby-version').strip
 
-gem 'rails', '~> 4.2'
-gem 'rails-i18n'
-gem "rdiscount"
-gem 'activeadmin', '~> 1.2.1'
-gem 'has_scope'
-gem 'pundit', '~> 2.0.0'
-gem 'pg', '0.21.0'
-gem 'hstore_translate'
+gem 'rails', '~> 6.0.2'
+gem 'rails-i18n', '~> 6.0.0'
+gem 'rdiscount', '~> 2.2.0.1'
+gem 'activeadmin', '~> 2.9.0'
+gem 'has_scope', '~> 0.7.2'
+gem 'pundit', '~> 2.1.0'
+gem 'pg', '~> 1.2.1'
+gem 'json_translate', '~> 4.0.0'
 gem 'devise', '~> 4.7.1'
 gem "http_accept_language", '~> 2.1.1'
-gem 'unicorn'
-gem 'kaminari', '~> 1.1.1'
-gem "simple_form", ">= 3.0.0"
-gem 'rollbar', '2.8.3'
-gem 'pg_search', '2.1.4'
+gem 'unicorn', '~> 5.5.1'
+gem 'kaminari', '~> 1.2.1'
+gem 'simple_form', '~> 5.0.2'
+gem 'rollbar', '~> 2.22.1'
 gem 'prawn', '~> 2.2.0'
 gem 'prawn-table', '~> 0.2.2'
-gem 'skylight'
-gem 'sidekiq', '5.1.3'
+gem 'pg_search', '~> 2.3.5'
+gem 'skylight', '~> 4.1.2'
+gem 'sidekiq', '~> 6.0.0'
 gem 'sidekiq-cron', '~> 1.1.0'
 
 # Assets
-gem 'jquery-rails', '>= 4.2.0'
-gem 'bootstrap-sass'
-gem 'sass-rails', '~> 5.0.7'
-gem 'coffee-rails'
-gem 'uglifier', '2.7.2'
-gem 'select2-rails'
+gem 'jquery-rails', '~> 4.3.5'
+gem 'bootstrap-sass', '~> 3.4'
+gem 'sassc-rails', '~> 2.1.2'
+gem 'uglifier', '~> 4.2.0'
+gem 'select2-rails', '~> 4.0.13'
 
 group :development do
-  gem "binding_of_caller", '~> 0.8.0'
-  gem "better_errors", '~> 2.4.0'
-  gem 'rubocop', '~> 0.80.0', require: false
-  gem 'web-console', '2.1.3'
+  gem 'listen', '~> 3.2.0'
+  gem 'rubocop', '~> 1.6', require: false
+  gem 'rubocop-rails', '~> 2.9', require: false
+  gem 'web-console', '~> 4.0.1'
   gem 'capistrano', '~> 3.1'
   gem 'capistrano-rails', '~> 1.1'
   gem 'capistrano-rbenv', '~> 2.1'
   gem 'airbrussh', require: false
   gem 'localeapp', '2.1.1', require: false
-  gem 'letter_opener', '1.4.1'
+  gem 'letter_opener', '~> 1.7.0'
   gem 'dotenv-rails', '~> 2.7.1'
 end
 
 group :development, :test do
-  gem "byebug", '~> 11.0'
+  gem 'byebug', '~> 11.0'
 end
 
 group :test do
-  gem "rspec-rails", '~> 3.9'
-  gem "database_cleaner", '1.6.2'
-  gem 'shoulda-matchers', '~> 3.1.2'
+  gem 'rspec-rails', '~> 4.0.0'
+  gem 'rails-controller-testing'
+  gem 'database_cleaner', '~> 1.8.5'
+  gem 'shoulda-matchers', '~> 4.4.0'
   gem 'fabrication', '~> 2.20'
   gem 'faker', '~> 1.9'
-  gem 'capybara', '~> 3.15'
+  gem 'capybara', '~> 3.29'
   gem 'selenium-webdriver', '~> 3.142'
-  gem 'webdrivers', '~> 4.2.0'
+  gem 'webdrivers', '~> 4.4.0'
   gem 'simplecov', '~> 0.17', require: false
 end