home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-26 21:16:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,841 Commits 48 Branches 340 Tags
746643e1091ca8ff1b40198dd5a76e445c608ad2
Commit Graph
11841 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 746643e109 Merge branch 'feature-120-multiple-ldap-groups' into 'master' 
Feature 120 multiple ldap groups

Fixes issue found in QA tests

- #158 inconsistent success behaviour for admin#ldap
- #157 Wrong navigation bar in group/ldapgrouplinks

See merge request !164
 2014-09-03 10:21:24 +00:00
Job van der Voort 1a0c9119c8 Merge branch 'doc/ldap_group_links' into 'master' 
Documentation for multiple LDAP group links

See merge request !165
 2014-09-02 13:47:36 +00:00
Jacob Vosmaer 3272d14b39 Add a picture of two linked LDAP groups 2014-09-02 10:59:24 +02:00
Jacob Vosmaer 48bf72d132 Update documentation with new label text 2014-09-02 10:43:28 +02:00
Jacob Vosmaer bd8167b388 Point out multiple group links come in 7.3 EE 2014-09-02 10:43:27 +02:00
Jacob Vosmaer b9096650dc What if the user belongs to multiple LDAP groups? 2014-09-02 10:43:27 +02:00
Jacob Vosmaer cbe22c9ec3 Reword feature description for multiple groups 2014-09-02 10:43:27 +02:00
Jacob Vosmaer af10825a01 Update LDAP group screenshots for 7.3 2014-09-02 10:43:27 +02:00
Jacob Vosmaer 6a3c694a19 Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into feature-120-multiple-ldap-groups 2014-09-02 09:59:00 +02:00
Dmitriy Zaporozhets 991ad1f0fe Merge branch 'ldap_reset_text' into 'master' 
Improve explanation of the LDAP permission reset

See merge request !163
 2014-09-01 09:48:15 +00:00
Jan-Willem van der Meer bac04b220b admin group edits now redirect to group#show on success 2014-09-01 10:05:37 +02:00
Jan-Willem van der Meer 89f25ffae7 Render correct layout, css fix empty state of ldap links 
Fixes #157
 2014-09-01 09:25:10 +02:00
Jacob Vosmaer dbe62c373e Improve explanation of the LDAP permission reset 2014-08-29 17:47:05 +02:00
Jacob Vosmaer 483c0e26f5 Merge branch 'feature-120-multiple-ldap-groups' into 'master' 
Add support for multiple LDAP groups per Gitlab group

concerns #120

See merge request !143
 2014-08-29 15:27:53 +00:00
Jacob Vosmaer c6db0e82cd Update db/schema.rb after merging master 2014-08-29 14:51:21 +02:00
Jacob Vosmaer 90ce0be420 Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into feature-120-multiple-ldap-groups 
Conflicts:
	app/models/group.rb
	app/views/groups/members.html.haml
	db/schema.rb
 2014-08-29 14:43:20 +02:00
Jan-Willem van der Meer 5238efd80c Only return found LDAP groups for processing 2014-08-29 11:09:06 +02:00
Jacob Vosmaer a81d806b77 Fix version texts for latest packages 2014-08-28 18:13:32 +02:00
Jacob Vosmaer 36613a5a2f Merge branch 'packages/7.2.1' into 'master' 
Packages for 7.2.1-ee

See merge request !162
 2014-08-28 15:48:13 +00:00
Jacob Vosmaer 0e8f10a728 Add packages for GitLab 7.2.1-ee 2014-08-28 17:23:48 +02:00
Jacob Vosmaer 4839d92c93 Merge branch 'packages/centos7' into 'master' 
Add 7.2.0-ee packages for Centos 7

See merge request !161
 2014-08-27 13:09:08 +00:00
Jacob Vosmaer 8c6d8b9959 Add 7.2.0-ee packages for Centos 7 2014-08-27 15:07:30 +02:00
Dmitriy Zaporozhets 0cbf478808 Merge branch 'unsubscribed_email' into 'master' 
Unsubscribed email and doc update

Fixes #152

/cc @jacobvosmaer @job @sytse

See merge request !159
 2014-08-27 07:39:13 +00:00
Marin Jankovski b51b5d3ebe Add to changelog. 2014-08-27 08:51:06 +02:00
Dmitriy Zaporozhets ea5bdd8459 Merge branch 'show_group_sharing_members' into 'master' 
Show group sharing members

Fixes #140

/cc @jacobvosmaer @job @sytse

See merge request !158
 2014-08-26 16:06:40 +00:00
Marin Jankovski 49302e680d Add note to documentation. 2014-08-26 17:17:14 +02:00
Marin Jankovski 062365ff61 Add the email templates 2014-08-26 17:17:04 +02:00
Marin Jankovski 131277b0fe Add the feature test 2014-08-26 17:16:12 +02:00
Marin Jankovski 4b71ae37dd Send email notifying user he has been unsubscribed. 2014-08-26 17:15:43 +02:00
Marin Jankovski 77156c0f0c Move to partial. 2014-08-26 12:44:10 +02:00
Marin Jankovski 704b5b670e Add shared group members listing feature. 2014-08-26 12:39:19 +02:00
Marin Jankovski 72139167dc Mockup of shared group memeber list at project member page. 2014-08-26 11:58:05 +02:00
Dmitriy Zaporozhets b9dc8e59e4 Merge branch 'ldap_group_sync_hints' into 'master' 
Ldap group sync hints

See merge request !157
 2014-08-26 07:35:57 +00:00
Marin Jankovski fa1c44ba1a Rewrite explanation text for ldap group members. 2014-08-25 15:48:50 +02:00
Marin Jankovski ce6c46e25b Add short explanation on what to expect when doing group sync. 2014-08-25 15:39:30 +02:00
Dmitriy Zaporozhets 6443426106 Merge branch 'ldap_sync_time_option' into 'master' 
Ldap sync time option

Related to #147

/cc @sytse @jacobvosmaer @job

See merge request !155
 2014-08-25 13:30:38 +00:00
Dmitriy Zaporozhets e6871279d7 Merge branch 'different_message_when_no_result' into 'master' 
Different message when no result is returned on ldap group query

Fixes #103

/cc @sytse @jacobvosmaer @job

See merge request !156
 2014-08-25 13:30:16 +00:00
Marin Jankovski 83a919f96e Longer explanation of sync_time option. 2014-08-25 13:50:33 +02:00
Marin Jankovski 1cfe341589 Advise to refine search when no match is returned. 2014-08-25 12:39:45 +02:00
Sytse Sijbrandij 399055db77 End TTD discussion. 2014-08-25 11:53:09 +02:00
Marin Jankovski 9e7c7a6029 Update version file. 2014-08-25 11:25:42 +02:00
Marin Jankovski a057ba028f Add to changelog. 2014-08-25 11:25:27 +02:00
Marin Jankovski a5d7fc81d9 Make LDAP sync time configurable. 2014-08-25 11:15:25 +02:00
Sytse Sijbrandij 2f8f073486 Merge branch 'ee_feature_steps_documentation' into 'master' 
EE feature steps documentation

Fixes #139

/cc @sytse @jacobvosmaer @job

See merge request !154
 2014-08-25 07:45:11 +00:00
Marin Jankovski d9605ad3ea Add the documentation for ee feature steps. 2014-08-25 09:43:12 +02:00
Jacob Vosmaer a2fb19def4 Merge branch 'packages/7.2' into 'master' 
Packages for 7.2.0-ee

See merge request !153
 2014-08-22 13:43:09 +00:00
Jacob Vosmaer 4be1ddf2b1 Add 7.2.0-ee packages 2014-08-22 15:19:02 +02:00
Jacob Vosmaer 24a98ab935 Merge branch 'fix/admin_emails_unsubscribe' into 'master' 
Fix admin emails unsubscribe

Fixes #151

See merge request !152
 2014-08-22 11:01:25 +00:00
Marin Jankovski a8b655a46e Fix unsubscribe controller spec. 2014-08-22 12:03:33 +02:00
Marin Jankovski 0b9f6c589e Update the tests after base change. 2014-08-22 11:08:30 +02:00