Commits · f3ce36aa5566f39fca856053400b0694a64af728 · nexedi / gitlab-ce

14 Dec, 2018 27 commits
- Merge branch 'bvl-regenerate-gitlab-pot' into 'master' · f3ce36aa
  Phil Hughes authored Dec 14, 2018
```
Add the missing changes to `gitlab.pot`

Closes #8852

See merge request gitlab-org/gitlab-ee!8857
```
  f3ce36aa
- Automatic merge of gitlab-org/gitlab-ce master · b510e931
  GitLab Bot authored Dec 14, 2018
  
  b510e931
- Merge branch 'ac-releases-name-sha-author' into 'master' · 213891fa
  Kamil Trzciński authored Dec 14, 2018
```
Add name, author and sha to releases

See merge request gitlab-org/gitlab-ce!23763
```
  213891fa
- Merge branch 'winh-resolved-discussions-reply-field' into 'master' · 1d0eadc4
  Fatih Acet authored Dec 14, 2018
```
Display reply field if resolved discussion has no replies

Closes #54330

See merge request gitlab-org/gitlab-ce!23801
```
  1d0eadc4
- Display reply field if resolved discussion has no replies · a2e9ad83
  Winnie Hellmann authored Dec 14, 2018
  
  a2e9ad83
- Merge branch 'winh-resolved-discussions-reply-field-ee' into 'master' · 5df549c1
  Fatih Acet authored Dec 14, 2018
```
Display reply field if resolved discussion has no replies  (EE-port)

Closes gitlab-ce#54330

See merge request gitlab-org/gitlab-ee!8855
```
  5df549c1
- Display reply field if resolved discussion has no replies (EE-port) · 89ab5b97
  Winnie Hellmann authored Dec 14, 2018
  
  89ab5b97
- Merge branch 'gt-update-geo-nodes-empty-state' into 'master' · 587b37a9
  Kushal Pandya authored Dec 14, 2018
```
Update geo nodes empty state

See merge request gitlab-org/gitlab-ee!8576
```
  587b37a9
- Automatic merge of gitlab-org/gitlab-ce master · f970b519
  GitLab Bot authored Dec 14, 2018
  
  f970b519
- Merge branch '52424-goodbye-hipchat-dependency-1' into 'master' · e8a7836c
  Sean McGivern authored Dec 14, 2018
```
Stop using HipChat in the ServicesController spec

See merge request gitlab-org/gitlab-ce!23774
```
  e8a7836c
- Add the missing changes to `gitlab.pot` · f82eb678
  Bob Van Landuyt authored Dec 14, 2018
  
  f82eb678
- Automatic merge of gitlab-org/gitlab-ce master · f8cb2b98
  GitLab Bot authored Dec 14, 2018
  
  f8cb2b98
- Merge branch '41766-vue-component' into 'master' · 120df796
  Phil Hughes authored Dec 14, 2018
```
Creates Vue component to render each release block

See merge request gitlab-org/gitlab-ce!23697
```
  120df796
- Creates Vue component to render each release block · 4a1a8018
  Filipa Lacerda authored Dec 14, 2018
  
  4a1a8018
- Automatic merge of gitlab-org/gitlab-ce master · ee6d90b3
  GitLab Bot authored Dec 14, 2018
  
  ee6d90b3
- Merge branch '55344-only-prompt-user-once-when-navigating-away-from-file-editor' into 'master' · 72feadce
  Phil Hughes authored Dec 14, 2018
```
Resolve "Only prompt user once when navigating away from file editor"

Closes #55344

See merge request gitlab-org/gitlab-ce!23820
```
  72feadce
- Automatic merge of gitlab-org/gitlab-ce master · bda2f7e0
  GitLab Bot authored Dec 14, 2018
  
  bda2f7e0
- Merge branch 'qa-nightly-41-fix-ldap-user-leak' into 'master' · bf5837a9
  Ramya Authappan authored Dec 14, 2018
```
Fix LDAP user leak into other tests

Closes gitlab-org/quality/nightly#41

See merge request gitlab-org/gitlab-ee!8788
```
  bf5837a9
- Merge branch 'triggermesh-knative-version' into 'master' · 91855866
  Kamil Trzciński authored Dec 14, 2018
```
Upgrade Knative from 0.1.3 to 0.2.2

See merge request gitlab-org/gitlab-ce!23808
```
  91855866
- Automatic merge of gitlab-org/gitlab-ce master · 9209166c
  GitLab Bot authored Dec 14, 2018
  
  9209166c
- Merge branch 'deprecated-passing-activerecord-objects' into 'master' · 4f10493b
  Stan Hu authored Dec 14, 2018
```
Fix deprecation: Passing ActiveRecord::Base objects to sanitize_sql_hash_for_assignment

See merge request gitlab-org/gitlab-ce!23818
```
  4f10493b
- Merge branch 'deprecated-delete-all-params' into 'master' · 30d2a3e6
  Stan Hu authored Dec 14, 2018
```
Fix deprecation: Passing conditions to delete_all is deprecated

See merge request gitlab-org/gitlab-ce!23817
```
  30d2a3e6
- Automatic merge of gitlab-org/gitlab-ce master · 700d63a9
  GitLab Bot authored Dec 14, 2018
  
  700d63a9
- Merge branch 'winh-dropdown-title-padding' into 'master' · 1bfb71a8
  Kushal Pandya authored Dec 14, 2018
```
Adjust padding of .dropdown-title to comply with design specs

See merge request gitlab-org/gitlab-ce!23546
```
  1bfb71a8
- Automatic merge of gitlab-org/gitlab-ce master · 75016e19
  GitLab Bot authored Dec 14, 2018
  
  75016e19
- Merge branch 'bw-fix-missing-board-milestone' into 'master' · 00873960
  Robert Speicher authored Dec 14, 2018
```
Fix Issue boards don't show milestone in issue details

See merge request gitlab-org/gitlab-ce!23813
```
  00873960
- Automatic merge of gitlab-org/gitlab-ce master · 00dd8218
  GitLab Bot authored Dec 14, 2018
  
  00dd8218
13 Dec, 2018 13 commits
- Merge remote-tracking branch 'dev/master' · de9b380e
  Alex Hanselka authored Dec 13, 2018
```
* dev/master:
  Update CHANGELOG.md for 11.3.13
  Validate LFS hrefs before downloading them
```
  de9b380e
- Merge branch 'security-2754-fix-lfs-import' into 'master' · 0b7e870f
  Alex Hanselka authored Dec 13, 2018
```
[MASTER]: Validate LFS hrefs before downloading them

Closes #2754

See merge request gitlab/gitlabhq!2696
```
  0b7e870f
- Remove beforeunload listener for cancel button · 5ee5203d
  Sam Bigelow authored Dec 13, 2018
  
  5ee5203d
- Fix deprecation: Passing ActiveRecord::Base objects to sanitize_sql_hash_for_assignment · c8d1ca7a
  Jasper Maes authored Dec 13, 2018
  
  c8d1ca7a
- Fix deprecation: Passing conditions to delete_all is deprecated · 921bc753
  Jasper Maes authored Dec 13, 2018
  
  921bc753
- Automatic merge of gitlab-org/gitlab-ce master · 4a37ff32
  GitLab Bot authored Dec 13, 2018
  
  4a37ff32
- Merge branch 'osw-suggest-diff-line-change' into 'master' · 07e079e8
  Phil Hughes authored Dec 13, 2018
```
Allow suggesting single line changes in diffs

See merge request gitlab-org/gitlab-ce!23147
```
  07e079e8
- Allow suggesting single line changes in diffs · ed3034bb
  Oswaldo Ferreira authored Dec 13, 2018
  
  ed3034bb
- Merge branch 'ee-osw-suggest-diff-line-change' into 'master' · 396e3fe7
  Phil Hughes authored Dec 13, 2018
```
Port of osw-suggest-diff-line-change to EE

See merge request gitlab-org/gitlab-ee!8656
```
  396e3fe7
- Port of osw-suggest-diff-line-change to EE · 23d6fbf1
  Jacques Erasmus authored Dec 13, 2018
  
  23d6fbf1
- Merge branch 'strict_fs_benchmarks' into 'master' · eb81c123
  Achilleas Pipinellis authored Dec 13, 2018
```
Update Filesystem Benchmarking to be more strict

See merge request gitlab-org/gitlab-ce!23709
```
  eb81c123
- Update Filesystem Benchmarking to be more strict · babaaba6
  Drew Blessing authored Dec 13, 2018
  
  babaaba6
- Merge branch 'docs-fix-base64-examples' into 'master' · 141e1b21
  Achilleas Pipinellis authored Dec 13, 2018
```
Fix base64 example to use universal option

Closes #55218

See merge request gitlab-org/gitlab-ce!23787
```
  141e1b21