fix incorrect merge

Author: GarPit

.gitignore

@@ -13,12 +13,8 @@
 !/log/.keep
 !/tmp/.keep
 
-<<<<<<< HEAD
 /node_modules
 /yarn-error.log
 
-=======
-# Ignore Byebug command history file.
->>>>>>> fc41821962e2e09f6903425e1def27a1176c5a64
 .byebug_history
 Gemfile.lock

Dockerfile

@@ -1,41 +1,20 @@
 FROM ruby:alpine
 MAINTAINER Igor Petrov <[email protected]>
-<<<<<<< HEAD
-=======
-ENV LIBV8_VERSION 3.16.14.18
->>>>>>> fc41821962e2e09f6903425e1def27a1176c5a64
 ENV INSTALL_PATH /kms
 # Set Rails to run in production
 ENV RAILS_ENV production
 
-<<<<<<< HEAD
 RUN apk update && apk --update --no-cache add libstdc++ postgresql-client tzdata && mkdir $INSTALL_PATH
-=======
-RUN apk update && apk --update --no-cache add libstdc++ postgresql-client && mkdir $INSTALL_PATH
->>>>>>> fc41821962e2e09f6903425e1def27a1176c5a64
 
 WORKDIR $INSTALL_PATH
 
 COPY Gemfile Gemfile
 
 RUN apk --update --no-cache add --virtual build-deps build-base python postgresql-dev nodejs g++; \
-<<<<<<< HEAD
   bundle install --without development test && apk del build-deps
 
 COPY . .
 
-#RUN bundle exec rails kms:install:migrations \
-#   && SECRET_TOKEN="$(bundle exec rails secret)" DB_ADAPTER=nulldb bundle exec rails assets:precompile
-=======
-  bundle config build.libv8 --enable-debug && \
-  LIBV8_VERSION=$LIBV8_VERSION bundle install --without development test && apk del build-deps
-
-COPY . .
-
-RUN bundle exec rails kms:install:migrations \
-   && SECRET_TOKEN="$(bundle exec rails secret)" DB_ADAPTER=nulldb bundle exec rails assets:precompile
->>>>>>> fc41821962e2e09f6903425e1def27a1176c5a64
-
 EXPOSE 3000
 
 # Expose a volume so that nginx will be able to read in assets in production.

Gemfile

@@ -1,6 +1,5 @@
 source 'https://rubygems.org'
 
-<<<<<<< HEAD
 git_source(:github) do |repo_name|
   repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
   "https://github.com/#{repo_name}.git"
@@ -53,27 +52,3 @@ gem 'tzinfo-data' #, platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
 gem "activerecord-nulldb-adapter"
 gem "kms", '1.0.0'
-=======
-# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 5.0.1'
-# Use postgresql as the database for Active Record
-gem 'pg', '~> 0.18'
-gem 'puma'
-gem "activerecord-nulldb-adapter"
-gem 'libv8', "= #{ENV['LIBV8_VERSION']}"
-gem 'therubyracer'
-
-gem "kms"
-
-# Use Uglifier as compressor for JavaScript assets
-gem 'uglifier', '>= 1.3.0'
-# Use SCSS for stylesheets
-gem 'sass-rails', '~> 5.0'
-gem 'jquery-rails'
-gem "coffee-rails"
-gem "turbolinks", "~> 5"
-gem 'nokogiri', '1.7.2'
-
-
-gem 'tzinfo-data'
->>>>>>> fc41821962e2e09f6903425e1def27a1176c5a64

app/assets/javascripts/application.js

@@ -1,25 +1,15 @@
 // This is a manifest file that'll be compiled into application.js, which will include all the files
 // listed below.
 //
-<<<<<<< HEAD
 // Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's
 // vendor/assets/javascripts directory can be referenced here using a relative path.
-=======
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
->>>>>>> fc41821962e2e09f6903425e1def27a1176c5a64
 //
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 // compiled file. JavaScript code in this file should be added after the last require_* statement.
 //
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-<<<<<<< HEAD
 //= require rails-ujs
-=======
-//= require jquery
-//= require jquery_ujs
->>>>>>> fc41821962e2e09f6903425e1def27a1176c5a64
 //= require turbolinks
 //= require_tree .

app/assets/javascripts/cable.js

@@ -1,9 +1,5 @@
 // Action Cable provides the framework to deal with WebSockets in Rails.
-<<<<<<< HEAD
 // You can generate new channels where WebSocket features live using the `rails generate channel` command.
-=======
-// You can generate new channels where WebSocket features live using the rails generate channel command.
->>>>>>> fc41821962e2e09f6903425e1def27a1176c5a64
 //
 //= require action_cable
 //= require_self

app/assets/stylesheets/application.css

@@ -2,13 +2,8 @@
  * This is a manifest file that'll be compiled into application.css, which will include all the files
  * listed below.
  *
-<<<<<<< HEAD
  * Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's
  * vendor/assets/stylesheets directory can be referenced here using a relative path.
-=======
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
->>>>>>> fc41821962e2e09f6903425e1def27a1176c5a64
  *
  * You're free to add application-wide styles to this file and they'll appear at the bottom of the
  * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS

app/views/layouts/application.html.erb

@@ -1,11 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-<<<<<<< HEAD
     <title>KmsDocker51</title>
-=======
-    <title>KmsDocker</title>
->>>>>>> fc41821962e2e09f6903425e1def27a1176c5a64
     <%= csrf_meta_tags %>
 
     <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>

bin/rails

@@ -1,12 +1,9 @@
 #!/usr/bin/env ruby
-<<<<<<< HEAD
 begin
   load File.expand_path('../spring', __FILE__)
 rescue LoadError => e
   raise unless e.message.include?('spring')
 end
-=======
->>>>>>> fc41821962e2e09f6903425e1def27a1176c5a64
 APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'

bin/rake

@@ -1,12 +1,9 @@
 #!/usr/bin/env ruby
-<<<<<<< HEAD
 begin
   load File.expand_path('../spring', __FILE__)
 rescue LoadError => e
   raise unless e.message.include?('spring')
 end
-=======
->>>>>>> fc41821962e2e09f6903425e1def27a1176c5a64
 require_relative '../config/boot'
 require 'rake'
 Rake.application.run

bin/setup

@@ -18,13 +18,10 @@ chdir APP_ROOT do
   system! 'gem install bundler --conservative'
   system('bundle check') || system!('bundle install')
 
-<<<<<<< HEAD
   # Install JavaScript dependencies if using Yarn
   # system('bin/yarn')
 
 
-=======
->>>>>>> fc41821962e2e09f6903425e1def27a1176c5a64
   # puts "\n== Copying sample files =="
   # unless File.exist?('config/database.yml')
   #   cp 'config/database.yml.sample', 'config/database.yml'

config/application.rb

@@ -1,6 +1,5 @@
 require_relative 'boot'
 
-<<<<<<< HEAD
 require "rails"
 # Pick the frameworks you want:
 require "active_model/railtie"
@@ -12,15 +11,11 @@
 require "action_cable/engine"
 require "sprockets/railtie"
 # require "rails/test_unit/railtie"
-=======
-require 'rails/all'
->>>>>>> fc41821962e2e09f6903425e1def27a1176c5a64
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)
 
-<<<<<<< HEAD
 module KmsDocker51
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
@@ -32,13 +27,5 @@ class Application < Rails::Application
 
     # Don't generate system test files.
     config.generators.system_tests = nil
-    ENV['DATABASE'] = 'docker51'
-=======
-module KmsDocker
-  class Application < Rails::Application
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
->>>>>>> fc41821962e2e09f6903425e1def27a1176c5a64
   end
 end

config/cable.yml

@@ -7,7 +7,4 @@ test:
 production:
   adapter: redis
   url: redis://localhost:6379/1
-<<<<<<< HEAD
   channel_prefix: kms_docker_51_production
-=======
->>>>>>> fc41821962e2e09f6903425e1def27a1176c5a64

config/database.yml

@@ -17,7 +17,6 @@
 default: &default
   adapter: <%= ENV['DB_ADAPTER'] ||= 'postgresql' %>
   encoding: unicode
-<<<<<<< HEAD
   # For details on connection pooling, see Rails configuration guide
   # http://guides.rubyonrails.org/configuring.html#database-pooling
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
@@ -28,25 +27,12 @@ default: &default
 development:
   <<: *default
   database: <%= ENV['DATABASE'] + '_development' %>
-=======
-  # For details on connection pooling, see rails configuration guide
-  # http://guides.rubyonrails.org/configuring.html#database-pooling
-  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
-
-development:
-  <<: *default
-  database: kms_development
->>>>>>> fc41821962e2e09f6903425e1def27a1176c5a64
 
   # The specified database role being used to connect to postgres.
   # To create additional roles in postgres see `$ createuser --help`.
   # When left blank, postgres will use the default role. This is
   # the same name as the operating system user that initialized the database.
-<<<<<<< HEAD
   #username: kms_docker_51
-=======
-  #username: kms_docker
->>>>>>> fc41821962e2e09f6903425e1def27a1176c5a64
 
   # The password associated with the postgres role (username).
   #password:
@@ -74,11 +60,7 @@ development:
 # Do not set this db to the same as development or production.
 test:
   <<: *default
-<<<<<<< HEAD
   database: <%= ENV['DATABASE'] + '_test' %>
-=======
-  database: kms_test
->>>>>>> fc41821962e2e09f6903425e1def27a1176c5a64
 
 # As with config/secrets.yml, you never want to store sensitive information,
 # like your database password, in your source code. If your source code is
@@ -101,11 +83,4 @@ test:
 #
 production:
   <<: *default
-<<<<<<< HEAD
   database: <%= ENV['DATABASE'] + '_production' %>
-=======
-  database: kms_production
-  username: postgres
-  password: <%= ENV['KMS_DATABASE_PASSWORD'] %>
-  host: db
->>>>>>> fc41821962e2e09f6903425e1def27a1176c5a64

config/environments/development.rb

@@ -18,11 +18,7 @@
 
     config.cache_store = :memory_store
     config.public_file_server.headers = {
-<<<<<<< HEAD
       'Cache-Control' => "public, max-age=#{2.days.seconds.to_i}"
-=======
-      'Cache-Control' => 'public, max-age=172800'
->>>>>>> fc41821962e2e09f6903425e1def27a1176c5a64
     }
   else
     config.action_controller.perform_caching = false

config/environments/production.rb

@@ -14,14 +14,11 @@
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
-<<<<<<< HEAD
   # Attempt to read encrypted secrets from `config/secrets.yml.enc`.
   # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or
   # `config/secrets.yml.key`.
   config.read_encrypted_secrets = true
 
-=======
->>>>>>> fc41821962e2e09f6903425e1def27a1176c5a64
   # Disable serving static files from the `/public` folder by default since
   # Apache or NGINX already handles this.
   config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
@@ -62,11 +59,7 @@
 
   # Use a real queuing backend for Active Job (and separate queues per environment)
   # config.active_job.queue_adapter     = :resque
-<<<<<<< HEAD
   # config.active_job.queue_name_prefix = "kms_docker_51_#{Rails.env}"
-=======
-  # config.active_job.queue_name_prefix = "kms_docker_#{Rails.env}"
->>>>>>> fc41821962e2e09f6903425e1def27a1176c5a64
   config.action_mailer.perform_caching = false
 
   # Ignore bad email addresses and do not raise email delivery errors.
@@ -90,11 +83,7 @@
   if ENV["RAILS_LOG_TO_STDOUT"].present?
     logger           = ActiveSupport::Logger.new(STDOUT)
     logger.formatter = config.log_formatter
-<<<<<<< HEAD
     config.logger    = ActiveSupport::TaggedLogging.new(logger)
-=======
-    config.logger = ActiveSupport::TaggedLogging.new(logger)
->>>>>>> fc41821962e2e09f6903425e1def27a1176c5a64
   end
 
   # Do not dump schema after migrations.

config/environments/test.rb

@@ -15,11 +15,7 @@
   # Configure public file server for tests with Cache-Control for performance.
   config.public_file_server.enabled = true
   config.public_file_server.headers = {
-<<<<<<< HEAD
     'Cache-Control' => "public, max-age=#{1.hour.seconds.to_i}"
-=======
-    'Cache-Control' => 'public, max-age=3600'
->>>>>>> fc41821962e2e09f6903425e1def27a1176c5a64
   }
 
   # Show full error reports and disable caching.

config/initializers/assets.rb

@@ -3,7 +3,6 @@
 # Version of your assets, change this if you want to expire all your assets.
 Rails.application.config.assets.version = '1.0'
 
-<<<<<<< HEAD
 # Add additional assets to the asset load path.
 # Rails.application.config.assets.paths << Emoji.images_path
 # Add Yarn node_modules folder to the asset load path.
@@ -13,11 +12,3 @@
 # application.js, application.css, and all non-JS/CSS in the app/assets
 # folder are already added.
 # Rails.application.config.assets.precompile += %w( admin.js admin.css )
-=======
-# Add additional assets to the asset load path
-# Rails.application.config.assets.paths << Emoji.images_path
-
-# Precompile additional assets.
-# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-# Rails.application.config.assets.precompile += %w( search.js )
->>>>>>> fc41821962e2e09f6903425e1def27a1176c5a64

config/initializers/devise.rb

@@ -10,11 +10,7 @@
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class
   # with default "from" parameter.
-<<<<<<< HEAD
   config.mailer_sender = '[email protected]'
-=======
-  config.mailer_sender = '[email protected]'
->>>>>>> fc41821962e2e09f6903425e1def27a1176c5a64
 
   # Configure the class responsible to send e-mails.
   # config.mailer = 'Devise::Mailer'