- 24 Oct, 2014 3 commits
-
-
Jacob Vosmaer authored
-
Valery Sizov authored
Add 7.4.1-ee packages See merge request !218
-
Jacob Vosmaer authored
-
- 22 Oct, 2014 8 commits
-
-
Marin Jankovski authored
-
Marin Jankovski authored
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: VERSION config/initializers/1_settings.rb config/initializers/7_omniauth.rb
-
Dmitriy Zaporozhets authored
7-4 stable-ee to master See merge request !212
-
Dmitriy Zaporozhets authored
Improve ldap check for old syntax [stable] See merge request !215
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
Fix ldap check [stable] See merge request !214
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: lib/gitlab/ldap/adapter.rb
-
- 21 Oct, 2014 24 commits
-
-
Valery Sizov authored
-
Valery Sizov authored
-
Valery Sizov authored
Add reference to the README to upgrade guide CE to EE Issue - https://dev.gitlab.org/gitlab/gitlab-ee/issues/183 See merge request !213
-
Valery Sizov authored
-
Jacob Vosmaer authored
-
Valery Sizov authored
Add instructions for multiple LDAP servers See merge request !211
-
Valery Sizov authored
WIP. CE stable to EE stable ``` Unmerged paths: (use "git add <file>..." to mark resolution) both modified: config/initializers/1_settings.rb both modified: config/initializers/7_omniauth.rb both modified: features/admin/groups.feature both modified: features/steps/admin/groups.rb ``` @jacobvosmaer There are 4 conflicts. Two of them (last two ones) I merged by myself. In other cases your help would be appreciated. See merge request !209
-
Jacob Vosmaer authored
-
Valery Sizov authored
-
Marin Jankovski authored
-
Marin Jankovski authored
-
Valery Sizov authored
-
Valery Sizov authored
-
Valery Sizov authored
Error messages fix See merge request !1201
-
Valeriy Sizov authored
[7.4 rc fix] [doc] clarify when database.yml needs to be updated
-
Valeriy Sizov authored
[7.4 rc fix] [doc] stop gitlab before mysql optimizations, run checks
-
Valeriy Sizov authored
[7.4 rc fix] [doc] actually give command necessary to update unicorn
-
Valeriy Sizov authored
[7.4 rc fix] [doc] stop gitlab before backup
-
Valeriy Sizov authored
[7.4 rc fix] [doc] add missing configure Redis to use sockets
-
Valeriy Sizov authored
[7.4 rc fix] [doc] add optimizations for mysql to 6.x->7.4 guide
-
Jacob Vosmaer authored
-
Valery Sizov authored
Fix CE-EE LDAP merge conflicts See merge request !210
-
Ciro Santilli authored
-
Jacob Vosmaer authored
-
- 20 Oct, 2014 5 commits
-
-
Valery Sizov authored
Conflicts: config/initializers/1_settings.rb config/initializers/7_omniauth.rb features/admin/groups.feature features/steps/admin/groups.rb
-
Valery Sizov authored
Fixes from master It includes: * https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1193 * https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1196 * https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1195 See merge request !1198
-
Jan-Willem van der Meer authored
-
Jan-Willem van der Meer authored
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-