5 2 stable (!10370) · 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

Closed gitlab-qa-bot requested to merge 5-2-stable into master 8 years ago

Viewing commit f82ec5b9

Show latest version

2 files

+ 3

− 3

Files

2

f82ec5b9

Update gitlab-grack. Fixes issue with --depth option · f82ec5b9
Dmitriy Zaporozhets authored 11 years ago

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

+ 1

− 1

@@ -26,7 +26,7 @@ gem 'omniauth-github'
gem 'gitlab_git', '~> 1.2.1'

# Ruby/Rack Git Smart-HTTP Server Handler
gem 'gitlab-grack', '~> 1.0.0', require: 'grack'
gem 'gitlab-grack', '~> 1.0.1', require: 'grack'

# LDAP Auth
gem 'gitlab_omniauth-ldap', '1.0.2', require: "omniauth-ldap"