Merge pull request #880 from omu/develop

Merge develop into master

.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

.github/CONTRIBUTING.md

@@ -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
 

.gitignore

@@ -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

.markdownlintrc

@@ -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"
+  }
+}

.rubocop.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/**/*

.ruby-version

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

Dockerfile

@@ -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
 

Gemfile

@@ -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'

Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 
 GIT
   remote: https://github.com/rails/rails.git
-  revision: 43fc7b476b483a89dacf9964ccf288f6bc6e1595
+  revision: efb706daad0e2e1039c6abb4879c837ef8bf4d10
   specs:
     actioncable (6.0.0.beta3)
       actionpack (= 6.0.0.beta3)
@@ -63,7 +63,7 @@ GIT
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 1.3, >= 1.3.3)
+      zeitwerk (~> 1.4)
     rails (6.0.0.beta3)
       actioncable (= 6.0.0.beta3)
       actionmailbox (= 6.0.0.beta3)
@@ -98,9 +98,9 @@ GIT
 
 GIT
   remote: https://github.com/rollbar/rollbar-gem.git
-  revision: a026a7b0fb942e52a892e99a574cc796b7cbd52e
+  revision: 83ef1acca2b0b1d1b74ff8ef29435ca82e8ca1d6
   specs:
-    rollbar (2.19.2)
+    rollbar (2.19.3)
       multi_json
 
 PATH
@@ -133,18 +133,17 @@ GEM
       io-like (~> 0.3.0)
     ast (2.4.0)
     aws-eventstream (1.0.2)
-    aws-partitions (1.144.0)
-    aws-sdk-core (3.47.0)
+    aws-partitions (1.145.0)
+    aws-sdk-core (3.48.2)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.1)
-      http-2 (~> 0.10)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.14.0)
-      aws-sdk-core (~> 3, >= 3.47.0)
+    aws-sdk-kms (1.16.0)
+      aws-sdk-core (~> 3, >= 3.48.2)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.32.0)
-      aws-sdk-core (~> 3, >= 3.47.0)
+    aws-sdk-s3 (1.34.0)
+      aws-sdk-core (~> 3, >= 3.48.2)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.0)
     aws-sigv4 (1.1.0)
@@ -161,13 +160,13 @@ GEM
     bindex (0.5.0)
     bootsnap (1.4.1)
       msgpack (~> 1.0)
-    brakeman (4.4.0)
+    brakeman (4.5.0)
     builder (3.2.3)
     bundler-audit (0.6.1)
       bundler (>= 1.2.0, < 3)
       thor (~> 0.18)
-    byebug (11.0.0)
-    capybara (3.14.0)
+    byebug (11.0.1)
+    capybara (3.15.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
@@ -233,7 +232,6 @@ GEM
       activesupport (>= 4.2)
     hashdiff (0.3.8)
     html_tokenizer (0.0.7)
-    http-2 (0.10.1)
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     image_processing (1.8.0)
@@ -278,25 +276,24 @@ GEM
     nokogiri (1.10.1)
       mini_portile2 (~> 2.4.0)
     orm_adapter (0.5.0)
-    pagy (2.1.1)
+    pagy (2.1.3)
     parallel (1.14.0)
-    parser (2.6.0.0)
+    parser (2.6.2.0)
       ast (~> 2.4.0)
     pg (1.1.4)
     pg_search (2.1.4)
       activerecord (>= 4.2)
       activesupport (>= 4.2)
     pghero (2.2.0)
       activerecord
-    powerpack (0.1.2)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     psych (3.1.0)
     public_suffix (3.0.3)
-    puma (3.12.0)
+    puma (3.12.1)
     pwned (1.2.1)
     rack (2.0.6)
     rack-attack (5.4.2)
@@ -327,15 +324,14 @@ GEM
     responders (2.4.1)
       actionpack (>= 4.2.0, < 6.0)
       railties (>= 4.2.0, < 6.0)
-    rubocop (0.65.0)
+    rubocop (0.66.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
       psych (>= 3.1.0)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.4.0)
+      unicode-display_width (>= 1.4.0, < 1.6)
     ruby-progressbar (1.10.0)
     ruby-vips (2.0.13)
       ffi (~> 1.9)
@@ -394,7 +390,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
-    unicode-display_width (1.4.1)
+    unicode-display_width (1.5.0)
     uniform_notifier (1.12.1)
     warden (1.2.8)
       rack (>= 2.0.6)
@@ -409,10 +405,11 @@ GEM
     websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
-    wicked_pdf (1.1.0)
+    wicked_pdf (1.2.1)
+      activesupport
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (1.3.3)
+    zeitwerk (1.4.0)
 
 PLATFORMS
   ruby
@@ -478,7 +475,7 @@ DEPENDENCIES
   wicked_pdf
 
 RUBY VERSION
-   ruby 2.6.1p33
+   ruby 2.6.2p47
 
 BUNDLED WITH
    2.0.1

app.json

@@ -1,10 +1,13 @@
 {
   "name": "nokul",
+  "slug": "nokul",
   "description": "Nokul, nitelikli okul universiteler icin ogrenci ve personel otomasyonudur.",
   "keywords": [
     "dokku",
     "rails"
   ],
+  "repository": "https://github.com/omu/nokul",
+  "version": "0.5.8",
   "scripts": {
     "dokku": {
       "predeploy":  "bin/plugdo bundle install -j4 --path /app/vendor/bundle --without development:test && bundle exec rails assets:precompile",

app/controllers/calendar_management/calendar_event_types_controller.rb

@@ -16,33 +16,29 @@ def new
 
     def create
       @calendar_event_type = CalendarEventType.new(calendar_event_type_params)
-      @calendar_event_type.save ? redirect_to(index_path, notice: t('.success')) : render(:new)
+      @calendar_event_type.save ? redirect_to(:calendar_event_types, notice: t('.success')) : render(:new)
     end
 
     def edit; end
 
     def update
       if @calendar_event_type.update(calendar_event_type_params)
-        redirect_to(index_path, notice: t('.success'))
+        redirect_to(:calendar_event_types, notice: t('.success'))
       else
         render(:edit)
       end
     end
 
     def destroy
       if @calendar_event_type.destroy
-        redirect_to(index_path, notice: t('.success'))
+        redirect_to(:calendar_event_types, notice: t('.success'))
       else
-        redirect_to(index_path, alert: t('.warning'))
+        redirect_to(:calendar_event_types, alert: t('.warning'))
       end
     end
 
     private
 
-    def index_path
-      %i[calendar_management calendar_event_types]
-    end
-
     def set_calendar_event_type
       @calendar_event_type = CalendarEventType.find(params[:id])
     end