home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 08:06:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,827 Commits 48 Branches 340 Tags
c6db0e82cdc25bee7eece5b8ddbf8cb6fdc92d32
Commit Graph
11827 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marin Jankovski 9ba563f357 Use base 64 encoding for email params. 2014-08-22 10:51:33 +02:00
Marin Jankovski b5342de57b Add admin notification unsubscribe feature 2014-08-22 10:45:45 +02:00
Marin Jankovski 93e2e302c8 Add admin notification spec. 2014-08-22 10:21:45 +02:00
Jacob Vosmaer 6ea702db9a Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-08-22 10:00:26 +02:00
Jacob Vosmaer abda2dab43 Merge branch 'rack_attack/unsubscribes' into 'master' 
Protect unsubscribe path

See merge request !1033
 2014-08-22 08:00:12 +00:00
Jacob Vosmaer b70606287b Create one big regular expresion for Rack::Attack 2014-08-22 09:56:39 +02:00
Marin JankovskiandJacob Vosmaer 52e903e99f Change rack attack example. 2014-08-22 09:56:39 +02:00
Jacob Vosmaer e328668f29 Merge branch 'backticks-cause-quote' into 'master' 
Backticks cause quote

See merge request !704
 2014-08-21 15:30:35 +00:00
Sytse Sijbrandij eea595971f Remove backticks in markdown links that cause ugly code blocks in GitLab. 2014-08-21 17:25:14 +02:00
Sytse Sijbrandij a83451a5c0 Merge branch 'doc/memory_recommendations' into 'master' 
Swap is required on servers with 1GB RAM

See merge request !1032
 2014-08-21 15:15:31 +00:00
Jacob Vosmaer ecd946be4c Swap is required on servers with 1GB RAM 2014-08-21 16:58:06 +02:00
Jacob Vosmaer 2a53249818 Merge branch 'gitlab_shell_to_1.9.7' into 'master' 
Bump required gitlab-shell version to 1.9.7

See merge request !1031
 2014-08-21 14:45:34 +00:00
Jacob Vosmaer bfaf3a79a9 Bump required gitlab-shell version to 1.9.7 2014-08-21 16:44:39 +02:00
Marin Jankovski 85cf0633fb Merge branch 'doc/update/cmake' into 'master' 
Add installing cmake to 7.2 update docs

See merge request !1029
 2014-08-21 14:31:49 +00:00