fix merge conflicts

Author: karissarjacobsen

.rubocop.yml

@@ -0,0 +1,72 @@
+Layout/LineLength:
+  Enabled: false
+
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/StringLiterals:
+  EnforcedStyle: single_quotes
+
+Lint/RescueException:
+  Enabled: false
+
+Lint/UnreachableCode:
+  Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/BlockLength:
+  Exclude:
+    - 'config/routes.rb'
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Enabled: false
+
+Naming/AccessorMethodName:
+  Enabled: false
+
+Naming/MethodParameterName:
+  Enabled: false
+
+Naming/VariableName:
+  Enabled: false
+
+Naming/VariableNumber:
+  Enabled: false
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/GlobalStdStream:
+  Enabled: false
+
+Style/GlobalVars:
+  Enabled: false
+
+Style/MixinUsage:
+  Exclude:
+    - 'bin/setup'
+    - 'bin/update'
+
+Style/RedundantFetchBlock:
+  Exclude:
+    - 'config/puma.rb'
+    - 'quick_acg/config/puma.rb'
+
+Style/SpecialGlobalVars:
+  Exclude:
+    - 'bin/bundle'
+    - 'quick_acg/bin/bundle'

Gemfile

@@ -1,4 +1,4 @@
-	# frozen_string_literal: true
+# frozen_string_literal: true
 
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
@@ -54,6 +54,7 @@ group :development do
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'pry-nav', '~> 0.3.0'
   gem 'pry-rails', '~> 0.3.9'
+  gem 'rubocop', '~> 1.36', require: false
   gem 'spring', '~> 2.1.0'
   gem 'spring-watcher-listen', '~> 2.0.1'
 end
@@ -66,11 +67,11 @@ group :test do
   gem 'chromedriver-helper', '~> 2.1.1'
 end
 
+gem 'docusign_admin', '~> 1.1.0'
+gem 'docusign_click', '~> 1.0.0'
 gem 'docusign_esign', '~> 3.17.0'
 gem 'docusign_monitor', '~> 1.1.0'
 gem 'docusign_rooms', '~> 1.2.0.rc1'
-gem 'docusign_click', '~> 1.0.0'
-gem 'docusign_admin', '~> 1.1.0'
 gem 'omniauth-oauth2', '~> 1.7.1'
 gem 'omniauth-rails_csrf_protection'