Merge pull request #814 from omu/develop

Merge develop into master
omu · Feb 18, 2019 · 3142c35 · 3142c35
2 parents fb280f7 + 092e636
commit 3142c35
Show file tree

Hide file tree

Showing 207 changed files with 1,407 additions and 1,256 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -12,7 +12,7 @@
 
 **Sistem/Ops etkileri:**
 
-[//]: # (Bu PR merge edildiğinde sunucular üzerinde bir değişiklik - paket kurulması, buildpack eklenmesi vb. - yapılması gerekecekmi, açıklayın.)
+[//]: # (Bu PR merge edildiğinde sunucular üzerinde bir değişiklik - paket kurulması, buildpack eklenmesi vb. - yapılması gerekecek mi, açıklayın.)
 
 **Kontrol listesi:**
 

diff --git a/.travis.yml b/.travis.yml
@@ -58,3 +58,6 @@ notifications:
     on_failure: change
     rooms:
       - secure: ljbXmcdLA/wv+j3+RCE0qF/mZd/3PbHI0VOSBkeyJDXWcHHMduIyZlodzliuXL/8mfLbmcJ8MZT5tV9l0OGSgiFI/Ngz1fadsf+0Pim4MtREkp4yKRzfDbQqj8iQwzAAcIAxbIQhenVZtaadwBAM8Jawcjs0m2+iWXaiREU1IlRaK1NzGtkDx8gy5PnVgJhtWmhV7/l6a0Sg94shr53bchkuGwH/ugqgq9L+ec1gGKVpSOHhS0W5WjojMU+3K5/HCP/r9V2J2jYUjtzDSbEDFd18rH0qJjNq1hoaVeaW1uJzidSH7f7B6xXxJfUt4e2CiY+2CkR5LUbFx5V+6fNscEAA9u+zGh6Rn9rxciWkFfzKck6Eomoq5G+d+q/ItVagAMSIUELYCOup2+H/KtRNFTBWBqwECsvXZn7WwaZOdMXDfiTnI9eSWxJqaiwFMtC1A+bnKM7DX2qoZoGCNJAzzQ93EuXdxA1w1oYVs7lfh70qLx5OraXtcTUtfrv4tzms35S9JNNnEQyWN7neuPCS0Yh4QIFf4NX7aaYbwFD66uS25Iq2ochJ4oicFd8s+DxnaXc925GYXFVHk7wZWK/mFlGnZTuTbk4ElByqzRUN2sI5r7xYijv9cBcUM/1RqzXI3B/91Ft/kyCaYDrg3W1j79zLo+G5uIHU2/F1AQBIYlI=
+    template:
+      - "Build <%{build_url}|#%{build_number}> (<%{compare_url}|%{commit}>) of %{repository_slug}@%{branch}"
+      - "by %{author} %{result} in %{elapsed_time}"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -8,7 +8,7 @@ GIT
 
 GIT
   remote: https://github.com/rails/rails.git
-  revision: 16e235126ef0187a93b81ee959a8127097e2f394
+  revision: 907280ddfd78c53e2eb5af6f12512dc38df38bd8
   specs:
     actioncable (6.0.0.beta1)
       actionpack (= 6.0.0.beta1)
@@ -63,7 +63,7 @@ GIT
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 1.0)
+      zeitwerk (~> 1.2)
     rails (6.0.0.beta1)
       actioncable (= 6.0.0.beta1)
       actionmailbox (= 6.0.0.beta1)
@@ -107,7 +107,7 @@ GIT
 
 GIT
   remote: https://github.com/rollbar/rollbar-gem.git
-  revision: e3a35525d1b14fab587e317548ed4f5c1052240d
+  revision: ada82d619e848ad6b64a33acd10b03730b4c3d41
   specs:
     rollbar (2.18.2)
       multi_json
@@ -142,7 +142,7 @@ GEM
       io-like (~> 0.3.0)
     ast (2.4.0)
     aws-eventstream (1.0.1)
-    aws-partitions (1.138.0)
+    aws-partitions (1.139.0)
     aws-sdk-core (3.46.1)
       aws-eventstream (~> 1.0)
       aws-partitions (~> 1.0)
@@ -173,7 +173,7 @@ GEM
     bundler-audit (0.6.1)
       bundler (>= 1.2.0, < 3)
       thor (~> 0.18)
-    byebug (10.0.2)
+    byebug (11.0.0)
     capybara (3.13.2)
       addressable
       mini_mime (>= 0.1.3)
@@ -411,7 +411,7 @@ GEM
     wicked_pdf (1.1.0)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (1.1.0)
+    zeitwerk (1.2.0)
 
 PLATFORMS
   ruby

diff --git a/Vagrantfile b/Vagrantfile
@@ -37,6 +37,14 @@ Vagrant.configure('2') do |config| # rubocop:disable Metrics/BlockLength
     end
   end
 
+  config.vm.define 'ldap', autostart: false do |ldap|
+    ldap.vm.box = 'omu/debian-stable-server'
+
+    ldap.vm.network :forwarded_port, guest: 389, host: 1389
+
+    ldap.vm.provision 'shell', path: 'lib/scripts/ldap.sh'
+  end
+
   config.vm.define 'paas', autostart: false do |paas|
     paas.vm.box = 'omu/debian-stable-paas'
 
@@ -47,16 +55,4 @@ Vagrant.configure('2') do |config| # rubocop:disable Metrics/BlockLength
       trigger.run = { inline: 'bash lib/scripts/paas.sh' }
     end
   end
-
-  config.vm.define 'ldap', autostart: true do |ldap|
-    ldap.vm.box = 'omu/debian-stable-server'
-
-    ldap.vm.network :forwarded_port, guest: 389, host: 1389
-
-    ldap.vm.provider :lxc do |lxc|
-      lxc.customize 'cgroup.memory.limit_in_bytes', '2048M'
-    end
-
-    ldap.vm.provision 'shell', path: 'lib/scripts/ldap.sh'
-  end
 end
diff --git a/app/controllers/account/addresses_controller.rb b/app/controllers/account/addresses_controller.rb
@@ -2,7 +2,7 @@
 
 module Account
   class AddressesController < ApplicationController
-    include LastUpdateFromMernis
+    include UpdateableFromMernis
 
     before_action :set_user
     before_action :set_address, only: %i[edit update destroy]
@@ -58,7 +58,7 @@ def redirect_with(message)
     end
 
     def address_params
-      params.require(:address).permit(:phone_number, :full_address, :district_id)
+      params.require(:address).permit(:country, :phone_number, :full_address, :district_id)
     end
   end
 end
diff --git a/...trollers/user/confirmations_controller.rb → ...llers/account/confirmations_controller.rb b/...trollers/user/confirmations_controller.rb → ...llers/account/confirmations_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class User
+module Account
   class ConfirmationsController < Devise::ConfirmationsController
     # GET /resource/confirmation/new
     # def new

diff --git a/app/controllers/account/identities_controller.rb b/app/controllers/account/identities_controller.rb
@@ -2,7 +2,7 @@
 
 module Account
   class IdentitiesController < ApplicationController
-    include LastUpdateFromMernis
+    include UpdateableFromMernis
 
     before_action :set_user
     before_action :set_identity, only: %i[edit update destroy]

diff --git a/...ers/user/omniauth_callbacks_controller.rb → .../account/omniauth_callbacks_controller.rb b/...ers/user/omniauth_callbacks_controller.rb → .../account/omniauth_callbacks_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class User
+module Account
   class OmniauthCallbacksController < Devise::OmniauthCallbacksController
     # You should configure your model like this:
     # devise :omniauthable, omniauth_providers: [:twitter]

diff --git a/app/controllers/user/passwords_controller.rb → ...ntrollers/account/passwords_controller.rb b/app/controllers/user/passwords_controller.rb → ...ntrollers/account/passwords_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class User
+module Account
   class PasswordsController < Devise::PasswordsController
     layout 'guest'
 

diff --git a/app/controllers/account/profile_controller.rb b/app/controllers/account/profile_controller.rb
diff --git a/app/controllers/account/profile_settings_controller.rb b/app/controllers/account/profile_settings_controller.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Account
+  class ProfileSettingsController < ApplicationController
+    # before_action :purge_avatar, only: :update
+
+    def edit; end
+
+    def update
+      if current_user.update_without_password(profile_params)
+        redirect_to profile_path, notice: t('.success')
+      else
+        render(:edit)
+      end
+    end
+
+    private
+
+    # def purge_avatar
+    #   current_user.avatar.purge
+    # end
+
+    def profile_params
+      params.require(:user).permit(
+        :avatar, :country, :phone_number, :extension_number, :website, :twitter, :linkedin, :skype, :orcid,
+        :public_photo, :public_studies
+      )
+    end
+  end
+end
diff --git a/...trollers/user/registrations_controller.rb → ...llers/account/registrations_controller.rb b/...trollers/user/registrations_controller.rb → ...llers/account/registrations_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class User
+module Account
   class RegistrationsController < Devise::RegistrationsController
     layout 'guest', except: %i[edit update]
 
@@ -65,6 +65,8 @@ def update
     #   super(resource)
     # end
 
+    private
+
     def update_password_change_time
       current_user.update!(password_changed_at: Time.zone.now)
     end

diff --git a/app/controllers/user/sessions_controller.rb → ...ontrollers/account/sessions_controller.rb b/app/controllers/user/sessions_controller.rb → ...ontrollers/account/sessions_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class User
+module Account
   class SessionsController < Devise::SessionsController
     layout 'guest'
     # before_action :configure_sign_in_params, only: [:create]
@@ -20,7 +20,11 @@ class SessionsController < Devise::SessionsController
     #   super
     # end
 
-    # protected
+    protected
+
+    def after_sign_out_path_for(_resource_or_scope)
+      login_path
+    end
 
     # If you have extra params to permit, append them to the sanitizer.
     # def configure_sign_in_params

diff --git a/app/controllers/user/unlocks_controller.rb → ...controllers/account/unlocks_controller.rb b/app/controllers/user/unlocks_controller.rb → ...controllers/account/unlocks_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class User
+module Account
   class UnlocksController < Devise::UnlocksController
     # GET /resource/unlock/new
     # def new

diff --git a/app/controllers/admin/administrative_functions_controller.rb b/app/controllers/admin/administrative_functions_controller.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Admin
+  class AdministrativeFunctionsController < ApplicationController
+    include ReferenceResource
+
+    private
+
+    def secure_params
+      params.require(:administrative_function).permit(:name, :code)
+    end
+  end
+end
diff --git a/app/controllers/admin/cities_controller.rb b/app/controllers/admin/cities_controller.rb
@@ -2,7 +2,7 @@
 
 module Admin
   class CitiesController < ApplicationController
-    include PagyBackendWithHelpers
+    include SearchableModule
 
     before_action :set_country
     before_action :set_city, only: %i[show edit update destroy]

diff --git a/app/controllers/admin/countries_controller.rb b/app/controllers/admin/countries_controller.rb
@@ -2,7 +2,7 @@
 
 module Admin
   class CountriesController < ApplicationController
-    include PagyBackendWithHelpers
+    include SearchableModule
 
     before_action :set_country, only: %i[show edit update destroy]
 

diff --git a/app/controllers/calendar_management/calendar_event_types_controller.rb b/app/controllers/calendar_management/calendar_event_types_controller.rb
@@ -2,7 +2,7 @@
 
 module CalendarManagement
   class CalendarEventTypesController < ApplicationController
-    include PagyBackendWithHelpers
+    include SearchableModule
 
     before_action :set_calendar_event_type, only: %i[edit update destroy]
 

diff --git a/app/controllers/calendar_management/calendars_controller.rb b/app/controllers/calendar_management/calendars_controller.rb
@@ -2,7 +2,7 @@
 
 module CalendarManagement
   class CalendarsController < ApplicationController
-    include PagyBackendWithHelpers
+    include SearchableModule
 
     before_action :set_calendar, only: %i[show edit update destroy]
 

diff --git a/app/controllers/committee/agenda_types_controller.rb b/app/controllers/committee/agenda_types_controller.rb
@@ -2,7 +2,7 @@
 
 module Committee
   class AgendaTypesController < ApplicationController
-    include PagyBackendWithHelpers
+    include SearchableModule
 
     before_action :set_agenda_type, only: %i[edit update destroy]
 

diff --git a/app/controllers/committee/agendas_controller.rb b/app/controllers/committee/agendas_controller.rb
@@ -2,7 +2,7 @@
 
 module Committee
   class AgendasController < ApplicationController
-    include PagyBackendWithHelpers
+    include SearchableModule
 
     before_action :set_committee
     before_action :set_agenda, only: %i[edit update destroy]

diff --git a/app/controllers/committee/dashboard_controller.rb b/app/controllers/committee/dashboard_controller.rb
@@ -2,7 +2,7 @@
 
 module Committee
   class DashboardController < ApplicationController
-    include PagyBackendWithHelpers
+    include SearchableModule
 
     def index
       @committees = pagy_by_search(

diff --git a/app/controllers/concerns/reference_resource.rb b/app/controllers/concerns/reference_resource.rb
@@ -2,7 +2,7 @@
 
 module ReferenceResource
   extend ActiveSupport::Concern
-  include PagyBackendWithHelpers
+  include SearchableModule
 
   # rubocop:disable Metrics/BlockLength
   # rubocop:disable Rails/LexicallyScopedActionFilter

diff --git a/...ers/concerns/pagy_backend_with_helpers.rb → ...controllers/concerns/searchable_module.rb b/...ers/concerns/pagy_backend_with_helpers.rb → ...controllers/concerns/searchable_module.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module PagyBackendWithHelpers
+module SearchableModule
   extend ActiveSupport::Concern
   include Pagy::Backend
 

diff --git a/...llers/concerns/last_update_from_mernis.rb → ...ollers/concerns/updateable_from_mernis.rb b/...llers/concerns/last_update_from_mernis.rb → ...ollers/concerns/updateable_from_mernis.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module LastUpdateFromMernis
+module UpdateableFromMernis
   extend ActiveSupport::Concern
 
   def elapsed_time(resource)

diff --git a/app/controllers/course_management/available_courses_controller.rb b/app/controllers/course_management/available_courses_controller.rb
@@ -2,7 +2,7 @@
 
 module CourseManagement
   class AvailableCoursesController < ApplicationController
-    include PagyBackendWithHelpers
+    include SearchableModule
 
     before_action :set_available_course, only: %i[show edit update destroy]
 

diff --git a/app/controllers/course_management/course_group_types_controller.rb b/app/controllers/course_management/course_group_types_controller.rb
@@ -2,7 +2,7 @@
 
 module CourseManagement
   class CourseGroupTypesController < ApplicationController
-    include PagyBackendWithHelpers
+    include SearchableModule
 
     before_action :set_course_group_type, only: %i[edit update destroy]
 

diff --git a/app/controllers/course_management/course_types_controller.rb b/app/controllers/course_management/course_types_controller.rb
@@ -2,7 +2,7 @@
 
 module CourseManagement
   class CourseTypesController < ApplicationController
-    include PagyBackendWithHelpers
+    include SearchableModule
 
     before_action :set_course_type, only: %i[edit update destroy]
 

diff --git a/app/controllers/course_management/courses_controller.rb b/app/controllers/course_management/courses_controller.rb
@@ -2,7 +2,7 @@
 
 module CourseManagement
   class CoursesController < ApplicationController
-    include PagyBackendWithHelpers
+    include SearchableModule
 
     before_action :set_course, only: %i[show edit update destroy]