Commits · 0f6f1dc127b85b8d66897e11dfa8013ebc2e6539 · nexedi / gitlab-ce

12 Apr, 2018 40 commits
- Add CHANGELOG · 0f6f1dc1
  Douglas Barbosa Alexandre authored Apr 12, 2018
  
  0f6f1dc1
- Improve the query performance to find unsynced job artifacts · 4626bed9
  Douglas Barbosa Alexandre authored Apr 12, 2018
  
  4626bed9
- Merge branch 'ce-to-ee-2018-04-12' into 'master' · 95ac1154
  Robert Speicher authored Apr 12, 2018
```
CE upstream - 2018-04-12 18:23 UTC

Closes #5103

See merge request gitlab-org/gitlab-ee!5347
```
  95ac1154
- Resolve conflicts in `spec/policies/project_policy_spec.rb` · 1e5829c1
  Bob Van Landuyt authored Apr 12, 2018
  
  1e5829c1
- Resolve conflicts in `app/views/admin/projects/show.html.haml` · 7e1943e2
  Bob Van Landuyt authored Apr 12, 2018
  
  7e1943e2
- Fix conflicts in `app/policies/project_policy.rb` · e6fd6de1
  Bob Van Landuyt authored Apr 12, 2018
  
  e6fd6de1
- Fix conflict in `app/controllers/projects/issues_controller.rb` · c4280a1a
  Bob Van Landuyt authored Apr 12, 2018
  
  c4280a1a
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-12 · 381a636c
  GitLab Bot authored Apr 12, 2018
```
# Conflicts:
#	app/controllers/projects/issues_controller.rb
#	app/policies/project_policy.rb
#	app/views/admin/projects/show.html.haml
#	spec/policies/project_policy_spec.rb

[ci skip]
```
  381a636c
- Merge branch 'rename-overview-project-sidenav' into 'master' · 7f01d49b
  Tim Zallmann authored Apr 12, 2018
```
Renamed 'Overview' to 'Project' in the contextual navigation at a project level

Closes #43430

See merge request gitlab-org/gitlab-ce!18295
```
  7f01d49b
- Renamed 'Overview' to 'Project' in the contextual navigation at a project level · 406915f4
  Constance Okoghenun authored Apr 12, 2018
  
  406915f4
- Merge branch 'docs-graphs-section-new-frontend-guide' into 'master' · da693388
  Clement Ho authored Apr 12, 2018
```
Update the new frontend guide to specify the usage of d3

See merge request gitlab-org/gitlab-ce!18294
```
  da693388
- Merge branch '10-7-update-licenses' into 'master' · a76dacd9
  Rémy Coutable authored Apr 12, 2018
```
Update the dependencies license list for 10.7

See merge request gitlab-org/gitlab-ce!18339
```
  a76dacd9
- Update the dependencies license list for 10.7 · e817399d
  Filipa Lacerda authored Apr 12, 2018
  
  e817399d
- Added d3 documentation for the new fe guide · e3eeb3cb
  Jose Ivan Vargas authored Apr 10, 2018
  
  e3eeb3cb
- Merge branch 'dm-archived-read-only' into 'master' · f5a3d8f7
  Robert Speicher authored Apr 12, 2018
```
Make archived projects completely read-only

Closes #44788

See merge request gitlab-org/gitlab-ce!18136
```
  f5a3d8f7
- Merge branch 'ce-to-ee-2018-04-12' into 'master' · 200764bc
  Rémy Coutable authored Apr 12, 2018
```
CE upstream - 2018-04-12 09:32 UTC

See merge request gitlab-org/gitlab-ee!5338
```
  200764bc
- Merge branch 'dm-archived-read-only-ee' into 'master' · befdcac3
  Robert Speicher authored Apr 12, 2018
```
[EE] Make archived projects completely read-only

See merge request gitlab-org/gitlab-ee!5227
```
  befdcac3
- Merge branch 'revert-93869c63' into 'master' · 64f91be0
  Filipa Lacerda authored Apr 12, 2018
```
Revert "Resolve HTML/CSS inconsistent comment forms on Issue and Merge Request"

Closes #45288

See merge request gitlab-org/gitlab-ce!18346
```
  64f91be0
- Spec improvements for speed, reliability and readability · 08a6a45c
  Bob Van Landuyt authored Apr 11, 2018
  
  08a6a45c
- Spec improvements for speed, reliability and readability · eae2ed33
  Bob Van Landuyt authored Apr 11, 2018
  
  eae2ed33
- Resolve conflict in doc/topics/autodevops/index.md · 0b90a0f9
  Rémy Coutable authored Apr 12, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  0b90a0f9
- Resolve conflict in spec/lib/gitlab/utils_spec.rb · e50886bb
  Rémy Coutable authored Apr 12, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  e50886bb
- Resolve conflict in lib/gitlab/utils.rb · 98dfb9f8
  Rémy Coutable authored Apr 12, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  98dfb9f8
- Merge branch '42613-clean-up-old-project-permissions-frontend-code' into 'master' · da6595d4
  Clement Ho authored Apr 12, 2018
```
Resolve "Clean up old project permissions frontend code"

Closes #42613

See merge request gitlab-org/gitlab-ce!16818
```
  da6595d4
- Resolve "Clean up old project permissions frontend code" · bbb24da9
  Mike Greiling authored Apr 12, 2018
  
  bbb24da9
- Merge branch 'ee-42613-clean-up-old-project-permissions-frontend-code' into 'master' · b901b1e7
  Clement Ho authored Apr 12, 2018
```
EE Port of "Clean up old project permissions frontend code"

See merge request gitlab-org/gitlab-ee!5314
```
  b901b1e7
- EE Port of "Clean up old project permissions frontend code" · 20c86846
  Mike Greiling authored Apr 12, 2018
  
  20c86846
- Merge branch '45287-align-icons' into 'master' · 7ea7b2ab
  Phil Hughes authored Apr 12, 2018
```
Resolve "Retry icon is misaligned in pipelines graph actions"

Closes #45287

See merge request gitlab-org/gitlab-ce!18345
```
  7ea7b2ab
- Revert "Merge branch... · 09ab85a9
  Clement Ho authored Apr 12, 2018
```
Revert "Merge branch '44870-remove-extra-space-around-comment-form-on-merge-requests' into 'master'"

This reverts merge request !18120
```
  09ab85a9
- Merge branch 'jousch/gitlab-ce-ci-untracked-doku-docs' into 'master' · 1e54e30f
  Rémy Coutable authored Apr 12, 2018
```
Add dedicated info about artifacts:untracked to GitLab CI's README.md

See merge request gitlab-org/gitlab-ce!18342
```
  1e54e30f
- Align action icons in pipeline graph · 55340c36
  Filipa Lacerda authored Apr 12, 2018
  
  55340c36
- Merge branch '5103-mention-reply-by-email-in-user-docs' into 'master' · f97d87ea
  Achilleas Pipinellis authored Apr 12, 2018
```
Mention reply-by-email in user doc

Closes gitlab-ee#5103

See merge request gitlab-org/gitlab-ce!18310
```
  f97d87ea
- Merge branch 'workhorse-4-1-0' into 'master' · 556a6da7
  Douwe Maan authored Apr 12, 2018
```
Update GitLab Workhorse to v4.1.0

See merge request gitlab-org/gitlab-ce!18327
```
  556a6da7
- Merge branch '5637-border-top' into 'master' · 8ec4fb74
  Phil Hughes authored Apr 12, 2018
```
Resolve "Missing border top in codeclimate report"

Closes #5637

See merge request gitlab-org/gitlab-ee!5340
```
  8ec4fb74
- Merge branch 'docs-update-instal-guide-10-7-ee' into 'master' · 44d97239
  James Lopez authored Apr 12, 2018
```
Adds update guide for 10.7-ee

See merge request gitlab-org/gitlab-ee!5337
```
  44d97239
- Merge branch 'docs-update-instal-guide-10-7' into 'master' · 038367c3
  James Lopez authored Apr 12, 2018
```
Updates installation and update guides

See merge request gitlab-org/gitlab-ce!18337
```
  038367c3
- Fix indentation · 2edcd9d0
  Filipa Lacerda authored Apr 12, 2018
  
  2edcd9d0
- Merge branch '10-7-update-files' into 'master' · 39c9091a
  James Lopez authored Apr 12, 2018
```
Update the .gitignore, .gitlab-ci.yml, and Dockerfile templates

See merge request gitlab-org/gitlab-ce!18338
```
  39c9091a
- Add dedicated info about artifacts:untracked to GitLab CI's README.md · be6f17cf
  Josef Glatz authored Feb 20, 2018
  
  be6f17cf
- Merge branch 'move-help-state-vue-component' into 'master' · ef04186f
  Filipa Lacerda authored Apr 12, 2018
```
Move TimeTrackingHelpState vue component

See merge request gitlab-org/gitlab-ce!18319
```
  ef04186f