Commits · 2a5dbf1e71f95c4151ebed20b708e1aed66b34a9 · nexedi / gitlab-ce

19 Dec, 2018 40 commits
- Display "commented" only for commit discussions on merge requests · 2a5dbf1e
  Winnie Hellmann authored Dec 06, 2018
```
Add commit prop to NoteableNote component and pass it from
NoteableDiscussion

(cherry picked from commit 3df4f2a20ece8a12413b91d93ddbc5f9da9a8744)

Conflicts:
	app/assets/javascripts/notes/components/noteable_note.vue
```
  2a5dbf1e
- Add failing test for commit ID in discussion header · 262c8f35
  Winnie Hellmann authored Dec 14, 2018
```
(cherry picked from commit cd7ed764c2d5902b88cb3842ca34ae7f9febfc37)
```
  262c8f35
- Automatic merge of gitlab-org/gitlab-ce master · 66518762
  GitLab Bot authored Dec 19, 2018
  
  66518762
- Merge branch 'docs/pipelines-merge-requests' into 'master' · 00096b52
  Evan Read authored Dec 19, 2018
```
Refactor the pipelines for merge requests docs

See merge request gitlab-org/gitlab-ce!23905
```
  00096b52
- Merge branch 'docs/ssh-host-authenticity' into 'master' · 82798f21
  Evan Read authored Dec 19, 2018
```
SSH docs: clarify that you need to accept the authenticity of the server

Closes #54880

See merge request gitlab-org/gitlab-ce!23584
```
  82798f21
- Automatic merge of gitlab-org/gitlab-ce master · d5e9ebd2
  GitLab Bot authored Dec 19, 2018
  
  d5e9ebd2
- Merge branch 'docs/make-job-api-docs-consistent' into 'master' · 46164f06
  Evan Read authored Dec 19, 2018
```
Docs/make job api docs consistent

See merge request gitlab-org/gitlab-ce!23581
```
  46164f06
- Merge branch 'docs/make-job-api-docs-consistent-ee' into 'master' · d34b5b5f
  Evan Read authored Dec 19, 2018
```
Make job API docs consistent

See merge request gitlab-org/gitlab-ee!8880
```
  d34b5b5f
- Automatic merge of gitlab-org/gitlab-ce master · 26e90431
  GitLab Bot authored Dec 19, 2018
  
  26e90431
- Merge branch 'mk/avoid-read-only-error' into 'master' · 05b16421
  Douglas Barbosa Alexandre authored Dec 19, 2018
```
Prevent admins from attempting hashed storage migration on read only DB

See merge request gitlab-org/gitlab-ce!23597
```
  05b16421
- Prevent admins from attempting hashed storage migration on read only DB · 9f80f040
  Michael Kozono authored Dec 19, 2018
  
  9f80f040
- Merge branch '45552-abuse-reports-functionality-is-undocumented' into 'master' · baad9fb8
  Achilleas Pipinellis authored Dec 19, 2018
```
CE: Document the "Abuse reports" feature

Closes #45552

See merge request gitlab-org/gitlab-ce!22932
```
  baad9fb8
- Merge branch 'ee-45552-abuse-reports-functionality-is-undocumented' into 'master' · feb01536
  Achilleas Pipinellis authored Dec 19, 2018
```
EE: Document the "Abuse reports" feature

See merge request gitlab-org/gitlab-ee!8763
```
  feb01536
- Automatic merge of gitlab-org/gitlab-ce master · 02678dac
  GitLab Bot authored Dec 19, 2018
  
  02678dac
- Merge branch 'remove-pseudonymizer-notes' into 'master' · 713de1d1
  Stan Hu authored Dec 19, 2018
```
Update Pseudonymizer to remove notes

See merge request gitlab-org/gitlab-ee!8923
```
  713de1d1
- Update Pseudonymizer to remove notes · 2eff4e97
  Taylor A Murphy, PhD authored Dec 19, 2018
  
  2eff4e97
- Merge branch 'patch-29' into 'master' · 7b0c5319
  Achilleas Pipinellis authored Dec 19, 2018
```
Update yaml/README.md to clarify allow_failure interaction with stages

See merge request gitlab-org/gitlab-ce!23367
```
  7b0c5319
- Merge branch '54953-fix-commit_email_hostname-accessor-in-fake_application_settings' into 'master' · 2a9ba34d
  Stan Hu authored Dec 19, 2018
```
Add FakeApplicationSettings#commit_email_hostname

Closes #54953

See merge request gitlab-org/gitlab-ce!23939
```
  2a9ba34d
- Merge branch 'da-refactor-broadcast-message' into 'master' · 8f2911ca
  Stan Hu authored Dec 19, 2018
```
Refactor BroadcastMessage to use Gitlab::JsonCache

See merge request gitlab-org/gitlab-ce!23934
```
  8f2911ca
- Merge branch 'da-refactor-broadcast-message' into 'master' · 97da05b6
  Stan Hu authored Dec 19, 2018
```
Refactor BroadcastMessage to use Gitlab::JsonCache

See merge request gitlab-org/gitlab-ee!8808
```
  97da05b6
- Automatic merge of gitlab-org/gitlab-ce master · 169cee2f
  GitLab Bot authored Dec 19, 2018
  
  169cee2f
- Merge branch 'ce-reduce-deploy_keys_controller-diff-with-ce' into 'master' · 83223539
  Robert Speicher authored Dec 19, 2018
```
Make Projects::DeployKeysController EE-ready

See merge request gitlab-org/gitlab-ce!23911
```
  83223539
- Merge branch 'reduce-deploy_keys_controller-diff-with-ce' into 'master' · 9f0f47f7
  Robert Speicher authored Dec 19, 2018
```
Reduce diff with CE in DeployKeys::CreateService

See merge request gitlab-org/gitlab-ee!8892
```
  9f0f47f7
- Update yaml/README.md to clarify allow_failure interaction with stages · 8c6341a4
  C.J. Jameson authored Nov 26, 2018
```
Kudos to @eread for feedback!
```
  8c6341a4
- Merge branch 'move-prepend-to-bottom-in-mailers' into 'master' · b8e652e4
  Douglas Barbosa Alexandre authored Dec 19, 2018
```
Move all the prepend in mailers to bottom

Closes #8600

See merge request gitlab-org/gitlab-ee!8922
```
  b8e652e4
- Automatic merge of gitlab-org/gitlab-ce master · 799b2f03
  GitLab Bot authored Dec 19, 2018
  
  799b2f03
- Refactor BroadcastMessage to use Gitlab::JsonCache · a77dcbb4
  Douglas Barbosa Alexandre authored Dec 19, 2018
  
  a77dcbb4
- Move Gitlab::JsonCache outside ee/ folder · 5da16a00
  Douglas Barbosa Alexandre authored Dec 19, 2018
  
  5da16a00
- Refactor BroadcastMessage to use Gitlab::JsonCache · 3d604a4c
  Douglas Barbosa Alexandre authored Dec 19, 2018
  
  3d604a4c
- Port Gitlab::JsonCache to CE · 156788ba
  Douglas Barbosa Alexandre authored Dec 19, 2018
  
  156788ba
- Merge branch 'reduce-diff-with-ce-in-lfs_request' into 'master' · 2fcdf0dd
  Douglas Barbosa Alexandre authored Dec 19, 2018
```
Extract EE-specific code from LfsRequest

See merge request gitlab-org/gitlab-ee!8902
```
  2fcdf0dd
- Merge branch 'ce-reduce-diff-with-ce-in-lfs_request' into 'master' · 347d1633
  Douglas Barbosa Alexandre authored Dec 19, 2018
```
Make LfsRequest EE-compatible

See merge request gitlab-org/gitlab-ce!23903
```
  347d1633
- Make Projects::DeployKeysController EE-ready · fa7ed15d
  Rémy Coutable authored Dec 18, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  fa7ed15d
- Reduce diff with CE in DeployKeys::CreateService · af275ea8
  Rémy Coutable authored Dec 17, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  af275ea8
- Merge branch '8794-download-package-files-from-ui' into 'master' · abee6ce4
  Douglas Barbosa Alexandre authored Dec 19, 2018
```
Resolve "Download package files from UI"

Closes #8794

See merge request gitlab-org/gitlab-ee!8888
```
  abee6ce4
- Add FakeApplicationSettings#commit_email_hostname · ecb847fd
  Rémy Coutable authored Dec 19, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  ecb847fd
- Automatic merge of gitlab-org/gitlab-ce master · f2359e94
  GitLab Bot authored Dec 19, 2018
  
  f2359e94
- Merge branch 'depracated-migration-inheritance' into 'master' · becfb662
  Robert Speicher authored Dec 19, 2018
```
ActiveRecord::Migration -> ActiveRecord::Migration[5.0] for ImportCommonMetricsNginxVts

See merge request gitlab-org/gitlab-ce!23910
```
  becfb662
- Move all the prepend in mailers to bottom · 625244bd
  Rémy Coutable authored Dec 19, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  625244bd
- Automatic merge of gitlab-org/gitlab-ce master · 14e17bc0
  GitLab Bot authored Dec 19, 2018
  
  14e17bc0