fix merge conflicts

.rubocop.yml

@@ -0,0 +1,44 @@
+AllCops:
+  Include:
+    - ''
+  Exclude:
+    - 'db/schema.rb'
+    - 'config/routes.rb'
+    - 'db/migrate/**'
+  TargetRubyVersion: 2.3
+
+Rails:
+  Enabled: true
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+Style/Documentation:
+  Enabled: false
+Style/ClassAndModuleChildren:
+  Enabled: false
+Metrics/LineLength:
+  Enabled: false
+
+# disable for now
+# Lint/NestedMethodDefinition:
+#   Enabled: false
+# Style/ClassVars:
+#   Enabled: false
+Style/Documentation:
+  Enabled: false
+# Style/RescueModifier:
+#   Enabled: false
+# Style/AccessorMethodName:
+#   Enabled: false
+# Style/PredicateName:
+#   Enabled: false
+Metrics/AbcSize:
+  Enabled: false
+Metrics/ClassLength:
+  Enabled: false
+Metrics/MethodLength:
+  Enabled: false
+Metrics/PerceivedComplexity:
+  Enabled: false
+Metrics/CyclomaticComplexity:
+  Enabled: false

.ruby-version

@@ -1 +1 @@
-2.3.0
+2.3.1

Capfile

@@ -4,6 +4,9 @@ require 'capistrano/setup'
 # Include default deployment tasks
 require 'capistrano/deploy'
 
+# Include the delayed job worker tasks
+require 'capistrano/delayed_job'
+
 # Include tasks from other gems included in your Gemfile
 #
 # For documentation on these, see for example:

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '>= 5.0.0.rc1', '< 5.1'
+gem 'rails', '~> 5.0.0'
 # Use mysql as the database for Active Record
 gem 'mysql2', '>= 0.3.18', '< 0.5'
 # Use Puma as the app server
@@ -11,27 +11,41 @@ gem 'less-rails'
 # 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'
 # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
-gem 'turbolinks', '~> 5.x'
+gem 'turbolinks', '~> 5'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 2.0'
+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'
 
+# used to validate container responses
+gem 'json-schema'
+
+# delayed jobs
+gem 'delayed_job_active_record'
+# start workers in the background
+gem 'daemons'
+
 # pagination
 gem 'will_paginate'
 
 # markdown rendering and syntax highlighting
 gem 'kramdown'
-gem 'rouge'
+gem 'rouge', '1.10.1'
+
+# feedback table builder
+gem 'builder'
+
+# generate diffs
+gem 'diffy'
 
 # code editor
 gem 'ace-rails-ap'
@@ -53,9 +67,16 @@ gem 'annotate'
 gem 'capistrano-rails', group: :development
 gem 'capistrano-passenger', group: :development
 gem 'capistrano-rvm', group: :development
+gem 'capistrano3-delayed-job', '~> 1.0'
 
 # i18n
 gem 'rails-i18n', '~> 5.0.0.beta3' # For 5.0.0.beta3
+# use version from github for rails 5 support
+gem 'i18n-js', git: 'git://github.com/fnando/i18n-js.git'
+
+# email exceptions
+gem 'exception_notification'
+gem 'slack-notifier'
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
@@ -69,6 +90,7 @@ group :development do
   # 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 'rubocop'
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem