diff options
| author | hellekin <hellekin@cepheide.org> | 2020-11-12 01:10:28 +0100 |
|---|---|---|
| committer | hellekin <hellekin@cepheide.org> | 2020-11-12 01:10:28 +0100 |
| commit | 8d9387cf64929b6467b6ba52f22ca0aa5ed35782 (patch) | |
| tree | 37533e75476680ebad4cd1d47e3e578b879726ba /config | |
| parent | b6aeac4d9274f17e748efb3715aa08f4b7c361f2 (diff) | |
| parent | 757decefafb5d82557a8b7fa9691f94f19c3207e (diff) | |
| download | incommon-map-8d9387cf64929b6467b6ba52f22ca0aa5ed35782.tar.gz | |
Merged master
Diffstat (limited to 'config')
| -rw-r--r-- | config/database.yml | 4 | ||||
| -rw-r--r-- | config/initializers/inflections.rb | 5 | ||||
| -rw-r--r-- | config/initializers/kaminari_config.rb | 4 | ||||
| -rw-r--r-- | config/initializers/sso_config.rb | 4 | ||||
| -rw-r--r-- | config/locales/en.yml | 4 | ||||
| -rw-r--r-- | config/puma.rb | 4 | ||||
| -rw-r--r-- | config/routes.rb | 3 |
7 files changed, 28 insertions, 0 deletions
diff --git a/config/database.yml b/config/database.yml index 74519f2..1912468 100644 --- a/config/database.yml +++ b/config/database.yml @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2004-2020 David Heinemeier Hansson +# +# SPDX-License-Identifier: MIT +# # PostgreSQL. Versions 9.3 and up are supported. # # Install the pg driver: diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb index 13e8739..2292fab 100644 --- a/config/initializers/inflections.rb +++ b/config/initializers/inflections.rb @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2020 IN COMMON Collective <collective@incommon.cc> +# +# SPDX-License-Identifier: AGPL-3.0-or-later + # Be sure to restart your server when you modify this file. # Add new inflection rules using the following format. Inflections @@ -19,4 +23,5 @@ ActiveSupport::Inflector.inflections do |inflect| inflect.irregular 'human', 'humans' inflect.acronym 'API' inflect.acronym 'SSO' + inflect.acronym 'INCOMMON' end diff --git a/config/initializers/kaminari_config.rb b/config/initializers/kaminari_config.rb index 4ba6ee3..2165cf2 100644 --- a/config/initializers/kaminari_config.rb +++ b/config/initializers/kaminari_config.rb @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2011 Akira Matsuda +# +# SPDX-License-Identifier: MIT + # frozen_string_literal: true Kaminari.configure do |config| diff --git a/config/initializers/sso_config.rb b/config/initializers/sso_config.rb index d88b595..cf3bf3f 100644 --- a/config/initializers/sso_config.rb +++ b/config/initializers/sso_config.rb @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2018-2020 IN COMMON Collective <collective@incommon.cc> +# +# SPDX-License-Identifier: AGPL-3.0-or-later + # frozen_string_literal: true # See lib/sso/from_discourse.rb diff --git a/config/locales/en.yml b/config/locales/en.yml index cf9b342..125f659 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2020 IN COMMON Collective <collective@incommon.cc +# +# SPDX-License-Identifier: LAL-1.3 + # Files in the config/locales directory are used for internationalization # and are automatically loaded by Rails. If you want to use locales other # than English, add the necessary files in this directory. diff --git a/config/puma.rb b/config/puma.rb index 98bdd50..8879c35 100644 --- a/config/puma.rb +++ b/config/puma.rb @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2004-2020 David Heinemeier Hansson +# SPDX-FileCopyrightText: 2020 IN COMMON Collective <collective@incommon.cc> +# SPDX-License-Identifier: MIT + # Puma can serve each request in a thread from an internal thread pool. # The `threads` method setting takes two numbers: a minimum and maximum. # Any libraries that use thread pools should be configured to match diff --git a/config/routes.rb b/config/routes.rb index 0de14b5..a3fcf8c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2020 IN COMMON Collective <collective@incommon.cc> +# SPDX-License-Identifier: AGPL-3.0-or-later + Rails.application.routes.draw do # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html |