Commits · 6237d3052babed1ec89cc9aeac03b0d7552ae4c2 · nexedi / gitlab-ce

10 Jun, 2019 40 commits
- 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
- Automatic merge of gitlab-org/gitlab-ce master · 51fbdb3b
  GitLab Bot authored Jun 10, 2019
  
  51fbdb3b
- Merge branch 'ac-63020-typeerror-nil-can-t-be-coerced-into-integer' into 'master' · d5e8e1ef
  Mayra Cabrera authored Jun 10, 2019
```
Fix nil coercion updating storage size on project statistics

See merge request gitlab-org/gitlab-ce!29425
```
  d5e8e1ef
- Fix nil coercion updating storage size on project statistics · c699c6fe
  Alessio Caiazza authored Jun 10, 2019
  
  c699c6fe
- Merge branch 'cancel-auto-merge-when-branch-is-changed' into 'master' · de4e63b3
  Kamil Trzciński authored Jun 10, 2019
```
Cancel Auto Merge when target branch is changed

See merge request gitlab-org/gitlab-ce!29416
```
  de4e63b3
- Merge branch 'fix-issue-mr-badge' into 'master' · e74f7159
  Phil Hughes authored Jun 10, 2019
```
Use grid and correct border radius for status badge

See merge request gitlab-org/gitlab-ce!29420
```
  e74f7159
- Automatic merge of gitlab-org/gitlab-ce master · 0de92c60
  GitLab Bot authored Jun 10, 2019
  
  0de92c60
- Merge branch '57171-docs' into 'master' · 56d03e8c
  Clement Ho authored Jun 10, 2019
```
Add docs for linking to external dashboard

Closes #57171

See merge request gitlab-org/gitlab-ce!27950
```
  56d03e8c
- Move external dashboard docs · d55fd99c
  Reuben Pereira authored Jun 10, 2019
```
- To user/project/operations
- And cross-link in ci/environments
```
  d55fd99c
- Automatic merge of gitlab-org/gitlab-ce master · c7ca22c1
  GitLab Bot authored Jun 10, 2019
  
  c7ca22c1
- Cancel Auto Merge when target branch is changed · 30123910
  Shinya Maeda authored Jun 10, 2019
```
When target branch is updated, Auto Merge should be canceled.
```
  30123910
- Merge branch 'avatar-mixin' into 'master' · 07f8f205
  Kushal Pandya authored Jun 10, 2019
```
Fix border radius of collapse discussion btn

See merge request gitlab-org/gitlab-ce!29217
```
  07f8f205
- Automatic merge of gitlab-org/gitlab-ce master · 3bcc13bf
  GitLab Bot authored Jun 10, 2019
  
  3bcc13bf
- Merge branch 'docs/vid-links-for-ssot' into 'master' · 6c81c81a
  Mike Lewis authored Jun 10, 2019
```
Video links for SSoT audit

See merge request gitlab-org/gitlab-ce!29400
```
  6c81c81a
- Video links for SSoT audit · a6bf0074
  Evan Read authored Jun 10, 2019
  
  a6bf0074
- Fix border radius of collapse discussion btn · fa98280b
  Annabel Dunstone Gray authored Jun 05, 2019
```
Turn avatar-counter into a mixin with optional border-radius
```
  fa98280b
- Automatic merge of gitlab-org/gitlab-ce master · 69db5e2f
  GitLab Bot authored Jun 10, 2019
  
  69db5e2f
- Merge branch '33064-add-labels-to-note-event-payload' into 'master' · a2867862
  Sean McGivern authored Jun 10, 2019
```
Adding labels to note event payload.

Closes #33064

See merge request gitlab-org/gitlab-ce!29384
```
  a2867862
- Use grid and correct border radius for status badge · ca1d447d
  Annabel Dunstone Gray authored Jun 10, 2019
  
  ca1d447d
- Automatic merge of gitlab-org/gitlab-ce master · dd24cbc9
  GitLab Bot authored Jun 10, 2019
  
  dd24cbc9
- Merge branch '62974-follow-up-from-wip-align-merge-request-icons-and-text' into 'master' · 02e36679
  Annabel Dunstone Gray authored Jun 10, 2019
```
Make margin between buttons consistent

Closes #62974

See merge request gitlab-org/gitlab-ce!29378
```
  02e36679
- Make margin between buttons consistent · 28ae4786
  Marcel van Remmerden authored Jun 10, 2019
  
  28ae4786
- Update CHANGELOG.md for 11.11.3 · eea04600
  GitLab Release Tools Bot authored Jun 10, 2019
```
[ci skip]
```
  eea04600
- Update CHANGELOG.md for 11.11.3 · dcd20d7d
  GitLab Release Tools Bot authored Jun 10, 2019
```
[ci skip]
```
  dcd20d7d
- Update CHANGELOG-EE.md for 11.11.3-ee · ee4bab61
  GitLab Release Tools Bot authored Jun 10, 2019
```
[ci skip]
```
  ee4bab61
- Automatic merge of gitlab-org/gitlab-ce master · 9ec58814
  GitLab Bot authored Jun 10, 2019
  
  9ec58814
- Merge branch 'patch-33' into 'master' · a0af3458
  Nick Thomas authored Jun 10, 2019
```
List ssh-ed25519 example

See merge request gitlab-org/gitlab-ce!28090
```
  a0af3458
- List ssh-ed25519 example · 683e7b30
  Ben Bodenmiller authored Jun 10, 2019
  
  683e7b30
- Merge branch 'ee-patch-33' into 'master' · d66d02db
  Nick Thomas authored Jun 10, 2019
```
EE port of "list ssh-ed25519 example"

See merge request gitlab-org/gitlab-ee!13065
```
  d66d02db
- EE port of "list ssh-ed25519 example" · 496653cd
  Imre Farkas authored Jun 10, 2019
```
See merge request gitlab-org/gitlab-ce!28090
```
  496653cd
- Adding labels to note event payload. · ed8a00b9
  Sujay Patel authored Jun 08, 2019
  
  ed8a00b9
- Automatic merge of gitlab-org/gitlab-ce master · 948fabc2
  GitLab Bot authored Jun 10, 2019
  
  948fabc2
- Merge branch 'sh-fix-fogbugz-import' into 'master' · 895519a8
  James Lopez authored Jun 10, 2019
```
Fix Fogbugz Importer not working

Closes #33530

See merge request gitlab-org/gitlab-ce!29383
```
  895519a8
- Automatic merge of gitlab-org/gitlab-ce master · aff559c4
  GitLab Bot authored Jun 10, 2019
  
  aff559c4
- Merge branch 'patch-56' into 'master' · 1cc2aa5b
  Sean McGivern authored Jun 10, 2019
```
Clarify that performance bar is not always on

See merge request gitlab-org/gitlab-ce!28287
```
  1cc2aa5b
- Automatic merge of gitlab-org/gitlab-ce master · 77d9e89e
  GitLab Bot authored Jun 10, 2019
  
  77d9e89e
- Merge branch 'i18n-email-of-user-profile' into 'master' · 9361ce54
  Filipa Lacerda authored Jun 10, 2019
```
Externalize strings of email page in user profile

See merge request gitlab-org/gitlab-ce!28587
```
  9361ce54
- Externalize strings of email page in user profile · e3371313
  antony liu authored Jun 10, 2019
  
  e3371313