Merge branch 'ce-upstream' into feature-multi-ldap-servers-merge-master
Conflicts: app/controllers/sessions_controller.rb app/models/user.rb app/views/devise/sessions/new.html.haml config/gitlab.yml.example config/initializers/1_settings.rb config/initializers/7_omniauth.rb config/initializers/devise.rb lib/api/ldap.rb lib/gitlab/ldap/authentication.rb lib/gitlab/ldap/config.rb lib/gitlab/ldap/person.rb lib/gitlab/ldap/user.rb
Showing
.ruby-version
0 → 100644
... | ... | @@ -31,7 +31,7 @@ gem 'omniauth-shibboleth' |
# Extracting information from a git repository | ||
# Provide access to Gitlab::Git library | ||
gem "gitlab_git", '7.0.0.rc8' | ||
gem "gitlab_git", '7.0.0.rc9' | ||
# Ruby/Rack Git Smart-HTTP Server Handler | ||
gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack' | ||
... | ... |
doc/update/7.3-to-7.4.md
0 → 100644
File moved
Please register or sign in to comment