diff --git a/Gemfile b/Gemfile index 0a46bf1fbe6bfd89eca2aa7b7c514c2ed67e59de..45345da669b2879670adb3a17e095b20402f85bd 100644 --- a/Gemfile +++ b/Gemfile @@ -23,14 +23,14 @@ gem 'jbuilder', '~> 2.7' # Use Active Storage variant # gem 'image_processing', '~> 1.2' -gem 'haml-rails', '~> 2.0' gem 'bootstrap', '~> 4.4', '>= 4.4.1' gem 'font-awesome-sass', '~> 5.12.0' +gem 'haml-rails', '~> 2.0' -gem 'activeldap', '~> 5.2', '>= 5.2.4', :require => 'active_ldap/railtie' -gem 'net-ldap', '~> 0.16.2' -gem 'jquery-rails', '~> 4.3', '>= 4.3.5' +gem 'activeldap', '~> 5.2', '>= 5.2.4', require: 'active_ldap/railtie' gem 'jquery-datatables', '~> 1.10', '>= 1.10.20' +gem 'jquery-rails', '~> 4.3', '>= 4.3.5' +gem 'net-ldap', '~> 0.16.2' # Reduces boot times through caching; required in config/boot.rb gem 'bootsnap', '>= 1.4.2', require: false diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 2f973a61b55ac6c23142fba22e434e53d1ee0383..8b0847594ec07917a48a225c57d787bae8cf951e 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -1,2 +1,4 @@ +# frozen_string_literal: true + class GroupsController < ApplicationController end diff --git a/app/models/user.rb b/app/models/user.rb index d8293ba3c418b854991afc51d21cb5b27d2bfa9d..c12a12f3fed9ae670d4c6dad907051ace9022499 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -13,6 +13,6 @@ class User < ActiveLdap::Base primary_key: 'dn' def active? - return self.userAccountControl & 2 == 0 + (userAccountControl & 2).zero? end end diff --git a/config/environments/production.rb b/config/environments/production.rb index a59e081f638df3c9ffa112a3cb9a1a3f5dad9539..67ffbcefbc8a92a95855a3214aefa4a40f870b64 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -117,9 +117,9 @@ Rails.application.configure do # DatabaseSelector middleware is designed as such you can define your own # strategy for connection switching and pass that into the middleware through # these configuration options. - # rubocop:disable Metrics/LineLength + # rubocop:disable Layout/LineLength # config.active_record.database_selector = { delay: 2.seconds } # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session - # rubocop:enable Metrics/LineLength + # rubocop:enable Layout/LineLength end diff --git a/db/schema.rb b/db/schema.rb index b10373ba600e9d0b211e152e09de98a52b960fd6..277f42323c7f305aa7bf6e3eaeb8f306bdca32f5 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1,6 +1,9 @@ +# frozen_string_literal: true + # This file is auto-generated from the current state of the database. Instead # of editing this file, please use the migrations feature of Active Record to -# incrementally modify your database, and then regenerate this schema definition. +# incrementally modify your database, and then regenerate this schema +# definition. # # This file is the source Rails uses to define your schema when running `rails # db:schema:load`. When creating a new database, `rails db:schema:load` tends to @@ -8,11 +11,10 @@ # migrations from scratch. Old migrations may fail to apply correctly if those # migrations use external dependencies or application code. # -# It's strongly recommended that you check this file into your version control system. +# It's strongly recommended that you check this file into your version control +# system. ActiveRecord::Schema.define(version: 0) do - # These are extensions that must be enabled in order to support this database - enable_extension "plpgsql" - + enable_extension 'plpgsql' end diff --git a/test/controllers/groups_controller_test.rb b/test/controllers/groups_controller_test.rb index 23aba76b38190e6336fd1a9977703b5a20ec4cda..5ab1617d46261b6dd4867dbd0d2396786866c38b 100644 --- a/test/controllers/groups_controller_test.rb +++ b/test/controllers/groups_controller_test.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'test_helper' class GroupsControllerTest < ActionDispatch::IntegrationTest diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 6c3da770c9312db4a4083ec008fe882219895039..1028f8904bc6d81194df950b9db22d672e4118ee 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'test_helper' class UsersControllerTest < ActionDispatch::IntegrationTest diff --git a/test/models/group_test.rb b/test/models/group_test.rb index 778eb0c58112da09ed327f989964963b1fbde577..ae91507658476a654f5e96a4b4df315b34fb5069 100644 --- a/test/models/group_test.rb +++ b/test/models/group_test.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'test_helper' class GroupTest < ActiveSupport::TestCase diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 82f61e0109663ddb34c9850653978c5280db0d59..5cc44ed296effad7abbc51171f0d688807a4d831 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'test_helper' class UserTest < ActiveSupport::TestCase