Upstream merge with conflict resoltion in services definition
In `files/gitlab-cookbooks/package/libraries/config/services.rb`, upstream changed the `gitaly` line, right after the list of Heptapod-specific services (by giving it a role, it allows users to set up a Gitaly-only node just by specifying the role. This is documented in `doc/roles/index.md`).
Showing
- doc/roles/index.md 11 additions, 0 deletionsdoc/roles/index.md
- files/gitlab-config-template/gitlab.rb.template 15 additions, 2 deletionsfiles/gitlab-config-template/gitlab.rb.template
- files/gitlab-cookbooks/package/libraries/config/gitlab.rb 1 addition, 0 deletionsfiles/gitlab-cookbooks/package/libraries/config/gitlab.rb
- files/gitlab-cookbooks/package/libraries/config/roles/gitaly.rb 10 additions, 0 deletions...gitlab-cookbooks/package/libraries/config/roles/gitaly.rb
- files/gitlab-cookbooks/package/libraries/config/services.rb 1 addition, 1 deletionfiles/gitlab-cookbooks/package/libraries/config/services.rb
- spec/chef/cookbooks/package/libraries/config/roles_spec.rb 12 additions, 0 deletionsspec/chef/cookbooks/package/libraries/config/roles_spec.rb
- spec/chef/support/shared_context/recipes_shared_context.rb 126 additions, 0 deletionsspec/chef/support/shared_context/recipes_shared_context.rb
Loading