This project is mirrored from https://jihulab.com/gitlab-cn/gitlab.git.
Pull mirroring updated .
- Oct 30, 2014
-
-
Dmitriy Zaporozhets authoredSigned-off-by:
Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
- Oct 29, 2014
-
-
Valery Sizov authored
7-4-stable CE to EE See merge request !225
-
Valery Sizov authored
-
Dmitriy Zaporozhets authored
Signed-off-by:Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> -
Valery Sizov authored
Conflicts: CHANGELOG VERSION
-
Valery Sizov authored
-
Dmitriy Zaporozhets authored
Signed-off-by:Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> -
Dmitriy Zaporozhets authored
Signed-off-by:Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> -
Dmitriy Zaporozhets authored
Signed-off-by:Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> -
Valery Sizov authored
-
- Oct 24, 2014
-
-
Valery Sizov authored
Fix internal snippets See merge request !219
-
Jacob Vosmaer authored
Fix internal snippets See merge request !1216
-
Valery Sizov authored
Conflicts: CHANGELOG VERSION
-
Valery Sizov authored
-
Valery Sizov authored
-
Valery Sizov authored
CE stable to EE conflict in lib/gitlab/ldap/adapter.rb should be resolved See merge request !217
-
Jacob Vosmaer authored
-
Valery Sizov authored
Conflicts: VERSION lib/gitlab/ldap/adapter.rb
-
Valery Sizov authored
-
Jacob Vosmaer authored
-
Jacob Vosmaer authored
-
Valery Sizov authored
-
- Oct 23, 2014
-
-
Jacob Vosmaer authored
Conflicts: CHANGELOG
-
- Oct 22, 2014
-
-
Marin Jankovski authored
-
Marin Jankovski authored
-
Marin Jankovski authored
Fix 500 error on login page if ldap enabled and sign-in disabled Related to gitlab/gitlabhq#1701 See merge request !1209
-
Marin Jankovski authored
Fix 500 error on login page if ldap enabled and sign-in disabled Related to gitlab/gitlabhq#1701 See merge request !1209
-
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
Fix ldap check [stable] Fix ldap check for stable branch See merge request !1208
-
Dmitriy Zaporozhets authored
Signed-off-by:Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
lib/gitlab/ldap/adapter.rb -
Dmitriy Zaporozhets authored
Signed-off-by:Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> -
Dmitriy Zaporozhets authored
Signed-off-by:Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
- Oct 21, 2014
-
-
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
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
-