Fix changelog conflict in 'bump-gitlab-monitor-to-2-5-0'
# Conflicts: # CHANGELOG.md
No related branches found
No related tags found
Showing
- CHANGELOG.md 3 additions, 0 deletionsCHANGELOG.md
- files/gitlab-config-template/gitlab.rb.template 3 additions, 0 deletionsfiles/gitlab-config-template/gitlab.rb.template
- files/gitlab-cookbooks/gitlab/attributes/default.rb 1 addition, 0 deletionsfiles/gitlab-cookbooks/gitlab/attributes/default.rb
- files/gitlab-cookbooks/gitlab/templates/default/sv-gitlab-pages-run.erb 3 additions, 0 deletions...ookbooks/gitlab/templates/default/sv-gitlab-pages-run.erb
- spec/chef/recipes/gitlab-pages_spec.rb 4 additions, 1 deletionspec/chef/recipes/gitlab-pages_spec.rb
Loading
Please register or sign in to comment