Commits · a819f7a106bba98bd1651566613b1267f016b373 · nexedi / gitlab-ce

11 Jun, 2019 13 commits
- Merge branch 'qa-un-quarantine-group-ldap-sync-test' into 'master' · a819f7a1
  Mark Lapierre authored Jun 11, 2019
```
Un-quarantine Group LDAP sync spec

See merge request gitlab-org/gitlab-ee!14047
```
  a819f7a1
- Automatic merge of gitlab-org/gitlab-ce master · 78a4013f
  GitLab Bot authored Jun 11, 2019
  
  78a4013f
- Merge branch 'qa-ml-dry-retry-on-exception' into 'master' · c9216d63
  Sanad Liaquat authored Jun 11, 2019
```
[CE] use `retry_on_exception` instead of duplicating code

See merge request gitlab-org/gitlab-ce!29452
```
  c9216d63
- Merge branch 'qa-ml-dry-retry-on-exception-ee' into 'master' · dc7272cc
  Sanad Liaquat authored Jun 11, 2019
```
[EE] use `retry_on_exception` instead of duplicating code

See merge request gitlab-org/gitlab-ee!14051
```
  dc7272cc
- Automatic merge of gitlab-org/gitlab-ce master · 8538183a
  GitLab Bot authored Jun 11, 2019
  
  8538183a
- Merge branch 'patch-70' into 'master' · 46129bc8
  Ray Paik authored Jun 11, 2019
```
Remove extra word on Health Check page

See merge request gitlab-org/gitlab-ce!29390
```
  46129bc8
- Remove extra word on Health Check page · 6931cccd
  Ben Bodenmiller authored Jun 11, 2019
  
  6931cccd
- Automatic merge of gitlab-org/gitlab-ce master · 963a2b58
  GitLab Bot authored Jun 11, 2019
  
  963a2b58
- Merge branch 'patch-55' into 'master' · c327d02b
  Evan Read authored Jun 11, 2019
```
Improve details about acceptable number of unicorn workers

See merge request gitlab-org/gitlab-ce!28262
```
  c327d02b
- Merge branch 'docs-subscription-changes-and-data' into 'master' · ac9a1c8d
  Drew Blessing authored Jun 11, 2019
```
Add section on subscription changes and data

See merge request gitlab-org/gitlab-ee!12072
```
  ac9a1c8d
- Automatic merge of gitlab-org/gitlab-ce master · b3b4ed17
  GitLab Bot authored Jun 11, 2019
  
  b3b4ed17
- Merge branch 'docs/ssot_scim_setup' into 'master' · d7f50276
  Evan Read authored Jun 11, 2019
```
Edit "SCIM Setup" for SSOT

See merge request gitlab-org/gitlab-ce!29313
```
  d7f50276
- Edit "SCIM Setup" for SSOT · 0dca3c4f
  Russell Dickenson authored Jun 11, 2019
  
  0dca3c4f
10 Jun, 2019 27 commits
- Merge branch '10442-add-enum-suffix-to-feedback-type' into 'master' · 2d4f9496
  Thong Kuah authored Jun 10, 2019
```
Resolve "Add enum suffix to Feedback type"

Closes #10442

See merge request gitlab-org/gitlab-ee!13966
```
  2d4f9496
- DRY exception handling · 1dbc25e8
  Mark Lapierre authored Jun 11, 2019
```
Use `retry_on_exception` instead of duplicating code
```
  1dbc25e8
- DRY exception handling · 291c06dc
  Mark Lapierre authored Jun 11, 2019
```
Use `retry_on_exception` instead of duplicating code
```
  291c06dc
- Automatic merge of gitlab-org/gitlab-ce master · a81b322e
  GitLab Bot authored Jun 10, 2019
  
  a81b322e
- Merge branch 'allow-emoji-in-references' into 'master' · a0de879d
  Robert Speicher authored Jun 10, 2019
```
Allow references to labels and milestones to contain emoji

Closes #37762, #53756, and #40728

See merge request gitlab-org/gitlab-ce!29284
```
  a0de879d
- Automatic merge of gitlab-org/gitlab-ce master · f2fb94a7
  GitLab Bot authored Jun 10, 2019
  
  f2fb94a7
- Merge branch... · 20bb0d66
  Mike Lewis authored Jun 10, 2019
```
Merge branch '61510-review-and-update-the-security-doc-pages-to-adhere-to-ssot-standards-docs' into 'master'

SSoT - Security doc pages

Closes #61510

See merge request gitlab-org/gitlab-ce!29357
```
  20bb0d66
- Automatic merge of gitlab-org/gitlab-ce master · 3010fbd5
  GitLab Bot authored Jun 10, 2019
  
  3010fbd5
- Merge branch 'osw-avoid-encoding-errors-on-merge-to-ref-service' into 'master' · d759da76
  Robert Speicher authored Jun 10, 2019
```
Handle encoding errors for MergeToRefService

See merge request gitlab-org/gitlab-ce!29440
```
  d759da76
- Avoid encoding errors for MergeToRefService · 8d7fb292
  Oswaldo Ferreira authored Jun 10, 2019
  
  8d7fb292
- Automatic merge of gitlab-org/gitlab-ce master · 3c4bc595
  GitLab Bot authored Jun 10, 2019
  
  3c4bc595
- Merge branch '62154-fe-create-fix-long-branch-name-in-dropdown' into 'master' · e5dcd110
  Phil Hughes authored Jun 10, 2019
```
Add word break style to branch name in dropdown

Closes #62154

See merge request gitlab-org/gitlab-ce!29069
```
  e5dcd110
- Add word break style to branch name in dropdown · 073ddf1e
  Samantha Ming authored Jun 10, 2019
```
Add change log
```
  073ddf1e
- Automatic merge of gitlab-org/gitlab-ce master · cfb297e9
  GitLab Bot authored Jun 10, 2019
  
  cfb297e9
- Merge branch '61072-link-to-user-profile-not-distinguishable-on-latest-commit-widget' into 'master' · 50063f4a
  Phil Hughes authored Jun 10, 2019
```
User link styling for commits

Closes #61072

See merge request gitlab-org/gitlab-ce!29150
```
  50063f4a
- User link styling for commits · a8eedd0a
  Marcel van Remmerden authored Jun 10, 2019
  
  a8eedd0a
- Merge branch 'add-ff-for-project-git-depth' into 'master' · 748c9552
  Kamil Trzciński authored Jun 10, 2019
```
Move project default git depth behind feature flags

Closes #62906

See merge request gitlab-org/gitlab-ce!29346
```
  748c9552
- Move project default git depth behind feature flags · 3df74a40
  Fabio Pitino authored Jun 10, 2019
  
  3df74a40
- Merge branch '11759-dependency-list-usage-ping' into 'master' · 460ec041
  Douglas Barbosa Alexandre authored Jun 10, 2019
```
Add DependencyList usage ping

Closes #11759

See merge request gitlab-org/gitlab-ee!13962
```
  460ec041
- Add usage counter for DependencyList · f5d8a930
  Tetiana Chupryna authored Jun 10, 2019
```
Make DependencyListUsageCounter similar as PodLogsUsageCounter.
Extract similar tests to shared examples.
```
  f5d8a930
- Merge branch 'osw-fix-post-dep-migration-with-timeout' into 'master' · 9254b5d4
  Stan Hu authored Jun 10, 2019
```
Avoid DB timeouts when scheduling migrations

Closes #63036

See merge request gitlab-org/gitlab-ce!29437
```
  9254b5d4
- Prefer prefix :for for feedback type enum · 6237d305
  Avielle Wolfe authored Jun 06, 2019
```
It avoids confusion with ActiveRecord's use of `type` for associations.
```
  6237d305
- Update uses of feedback type enum · 90970775
  Avielle Wolfe authored Jun 04, 2019
  
  90970775
- Add :type suffix to feedback type enum · f2030f1b
  Avielle Wolfe authored Jun 04, 2019
  
  f2030f1b
- Avoid DB timeouts when scheduling migrations · 304b43a6
  Oswaldo Ferreira authored Jun 10, 2019
  
  304b43a6
- Automatic merge of gitlab-org/gitlab-ce master · 61220afa
  GitLab Bot authored Jun 10, 2019
  
  61220afa
- Merge branch 'puma-mem-counter' into 'master' · 65be6f1a
  Kamil Trzciński authored Jun 10, 2019
```
Add puma killer observer

Closes #63037

See merge request gitlab-org/gitlab-ce!28992
```
  65be6f1a