 Marin Jankovski
|
7ab468317b
|
Merge branch 'ldap_email_downcase' into 'master'
Fix LDAP email upper case bug
|
2014-05-22 06:59:13 +00:00 |
|
 Jacob Vosmaer
|
4ce8287e02
|
Add failing spec for upper case LDAP emails
|
2014-05-21 13:51:58 +02:00 |
|
|
Marin Jankovski
|
95ef8f9756
|
Merge remote-tracking branch 'ce/master'
Conflicts:
VERSION
doc/install/installation.md
doc/integration/README.md
doc/integration/external-issue-tracker.md
lib/gitlab/markdown.rb
spec/lib/gitlab/ldap/ldap_access_spec.rb
|
2014-05-21 13:10:37 +02:00 |
|
|
Jacob Vosmaer
|
be1120e968
|
Improve ad_disabled method name
|
2014-05-14 19:13:06 +02:00 |
|
|
Jacob Vosmaer
|
d54133b09f
|
Add spec for LDAP::Access#allowed?
|
2014-05-14 18:26:49 +02:00 |
|
|
Jacob Vosmaer
|
982d4d51e8
|
Backport Adapter#dn_matches_filter? from EE
|
2014-05-14 18:11:14 +02:00 |
|
 Dmitriy Zaporozhets
|
eff30fff08
|
Improve dn_matches_filter method
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-04-15 17:27:59 +03:00 |
|
|
Marin Jankovski
|
0cf7f2f85a
|
Test update_email method.
|
2014-04-09 12:25:06 +02:00 |
|
|
Jacob Vosmaer
|
401cac62a4
|
Add test for LDAP::Adapter#dn_matches_filter?
|
2014-03-28 14:22:44 +01:00 |
|
|
Dmitriy Zaporozhets
|
3e864036e7
|
Fix ldap_user_auth_spec
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-03-10 19:16:43 +02:00 |
|
|
Dmitriy Zaporozhets
|
903726c846
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
CHANGELOG
Gemfile
VERSION
app/models/group.rb
app/views/groups/edit.html.haml
db/schema.rb
doc/install/installation.md
doc/update/5.4-to-6.0.md
|
2014-02-11 10:15:13 +02:00 |
|
 skv
|
a3f645ef51
|
Remove deprecated finders
|
2014-01-19 23:39:56 +04:00 |
|
|
Dmitriy Zaporozhets
|
1f43fa20d3
|
Merge branch '6-4-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-4-from-ce
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
Gemfile
Gemfile.lock
VERSION
app/controllers/application_controller.rb
db/schema.rb
doc/install/installation.md
doc/update/6.2-to-6.3.md
|
2013-12-23 12:57:22 +02:00 |
|
|
skv
|
d89527839e
|
fix most of warnings
|
2013-12-15 00:05:10 +04:00 |
|
|
Dmitriy Zaporozhets
|
d3844662ec
|
Respect existing group permissions during sync with LDAP group
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2013-12-14 13:22:51 +02:00 |
|
|
Dmitriy Zaporozhets
|
81ae87f6a6
|
Fix tests
|
2013-10-31 16:12:45 +02:00 |
|
 Izaak Alpert
|
75b2ff8f43
|
Added ldap tests
Change-Id: Ifd77615b3b92d7d8bca92b8875aa8204356cfd85
|
2013-09-22 20:25:47 -04:00 |
|