Commits · 062365ff61f5485eb8dc4e4a4e6dcb51e2ea2c1f · nexedi / gitlab-ce

26 Aug, 2014 4 commits
- Add the email templates · 062365ff
  Marin Jankovski authored Aug 26, 2014
  
  062365ff
- Add the feature test · 131277b0
  Marin Jankovski authored Aug 26, 2014
  
  131277b0
- Send email notifying user he has been unsubscribed. · 4b71ae37
  Marin Jankovski authored Aug 26, 2014
  
  4b71ae37
- Merge branch 'ldap_group_sync_hints' into 'master' · b9dc8e59
  Dmitriy Zaporozhets authored Aug 26, 2014
```
Ldap group sync hints

See merge request !157
```
  b9dc8e59
25 Aug, 2014 12 commits
- Rewrite explanation text for ldap group members. · fa1c44ba
  Marin Jankovski authored Aug 25, 2014
  
  fa1c44ba
- Add short explanation on what to expect when doing group sync. · ce6c46e2
  Marin Jankovski authored Aug 25, 2014
  
  ce6c46e2
- Merge branch 'ldap_sync_time_option' into 'master' · 64434261
  Dmitriy Zaporozhets authored Aug 25, 2014
```
Ldap sync time option

Related to #147

/cc @sytse @jacobvosmaer @job

See merge request !155
```
  64434261
- Merge branch 'different_message_when_no_result' into 'master' · e6871279
  Dmitriy Zaporozhets authored Aug 25, 2014
```
Different message when no result is returned on ldap group query

Fixes #103

/cc @sytse @jacobvosmaer @job

See merge request !156
```
  e6871279
- Longer explanation of sync_time option. · 83a919f9
  Marin Jankovski authored Aug 25, 2014
  
  83a919f9
- Advise to refine search when no match is returned. · 1cfe3415
  Marin Jankovski authored Aug 25, 2014
  
  1cfe3415
- End TTD discussion. · 399055db
  Sytse Sijbrandij authored Aug 25, 2014
  
  399055db
- Update version file. · 9e7c7a60
  Marin Jankovski authored Aug 25, 2014
  
  9e7c7a60
- Add to changelog. · a057ba02
  Marin Jankovski authored Aug 25, 2014
  
  a057ba02
- Make LDAP sync time configurable. · a5d7fc81
  Marin Jankovski authored Aug 25, 2014
  
  a5d7fc81
- Merge branch 'ee_feature_steps_documentation' into 'master' · 2f8f0734
  Sytse Sijbrandij authored Aug 25, 2014
```
EE feature steps documentation

Fixes #139

/cc @sytse @jacobvosmaer @job

See merge request !154
```
  2f8f0734
- Add the documentation for ee feature steps. · d9605ad3
  Marin Jankovski authored Aug 25, 2014
  
  d9605ad3
22 Aug, 2014 12 commits
- Merge branch 'packages/7.2' into 'master' · a2fb19de
  Jacob Vosmaer authored Aug 22, 2014
```
Packages for 7.2.0-ee

See merge request !153
```
  a2fb19de
- Add 7.2.0-ee packages · 4be1ddf2
  Jacob Vosmaer authored Aug 22, 2014
  
  4be1ddf2
- Merge branch 'fix/admin_emails_unsubscribe' into 'master' · 24a98ab9
  Jacob Vosmaer authored Aug 22, 2014
```
Fix admin emails unsubscribe

Fixes #151

See merge request !152
```
  24a98ab9
- Fix unsubscribe controller spec. · a8b655a4
  Marin Jankovski authored Aug 22, 2014
  
  a8b655a4
- Update the tests after base change. · 0b9f6c58
  Marin Jankovski authored Aug 22, 2014
  
  0b9f6c58
- Use base 64 encoding for email params. · 9ba563f3
  Marin Jankovski authored Aug 22, 2014
  
  9ba563f3
- Add admin notification unsubscribe feature · b5342de5
  Marin Jankovski authored Aug 22, 2014
  
  b5342de5
- Add admin notification spec. · 93e2e302
  Marin Jankovski authored Aug 22, 2014
  
  93e2e302
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · 6ea702db
  Jacob Vosmaer authored Aug 22, 2014
  
  6ea702db
- Merge branch 'rack_attack/unsubscribes' into 'master' · abda2dab
  Jacob Vosmaer authored Aug 22, 2014
```
Protect unsubscribe path

See merge request !1033
```
  abda2dab
- Create one big regular expresion for Rack::Attack · b7060628
  Jacob Vosmaer authored Aug 22, 2014
  
  b7060628
- Change rack attack example. · 52e903e9
  Marin Jankovski authored Aug 21, 2014
  
  52e903e9
21 Aug, 2014 12 commits
- Merge branch 'backticks-cause-quote' into 'master' · e328668f
  Jacob Vosmaer authored Aug 21, 2014
```
Backticks cause quote

See merge request !704
```
  e328668f
- Remove backticks in markdown links that cause ugly code blocks in GitLab. · eea59597
  Sytse Sijbrandij authored Aug 21, 2014
  
  eea59597
- Merge branch 'doc/memory_recommendations' into 'master' · a83451a5
  Sytse Sijbrandij authored Aug 21, 2014
```
Swap is required on servers with 1GB RAM

See merge request !1032
```
  a83451a5
- Swap is required on servers with 1GB RAM · ecd946be
  Jacob Vosmaer authored Aug 21, 2014
  
  ecd946be
- Merge branch 'gitlab_shell_to_1.9.7' into 'master' · 2a532498
  Jacob Vosmaer authored Aug 21, 2014
```
Bump required gitlab-shell version to 1.9.7

See merge request !1031
```
  2a532498
- Bump required gitlab-shell version to 1.9.7 · bfaf3a79
  Jacob Vosmaer authored Aug 21, 2014
  
  bfaf3a79
- Merge branch 'doc/update/cmake' into 'master' · 85cf0633
  Marin Jankovski authored Aug 21, 2014
```
Add installing cmake to 7.2 update docs

See merge request !1029
```
  85cf0633
- Merge pull request #7562 from xvonabur/patch-1 · 5a6230b0
  Jacob Vosmaer authored Aug 21, 2014
```
Add dependency info for mysql-postgresql converter
```
  5a6230b0
- Merge pull request #7436 from bbodenmiller/patch-3 · 0d8a4e38
  Jacob Vosmaer authored Aug 21, 2014
```
upgrade ruby and gitlab shell config during 6.0->7.1 & 6.0->7.2 upgrades
```
  0d8a4e38
- Add installing cmake to 7.2 update docs · 274ca090
  Jacob Vosmaer authored Aug 21, 2014
  
  274ca090
- Merge branch 'explain_migration' into 'master' · 3ed8fbce
  Marin Jankovski authored Aug 21, 2014
```
Explain label migration

See merge request !1025
```
  3ed8fbce
- Merge branch 'update_changelog' into 'master' · df54f868
  Jacob Vosmaer authored Aug 21, 2014
```
Update changelog

Fixes #1509

See merge request !1026
```
  df54f868