[rails 5] Resolve Gemfile after pulling a fresh master

8 files changed, 6 insertions, 125 deletions

diff --git a/Gemfile b/Gemfile
index 487ff18667b..4e44d7be061 100644
--- a/Gemfile
+++ b/Gemfile
@@ -128,14 +128,7 @@ gem 'asciidoctor-plantuml', '0.0.7'
 gem 'rouge', '~> 2.0'
 gem 'truncato', '~> 0.7.9'
 gem 'bootstrap_form', '~> 2.7.0'
-<<<<<<< HEAD
-
-# See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
-# and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM
-gem 'nokogiri', '~> 1.6.8.1'
-=======
 gem 'nokogiri', '~> 1.8.0'
->>>>>>> bce1c50928e4885d54dd11221a9c8197a7fb1a7d
 
 # Diffs
 gem 'diffy', '~> 3.1.0'
@@ -147,13 +140,7 @@ group :unicorn do
 end
 
 # State machine
-<<<<<<< HEAD
 gem 'state_machines-activerecord', '~> 0.5.0'
-# Run events after state machine commits
-gem 'after_commit_queue', '~> 1.3.0'
-=======
-gem 'state_machines-activerecord', '~> 0.4.0'
->>>>>>> bce1c50928e4885d54dd11221a9c8197a7fb1a7d
 
 # Issue tags
 gem 'acts-as-taggable-on', '~> 4.0'
@@ -214,14 +201,6 @@ gem 'ruby-fogbugz', '~> 0.2.1'
 # Kubernetes integration
 gem 'kubeclient', '~> 2.2.0'
 
-<<<<<<< HEAD
-# underscore-rails
-gem 'underscore-rails', '~> 1.8.0'
-=======
-# d3
-gem 'd3_rails', '~> 3.5.0'
->>>>>>> bce1c50928e4885d54dd11221a9c8197a7fb1a7d
-
 # Sanitize user input
 gem 'sanitize', '~> 2.0'
 gem 'babosa', '~> 1.0.2'
@@ -342,13 +321,7 @@ group :development, :test do
   # Generate Fake data
   gem 'ffaker', '~> 2.4'
 
-<<<<<<< HEAD
-  gem 'rails-controller-testing', '~> 1.0.2'
-
-  gem 'capybara', '~> 2.14.4'
-=======
   gem 'capybara', '~> 2.15.0'
->>>>>>> bce1c50928e4885d54dd11221a9c8197a7fb1a7d
   gem 'capybara-screenshot', '~> 1.0.0'
   gem 'poltergeist', '~> 1.9.0'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 4c57c1e1273..967ff15f8d7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -98,11 +98,7 @@ GEM
       bundler (~> 1.2)
       thor (~> 0.18)
     byebug (9.0.6)
-<<<<<<< HEAD
-    capybara (2.14.4)
-=======
     capybara (2.15.1)
->>>>>>> bce1c50928e4885d54dd11221a9c8197a7fb1a7d
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (>= 1.3.3)
@@ -200,13 +196,8 @@ GEM
     faraday_middleware-multi_json (0.0.6)
       faraday_middleware
       multi_json
-<<<<<<< HEAD
     fast_gettext (1.4.1)
     ffaker (2.6.0)
-=======
-    fast_gettext (1.4.0)
-    ffaker (2.4.0)
->>>>>>> bce1c50928e4885d54dd11221a9c8197a7fb1a7d
     ffi (1.9.18)
     flay (2.8.1)
       erubis (~> 2.7.0)
@@ -265,11 +256,7 @@ GEM
       ruby-progressbar (~> 1.4)
     gemnasium-gitlab-service (0.2.6)
       rugged (~> 0.21)
-<<<<<<< HEAD
-    gemojione (3.2.0)
-=======
     gemojione (3.3.0)
->>>>>>> bce1c50928e4885d54dd11221a9c8197a7fb1a7d
       json
     get_process_mem (0.2.1)
     gettext (3.2.3)
@@ -291,11 +278,7 @@ GEM
       escape_utils (~> 1.1.0)
       mime-types (>= 1.19)
       rugged (>= 0.23.0b)
-<<<<<<< HEAD
-    github-markup (1.6.0)
-=======
     github-markup (1.6.1)
->>>>>>> bce1c50928e4885d54dd11221a9c8197a7fb1a7d
     gitlab-flowdock-git-hook (1.0.1)
       flowdock (~> 0.7)
       gitlab-grit (>= 2.4.1)
@@ -315,21 +298,12 @@ GEM
       activesupport (>= 4.2.0)
     gollum-grit_adapter (1.0.1)
       gitlab-grit (~> 2.7, >= 2.7.1)
-<<<<<<< HEAD
-    gollum-lib (4.2.5)
-      gemojione (~> 3.2)
-      github-markup (~> 1.6)
-      gollum-grit_adapter (~> 1.0)
-      nokogiri (~> 1.6.4)
-      rouge (~> 2.0)
-=======
     gollum-lib (4.2.7)
       gemojione (~> 3.2)
       github-markup (~> 1.6)
       gollum-grit_adapter (~> 1.0)
       nokogiri (>= 1.6.1, < 2.0)
       rouge (~> 2.1)
->>>>>>> bce1c50928e4885d54dd11221a9c8197a7fb1a7d
       sanitize (~> 2.1)
       stringex (~> 2.6)
     gollum-rugged_adapter (0.4.4)
@@ -342,7 +316,6 @@ GEM
       request_store (>= 1.0)
     google-api-client (0.9.28)
       addressable (~> 2.3)
-<<<<<<< HEAD
       googleauth (~> 0.5)
       httpclient (~> 2.7)
       hurley (~> 0.1)
@@ -350,18 +323,7 @@ GEM
       mime-types (>= 1.6)
       representable (~> 2.3.0)
       retriable (~> 2.0)
-    google-protobuf (3.3.0)
-=======
-      autoparse (~> 0.3)
-      extlib (~> 0.9)
-      faraday (~> 0.9)
-      googleauth (~> 0.3)
-      launchy (~> 2.4)
-      multi_json (~> 1.10)
-      retriable (~> 1.4)
-      signet (~> 0.6)
     google-protobuf (3.4.0.2)
->>>>>>> bce1c50928e4885d54dd11221a9c8197a7fb1a7d
     googleauth (0.5.1)
       faraday (~> 0.9)
       jwt (~> 1.4)
@@ -386,13 +348,9 @@ GEM
       activesupport
       grape (>= 0.16.0)
       rake
-<<<<<<< HEAD
-    grpc (1.4.1)
-=======
     grape_logging (1.6.0)
       grape
     grpc (1.4.5)
->>>>>>> bce1c50928e4885d54dd11221a9c8197a7fb1a7d
       google-protobuf (~> 3.1)
       googleauth (~> 0.5.1)
     haml (4.0.7)
@@ -442,11 +400,7 @@ GEM
       cause
       json
     ipaddress (0.8.3)
-<<<<<<< HEAD
-    jira-ruby (1.1.3)
-=======
     jira-ruby (1.4.1)
->>>>>>> bce1c50928e4885d54dd11221a9c8197a7fb1a7d
       activesupport
       multipart-post
       oauth (~> 0.5, >= 0.5.0)
@@ -520,14 +474,9 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     method_source (0.8.2)
     mime-types (2.99.3)
-<<<<<<< HEAD
     mimemagic (0.3.2)
-    mini_portile2 (2.1.0)
-=======
-    mimemagic (0.3.0)
     mini_mime (0.1.4)
     mini_portile2 (2.2.0)
->>>>>>> bce1c50928e4885d54dd11221a9c8197a7fb1a7d
     minitest (5.7.0)
     mmap2 (2.2.7)
     mousetrap-rails (1.4.6)
@@ -541,14 +490,9 @@ GEM
     net-ldap (0.16.0)
     net-ssh (4.1.0)
     netrc (0.11.0)
-<<<<<<< HEAD
     nio4r (2.1.0)
-    nokogiri (1.6.8.1)
-      mini_portile2 (~> 2.1.0)
-=======
     nokogiri (1.8.0)
       mini_portile2 (~> 2.2.0)
->>>>>>> bce1c50928e4885d54dd11221a9c8197a7fb1a7d
     numerizer (0.1.1)
     oauth (0.5.3)
     oauth2 (1.4.0)
@@ -570,13 +514,8 @@ GEM
     omniauth-azure-oauth2 (0.0.8)
       jwt (~> 1.0)
       omniauth (~> 1.0)
-<<<<<<< HEAD
-      omniauth-oauth2 (~> 1.4)
-    omniauth-cas3 (1.1.3)
-=======
       omniauth-oauth2 (~> 1.1)
     omniauth-cas3 (1.1.4)
->>>>>>> bce1c50928e4885d54dd11221a9c8197a7fb1a7d
       addressable (~> 2.3)
       nokogiri (~> 1.7, >= 1.7.1)
       omniauth (~> 1.2)
@@ -722,10 +661,6 @@ GEM
       bundler (>= 1.3.0, < 2.0)
       railties (= 5.0.4)
       sprockets-rails (>= 2.0.0)
-    rails-controller-testing (1.0.2)
-      actionpack (~> 5.x, >= 5.0.1)
-      actionview (~> 5.x, >= 5.0.1)
-      activesupport (~> 5.x)
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
     rails-dom-testing (2.0.3)
@@ -790,15 +725,9 @@ GEM
     retriable (2.1.0)
     rinku (2.0.2)
     rotp (2.1.2)
-<<<<<<< HEAD
-    rouge (2.1.1)
-    rqrcode (0.10.1)
-      chunky_png (~> 1.0)
-=======
     rouge (2.2.1)
     rqrcode (0.7.0)
       chunky_png
->>>>>>> bce1c50928e4885d54dd11221a9c8197a7fb1a7d
     rqrcode-rails3 (0.1.7)
       rqrcode (>= 0.4.2)
     rspec (3.6.0)
@@ -939,7 +868,6 @@ GEM
       sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
     stackprof (0.2.10)
-<<<<<<< HEAD
     state_machines (0.5.0)
     state_machines-activemodel (0.5.0)
       activemodel (>= 4.1, < 5.2)
@@ -949,17 +877,6 @@ GEM
       state_machines-activemodel (>= 0.5.0)
     stringex (2.7.1)
     sys-filesystem (1.1.7)
-=======
-    state_machines (0.4.0)
-    state_machines-activemodel (0.4.0)
-      activemodel (>= 4.1, < 5.1)
-      state_machines (>= 0.4.0)
-    state_machines-activerecord (0.4.0)
-      activerecord (>= 4.1, < 5.1)
-      state_machines-activemodel (>= 0.3.0)
-    stringex (2.7.1)
-    sys-filesystem (1.1.6)
->>>>>>> bce1c50928e4885d54dd11221a9c8197a7fb1a7d
       ffi
     sysexits (1.2.0)
     temple (0.7.7)
@@ -1062,11 +979,7 @@ DEPENDENCIES
   browser (~> 2.2)
   bullet (~> 5.5.0)
   bundler-audit (~> 0.5.0)
-<<<<<<< HEAD
-  capybara (~> 2.14.4)
-=======
   capybara (~> 2.15.0)
->>>>>>> bce1c50928e4885d54dd11221a9c8197a7fb1a7d
   capybara-screenshot (~> 1.0.0)
   carrierwave (~> 1.1)
   charlock_holmes (~> 0.7.5)
@@ -1150,11 +1063,7 @@ DEPENDENCIES
   mysql2 (~> 0.4.5)
   net-ldap
   net-ssh (~> 4.1.0)
-<<<<<<< HEAD
-  nokogiri (~> 1.6.8.1)
-=======
   nokogiri (~> 1.8.0)
->>>>>>> bce1c50928e4885d54dd11221a9c8197a7fb1a7d
   oauth2 (~> 1.4)
   octokit (~> 4.6.2)
   oj (~> 2.17.4)
@@ -1195,7 +1104,6 @@ DEPENDENCIES
   rack-oauth2 (~> 1.2.1)
   rack-proxy (~> 0.6.0)
   rails (= 5.0.4)
-  rails-controller-testing (~> 1.0.2)
   rails-deprecated_sanitizer (~> 1.0.3)
   rails-i18n (~> 5.0.4)
   rainbow (~> 2.2)
diff --git a/app/models/ci/pipeline_variable.rb b/app/models/ci/pipeline_variable.rb
index 00b419c3efa..67c2b69677f 100644
--- a/app/models/ci/pipeline_variable.rb
+++ b/app/models/ci/pipeline_variable.rb
@@ -1,5 +1,5 @@
 module Ci
-  class PipelineVariable < ActiveRecord::Base
+  class PipelineVariable < ApplicationRecord
     extend Ci::Model
     include HasVariable
 
diff --git a/app/models/gpg_key.rb b/app/models/gpg_key.rb
index 1633acd4fa9..89d5fb1d3d1 100644
--- a/app/models/gpg_key.rb
+++ b/app/models/gpg_key.rb
@@ -1,4 +1,4 @@
-class GpgKey < ActiveRecord::Base
+class GpgKey < ApplicationRecord
   KEY_PREFIX = '-----BEGIN PGP PUBLIC KEY BLOCK-----'.freeze
   KEY_SUFFIX = '-----END PGP PUBLIC KEY BLOCK-----'.freeze
 
diff --git a/app/models/gpg_signature.rb b/app/models/gpg_signature.rb
index 454c90d5fc4..c1b6cc7d353 100644
--- a/app/models/gpg_signature.rb
+++ b/app/models/gpg_signature.rb
@@ -1,4 +1,4 @@
-class GpgSignature < ActiveRecord::Base
+class GpgSignature < ApplicationRecord
   include ShaAttribute
   include IgnorableColumn
 
diff --git a/app/models/project_auto_devops.rb b/app/models/project_auto_devops.rb
index 53731579e87..99bf4519f04 100644
--- a/app/models/project_auto_devops.rb
+++ b/app/models/project_auto_devops.rb
@@ -1,4 +1,4 @@
-class ProjectAutoDevops < ActiveRecord::Base
+class ProjectAutoDevops < ApplicationRecord
   belongs_to :project
 
   validates :domain, allow_blank: true, hostname: { allow_numeric_hostname: true }
diff --git a/app/models/push_event_payload.rb b/app/models/push_event_payload.rb
index 6cdb1cd4fe9..5a924759b2f 100644
--- a/app/models/push_event_payload.rb
+++ b/app/models/push_event_payload.rb
@@ -1,4 +1,4 @@
-class PushEventPayload < ActiveRecord::Base
+class PushEventPayload < ApplicationRecord
   include ShaAttribute
 
   belongs_to :event, inverse_of: :push_event_payload
diff --git a/app/models/user_synced_attributes_metadata.rb b/app/models/user_synced_attributes_metadata.rb
index 9f374304164..071080aa0df 100644
--- a/app/models/user_synced_attributes_metadata.rb
+++ b/app/models/user_synced_attributes_metadata.rb
@@ -1,4 +1,4 @@
-class UserSyncedAttributesMetadata < ActiveRecord::Base
+class UserSyncedAttributesMetadata < ApplicationRecord
   belongs_to :user
 
   validates :user, presence: true