Merge branch 'gitlab-ee/master' into 7-4-stable_
Conflicts: VERSION doc/install/installation.md
Showing
CHANGELOG-EE
0 → 100644
... | ... | @@ -38,6 +38,7 @@ gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack' |
# LDAP Auth | ||
gem 'gitlab_omniauth-ldap', '1.1.0', require: "omniauth-ldap" | ||
gem 'net-ldap' | ||
# Git Wiki | ||
gem 'gollum-lib', '~> 3.0.0' | ||
... | ... |
app/models/appearance.rb
0 → 100644
app/models/git_hook.rb
0 → 100644
app/models/jira_issue.rb
0 → 100644
app/models/ldap_key.rb
0 → 100644
9.97 KB
136 KB
doc/git_hooks/git_hooks.md
0 → 100644
doc/git_hooks/git_hooks.png
0 → 100644
111 KB
doc/install/ldap.md
0 → 100644
doc/install/packages.md
0 → 100644
doc/integration/jenkins.md
0 → 100644
49.3 KB
34.7 KB
104 KB
doc/integration/jira.md
0 → 100644
59.2 KB
57.7 KB
17.6 KB
26.9 KB
79 KB
130 KB
76.4 KB
15.3 KB
doc/tools/email.md
0 → 100644
doc/tools/email1.png
0 → 100644
30.3 KB
doc/tools/email2.png
0 → 100644
18.4 KB
doc/tools/email3.png
0 → 100644
16.6 KB
doc/update/6.0-ce-to-ee.md
0 → 100644
doc/update/6.0-to-6.2.md
0 → 100644
doc/update/6.1-ce-to-ee.md
0 → 100644
doc/update/6.2-ce-to-ee.md
0 → 100644
doc/update/6.3-ce-to-ee.md
0 → 100644
doc/update/6.4-ce-to-ee.md
0 → 100644
doc/update/6.5-ce-to-ee.md
0 → 100644
doc/update/6.6-ce-to-ee.md
0 → 100644
doc/update/6.7-ce-to-ee.md
0 → 100644
doc/update/6.8-ce-to-ee.md
0 → 100644
doc/update/6.9-ce-to-ee.md
0 → 100644
doc/update/7.0-ce-to-ee.md
0 → 100644
doc/update/7.1-ce-to-ee.md
0 → 100644
doc/update/7.3-ce-to-ee.md
0 → 100644
132 KB
116 KB
116 KB
lib/api/ldap.rb
0 → 100644
lib/gitlab/ldap/group.rb
0 → 100644
lib/tasks/migrate/ldap.rake
0 → 100644
spec/factories/git_hooks.rb
0 → 100644
spec/models/git_hook_spec.rb
0 → 100644