6 1 stable (!5275) · Merge requests · gpt / large_projects / gitlabhq1 · GitLab

Snippets Groups Projects

Do not update/delete: Banner broadcast message test data

Do not update/delete: Notification broadcast message test data

You need to sign in or sign up before continuing.

Closed gitlab-qa-bot requested to merge 6-1-stable into master 11 years ago

Compare and

1 file

+ 1

− 1

Conflict: This file was modified in both the source and target branches. Ask someone with write access to resolve it.

lib/support/nginx/gitlab

+ 1

− 1

# GITLAB

# Maintainer: @randx

# App Version: 5.0

# App Version: 6.1

upstream gitlab {

server unix:/home/git/gitlab/tmp/sockets/gitlab.socket;