Commit 92903df6 authored by Thomas Schneider's avatar Thomas Schneider
Browse files

Fix RuboCop complaints

parent 6644a5bb
Pipeline #1820 failed with stage
in 7 minutes and 52 seconds
...@@ -23,14 +23,14 @@ gem 'jbuilder', '~> 2.7' ...@@ -23,14 +23,14 @@ gem 'jbuilder', '~> 2.7'
# Use Active Storage variant # Use Active Storage variant
# gem 'image_processing', '~> 1.2' # gem 'image_processing', '~> 1.2'
gem 'haml-rails', '~> 2.0'
gem 'bootstrap', '~> 4.4', '>= 4.4.1' gem 'bootstrap', '~> 4.4', '>= 4.4.1'
gem 'font-awesome-sass', '~> 5.12.0' gem 'font-awesome-sass', '~> 5.12.0'
gem 'haml-rails', '~> 2.0'
gem 'activeldap', '~> 5.2', '>= 5.2.4', :require => 'active_ldap/railtie' 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 'jquery-datatables', '~> 1.10', '>= 1.10.20' 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 # Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', '>= 1.4.2', require: false gem 'bootsnap', '>= 1.4.2', require: false
......
# frozen_string_literal: true
class GroupsController < ApplicationController class GroupsController < ApplicationController
end end
...@@ -13,6 +13,6 @@ class User < ActiveLdap::Base ...@@ -13,6 +13,6 @@ class User < ActiveLdap::Base
primary_key: 'dn' primary_key: 'dn'
def active? def active?
return self.userAccountControl & 2 == 0 (userAccountControl & 2).zero?
end end
end end
...@@ -117,9 +117,9 @@ Rails.application.configure do ...@@ -117,9 +117,9 @@ Rails.application.configure do
# DatabaseSelector middleware is designed as such you can define your own # DatabaseSelector middleware is designed as such you can define your own
# strategy for connection switching and pass that into the middleware through # strategy for connection switching and pass that into the middleware through
# these configuration options. # these configuration options.
# rubocop:disable Metrics/LineLength # rubocop:disable Layout/LineLength
# config.active_record.database_selector = { delay: 2.seconds } # config.active_record.database_selector = { delay: 2.seconds }
# config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver
# config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session
# rubocop:enable Metrics/LineLength # rubocop:enable Layout/LineLength
end end
# frozen_string_literal: true
# This file is auto-generated from the current state of the database. Instead # 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 # 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 # 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 # db:schema:load`. When creating a new database, `rails db:schema:load` tends to
...@@ -8,11 +11,10 @@ ...@@ -8,11 +11,10 @@
# migrations from scratch. Old migrations may fail to apply correctly if those # migrations from scratch. Old migrations may fail to apply correctly if those
# migrations use external dependencies or application code. # 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 ActiveRecord::Schema.define(version: 0) do
# These are extensions that must be enabled in order to support this database # These are extensions that must be enabled in order to support this database
enable_extension "plpgsql" enable_extension 'plpgsql'
end end
# frozen_string_literal: true
require 'test_helper' require 'test_helper'
class GroupsControllerTest < ActionDispatch::IntegrationTest class GroupsControllerTest < ActionDispatch::IntegrationTest
......
# frozen_string_literal: true
require 'test_helper' require 'test_helper'
class UsersControllerTest < ActionDispatch::IntegrationTest class UsersControllerTest < ActionDispatch::IntegrationTest
......
# frozen_string_literal: true
require 'test_helper' require 'test_helper'
class GroupTest < ActiveSupport::TestCase class GroupTest < ActiveSupport::TestCase
......
# frozen_string_literal: true
require 'test_helper' require 'test_helper'
class UserTest < ActiveSupport::TestCase class UserTest < ActiveSupport::TestCase
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment