Skip to content

Commit 1a03c33

Browse files
committed
More changes
1 parent a9f2cae commit 1a03c33

2 files changed

Lines changed: 6 additions & 15 deletions

File tree

configure_git_repository.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ Please stick to it unless you have special needs.
77
* Features: Remove *Wikis*, *Issues* and *Projects*
88
* Pull Requests
99
* Disable *Allow merge commits* and *Allow rebase merging*
10+
* Always suggest updating pull request branches
1011
* Allow auto-merge
1112
* Automatically delete head branches
12-
* Always suggest updating pull request branches
1313
* Manage access
1414
* Add *staff* team as a collaborator with Admin access
1515
* Add *security* team as collaborator with Write access
@@ -18,13 +18,13 @@ Please stick to it unless you have special needs.
1818
* Rules/Rulesets
1919
* `develop`
2020
* Enforcement status: `Active`
21-
* Branch targeting criteria: `develop`
2221
* Bypass list: add `Repository Admin` Role with *allow for pull requests only* option
22+
* Branch targeting criteria: `develop`
2323
* Restrict deletions
2424
* Require linear history
2525
* Require a pull request before merging
2626
* Require status checks to pass
27-
* Select `ci/semaphore/push`
27+
* Select `ci/semaphore/push` (WRONG. NOT AVAILABLE NOW)
2828
* Block force pushes
2929
* `main` (same as develop but...)
3030
* Branch targeting criteria: `main`

ruby_on_rails/app_initialisation.md

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,8 @@ Check existing projects for an example of the usage.
7474
* Update `config/application.rb` and set the default language and timezone
7575

7676
```ruby
77-
config.time_zone = 'Zurich' # may vary
78-
config.i18n.default_locale = :de # may vary
79-
```
80-
81-
* Update your `config/environments/production.rb` settings:
82-
83-
```ruby
84-
config.force_ssl = true # uncomment
85-
config.log_level = ENV.fetch("RAILS_LOG_LEVEL", "warn") # change
77+
config.time_zone = 'Zurich'
78+
config.i18n.default_locale = :de
8679
```
8780

8881
* Update `config/environments/development.rb` settings:
@@ -91,9 +84,7 @@ Check existing projects for an example of the usage.
9184
config.action_controller.action_on_unpermitted_parameters = :raise
9285
config.i18n.raise_on_missing_translations = :strict
9386

94-
config.generators do |g|
95-
g.apply_rubocop_autocorrect_after_generate!
96-
end
87+
config.generators.apply_rubocop_autocorrect_after_generate!
9788
```
9889

9990
* Update `config/environments/test.rb` settings:

0 commit comments

Comments
 (0)