Commits · eb95169fe63af62ed776cce43417bcd9a4fa656b · nexedi / gitlab-ce

25 Sep, 2017 17 commits
- fix ldap group link and add some debug info · eb95169f
  James Lopez authored Sep 25, 2017
  
  eb95169f
- refactor code and add filter logic to group sync · 606cf5d6
  James Lopez authored Sep 25, 2017
  
  606cf5d6
- fix ldap group link and add some debug info · de07a7a3
  James Lopez authored Sep 25, 2017
  
  de07a7a3
- add ldap filter validation to ldap group link and update controller · a21928d0
  James Lopez authored Sep 25, 2017
  
  a21928d0
- added ldap validator and spec · 2ee8f590
  James Lopez authored Sep 25, 2017
  
  2ee8f590
- update views · 734ca1eb
  James Lopez authored Sep 24, 2017
  
  734ca1eb
- add JS magic · 9ac49271
  James Lopez authored Sep 24, 2017
  
  9ac49271
- add ldap user filter · 8b55f43a
  James Lopez authored Sep 24, 2017
  
  8b55f43a
- fix spec · bd6a9133
  James Lopez authored Sep 24, 2017
  
  bd6a9133
- add initial user filter spec · d2755c32
  James Lopez authored Sep 24, 2017
  
  d2755c32
- add ldap group links migrations · cf0d71e1
  James Lopez authored Sep 11, 2017
  
  cf0d71e1
- Merge branch 'sh-geo-handle-ssl-errors' into 'master' · 3bd42168
  Nick Thomas authored Sep 25, 2017
```
Gracefully handle and report SSL connection errors in Geo admin screen

Closes #3460

See merge request gitlab-org/gitlab-ee!2985
```
  3bd42168
- Merge branch 'docs-embedded-consul' into 'master' · 1cdc0039
  Achilleas Pipinellis authored Sep 25, 2017
```
Point to embedded Consul

See merge request gitlab-org/gitlab-ee!2980
```
  1cdc0039
- Point to embedded Consul · f4ba6b93
  Chenjerai Katanda authored Sep 25, 2017
  
  f4ba6b93
- Merge branch 'rc/refactor-project_policy_spec' into 'master' · c5f7e20a
  Douwe Maan authored Sep 25, 2017
```
Refactor spec/policies/project_policy_spec.rb to minimize the diff with CE

See merge request gitlab-org/gitlab-ee!2953
```
  c5f7e20a
- Merge branch 'master' into 'master' · 6fb05fee
  Rémy Coutable authored Sep 25, 2017
```
fix minor spelling mistakes

See merge request gitlab-org/gitlab-ee!3006
```
  6fb05fee
- fix minor spelling mistakes · 95ae0234
  René Genz authored Sep 25, 2017
  
  95ae0234
24 Sep, 2017 8 commits
- Merge branch 'docs-fix-link-1' into 'master' · f29bf995
  Achilleas Pipinellis authored Sep 24, 2017
```
Docs: fix internal link

See merge request gitlab-org/gitlab-ee!3003
```
  f29bf995
- Remove duplicate CHANGELOG entries · 2d3d914a
  Stan Hu authored Sep 23, 2017
  
  2d3d914a
- Update CHANGELOG.md for 10.0.1 · 7f17446d
  Stan Hu authored Sep 23, 2017
```
[ci skip]
```
  7f17446d
- Update CHANGELOG-EE.md for 10.0.1-ee · 3598ac66
  Stan Hu authored Sep 23, 2017
```
[ci skip]
```
  3598ac66
- Update CHANGELOG.md for 10.0.1 · 7d6cd72c
  Stan Hu authored Sep 23, 2017
```
[ci skip]
```
  7d6cd72c
- Update CHANGELOG-EE.md for 10.0.1-ee · a462070c
  Stan Hu authored Sep 23, 2017
```
[ci skip]
```
  a462070c
- Update CHANGELOG.md for 10.0.1 · f64bafde
  Stan Hu authored Sep 23, 2017
```
[ci skip]
```
  f64bafde
- Update CHANGELOG-EE.md for 10.0.1-ee · 2b0a04ee
  Stan Hu authored Sep 23, 2017
```
[ci skip]
```
  2b0a04ee
22 Sep, 2017 15 commits
- Merge branch '3513-follow-up-from-simplify-specification-of-ee-license-plan-features' into 'master' · 3db127f3
  Rémy Coutable authored Sep 22, 2017
```
Fix NoMethodError: undefined method `>' for nil:NilClass in license.rb

Closes #3513

See merge request gitlab-org/gitlab-ee!2994
```
  3db127f3
- Refactor spec/policies/project_policy_spec.rb to minimize the diff with CE · 1c71a629
  Rémy Coutable authored Sep 19, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  1c71a629
- Merge branch 'winh-i18-branches-page-ee' into 'master' · f699e474
  Phil Hughes authored Sep 22, 2017
```
Make branches page translatable

Closes gitlab-ce#32797

See merge request gitlab-org/gitlab-ee!2987
```
  f699e474
- Make branches page translatable · bff4f544
  Winnie Hellmann authored Sep 22, 2017
  
  bff4f544
- Merge branch 'ce-to-ee-2017-09-22' into 'master' · 9f80a23a
  Dmitriy Zaporozhets authored Sep 22, 2017
```
CE upstream: Friday

See merge request gitlab-org/gitlab-ee!2999
```
  9f80a23a
- fixes link · 86ecb059
  Marcia Ramos authored Sep 22, 2017
  
  86ecb059
- Resolve docs conflicts · 4d8f758e
  Achilleas Pipinellis authored Sep 22, 2017
  
  4d8f758e
- Gracefully handle and report SSL connection errors in Geo admin screen · ba1b8c54
  Stan Hu authored Sep 21, 2017
```
Customers attempting to configure Geo with invalid SSL certificate bundles
would not be alerted properly.

Closes #3460
```
  ba1b8c54
- Merge branch 'repmgr-with-password-docs' into 'master' · 3cca7d4d
  Achilleas Pipinellis authored Sep 22, 2017
```
Add notes on authentication to PG HA document

Closes omnibus-gitlab#2735

See merge request gitlab-org/gitlab-ee!2851
```
  3cca7d4d
- Add notes on authentication to PG HA document · a6df68c0
  Ian Baum authored Sep 22, 2017
  
  a6df68c0
- Merge branch 'docs/fix-review-docs-cleanup-job-ee' into 'master' · bd08d33f
  Rémy Coutable authored Sep 22, 2017
```
Do not clone the repo when running the review-docs jobs

See merge request gitlab-org/gitlab-ee!3000
```
  bd08d33f
- Merge branch '3498-error-500-due-to-promote-group-web-hooks' into 'master' · 82d09ae2
  Douwe Maan authored Sep 22, 2017
```
Resolve "Error 500 due to promote group Web hooks"

Closes #3498

See merge request gitlab-org/gitlab-ee!2972
```
  82d09ae2
- Merge branch 'docs-ux-guide-port-ce-to-ee' into 'master' · e4f52e08
  Achilleas Pipinellis authored Sep 22, 2017
```
UX guide update w/ new icon set

See merge request gitlab-org/gitlab-ee!2990
```
  e4f52e08
- We don't need to try it. · 1029550a
  Lin Jen-Shin authored Sep 22, 2017
```
This is following the change in:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14442
```
  1029550a
- Merge branch 'ee-33328-usage-ping-for-gitlab-features-and-components' into 'master' · 496d6685
  Rémy Coutable authored Sep 22, 2017
```
Adds gitlab features and components to usage ping data.

See merge request gitlab-org/gitlab-ee!2956
```
  496d6685