Merge pull request #880 from omu/develop

Merge develop into master

Author: msdundar

.circleci/config.yml

@@ -32,7 +32,7 @@ repository: &repository
 # build image
 ruby_2_6: &ruby_2_6
   docker:
-    - image: circleci/ruby:2.6.1-node-browsers
+    - image: circleci/ruby:2.6.2-node-browsers
       <<: *rails_environment
     - image: circleci/postgres:11.1-alpine
       <<: *postgres_environment

.env.sample

@@ -40,7 +40,7 @@ Organizasyon sırları kurumsal bir `keepass` hesabında tutulmaktadır. Bu sır
 
 - Master.key ve API Anahtarları
 
-Proje sırları `credentials.yml.enc` dosyasında tutulmaktadır. Bu dosyaya erişim bilgilerini [sistem grubu](https://github.com/orgs/omu/teams/ops)'ndan veya `keepass` üzerinden edindikten sonra RAILS_MASTER_KEY isimli bir ortam değişkeni ile anahtarı sisteminize tanımlayın.
+Proje sırları `credentials.yml.enc` dosyasında tutulmaktadır. Bu dosyaya erişim bilgilerini [sistem grubu](https://github.com/orgs/omu/teams/ops)'ndan veya `keepass` üzerinden edindikten sonra RAILS_MASTER_KEY ve TENANT_MASTER_KEY ortam değişkenlerini sisteminize tanımlayın.
 
 - VPN
 

.github/CONTRIBUTING.md

@@ -4,8 +4,9 @@
 # or operating system, you probably want to add a global ignore instead:
 #   git config --global core.excludesfile '~/.gitignore_global'
 
-# Ignore bundler config.
+# Ignore bundler config and vendor directory
 /.bundle
+/vendor/*
 
 # Ignore the default SQLite database.
 /db/*.sqlite3
@@ -16,25 +17,20 @@
 /tmp/*
 !/log/.keep
 !/tmp/.keep
+.byebug_history
 
 # Ignore uploaded files in development.
 /storage/*
 !/storage/.keep
 
-/public/assets
-.byebug_history
-
-# Ignore master key for decrypting credentials and more.
-/config/master.key
+# Ignore yarn dependencies and assets
 /public/packs
 /public/packs-test
 /node_modules
 /yarn-error.log
 yarn-debug.log*
 .yarn-integrity
-
-# Ignore local bundler directory
-/vendor/*
+/public/assets
 
 # Ignore misc.
 /bin/dokku
@@ -44,8 +40,9 @@ yarn-debug.log*
 .envrc
 /.local/
 
-# Ignore dokku deploy key
+# Ignore sensitives
 config/deploy_key
+/config/master.key
 
 # Ignore auto-generated PDFs of markdown files
 .pdf

.gitignore

@@ -0,0 +1,19 @@
+{
+  "default": true,
+  "MD003": {
+    "style": "setext_with_atx"
+  },
+  "MD004": {
+    "style": "sublist"
+  },
+  "MD013": {
+    "code_blocks": false,
+    "tables": false,
+  },
+  "MD024": {
+    "allow_different_nesting": true
+  },
+  "MD029": {
+    "style": "ordered"
+  }
+}

.hound.yml

@@ -4,37 +4,38 @@ Style/AsciiComments:
   Enabled: false
 Style/Lambda:
   Enabled: false
+Style/FormatStringToken:
+  EnforcedStyle: template
 Documentation:
   Enabled: false
 Rails/UnknownEnv:
   Environments:
-    - production
     - development
+    - production
     - test
-    - beta
 Metrics/LineLength:
   Max: 120
   Exclude:
     - app/validators/employee_validator.rb # Won't fix
 Metrics/BlockLength:
   Exclude:
     - config/routes/**/*
-    - lib/tasks/**/*.rake # Won't fix
+    - lib/tasks/**/*.rake
 Metrics/ClassLength:
   Exclude:
     - test/**/*.rb
 AllCops:
   TargetRubyVersion: 2.6
   # Do not exclude files from ALL COPS unless it's really necessary!
   Exclude:
-    - app/controllers/concerns/reference_resource.rb
+    - app/controllers/concerns/yoksis_resource.rb
     - bin/**/*
-    - vendor/bundle/**/*
-    - node_modules/**/*
     - db/schema.rb
     - db/migrate/*.rb
     - config/initializers/simple_form.rb
     - config/initializers/simple_form_bootstrap.rb
     - config/environments/*.rb
     - config/routes.rb
+    - node_modules/**/*
     - Vagrantfile
+    - vendor/bundle/**/*

.markdownlintrc

@@ -1 +1 @@
-2.6.1
+2.6.2

.rubocop.yml

@@ -1,16 +1,19 @@
-FROM ondokuz/ruby-stretch:1.16.1
+FROM ondokuz/ruby-stretch:1.17.1
 
 ENV PATH=/app/bin:$PATH
 
 ARG NOKUL_TENANT=omu
 ENV NOKUL_TENANT=$NOKUL_TENANT
 
-ARG RAILS_ENV=beta
+ARG RAILS_ENV=development
 ENV RAILS_ENV=$RAILS_ENV
 
 ARG RAILS_MASTER_KEY
 ENV RAILS_MASTER_KEY=$RAILS_MASTER_KEY
 
+ARG TENANT_MASTER_KEY
+ENV TENANT_MASTER_KEY=$TENANT_MASTER_KEY
+
 ENV RAILS_SERVE_STATIC_FILES=enabled
 ENV RAILS_LOG_TO_STDOUT=enabled
 

.ruby-version

@@ -39,7 +39,7 @@ gem 'webpacker'
 gem 'chartkick'
 gem 'cocoon'
 gem 'font-awesome-rails'
-gem 'groupdate' # for chartkick
+gem 'groupdate'
 gem 'pagy'
 gem 'simple_form'
 gem 'wicked_pdf'