Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions configure_git_repository.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ Please stick to it unless you have special needs.
* Features: Remove *Wikis*, *Issues* and *Projects*
* Pull Requests
* Disable *Allow merge commits* and *Allow rebase merging*
* Always suggest updating pull request branches
* Allow auto-merge
* Automatically delete head branches
* Always suggest updating pull request branches
* Manage access
* Add *staff* team as a collaborator with Admin access
* Add *security* team as collaborator with Write access
Expand All @@ -18,13 +18,13 @@ Please stick to it unless you have special needs.
* Rules/Rulesets
* `develop`
* Enforcement status: `Active`
* Branch targeting criteria: `develop`
* Bypass list: add `Repository Admin` Role with *allow for pull requests only* option
* Branch targeting criteria: `develop`
* Restrict deletions
* Require linear history
* Require a pull request before merging
* Require status checks to pass
* Select `ci/semaphore/push`
* Select `ci/semaphore/push` (WRONG. NOT AVAILABLE NOW)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of just adding this indicator maybe mention that this must happen after setting up the semaphore pipeline.

* Block force pushes
* `main` (same as develop but...)
* Branch targeting criteria: `main`
Expand Down
8 changes: 3 additions & 5 deletions ruby_on_rails/app_initialisation.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ Check existing projects for an example of the usage.
* Update `config/application.rb` and set the default language and timezone

```ruby
config.time_zone = 'Zurich' # may vary
config.i18n.default_locale = :de # may vary
config.time_zone = 'Zurich'
config.i18n.default_locale = :de
```

* Update your `config/environments/production.rb` settings:
Expand All @@ -91,9 +91,7 @@ Check existing projects for an example of the usage.
config.action_controller.action_on_unpermitted_parameters = :raise
config.i18n.raise_on_missing_translations = :strict

config.generators do |g|
g.apply_rubocop_autocorrect_after_generate!
end
config.generators.apply_rubocop_autocorrect_after_generate!
```

* Update `config/environments/test.rb` settings:
Expand Down