Commits · v10.7.0-rc6 · Forest Godfrey / gitlab-ce

17 Apr, 2018 21 commits
- Update VERSION to 10.7.0-rc6 · 28891da3
  
  Robert Speicher authored Apr 17, 2018
  
  28891da3
- Merge branch '10-7-stable-prepare-rc6' into '10-7-stable' · 4ca8f573
  Robert Speicher authored Apr 17, 2018
```
Prepare 10.7 RC6 release

See merge request gitlab-org/gitlab-ce!18365
```
  4ca8f573
- Merge branch '45271-collpased-diff-loading' into 'master' · 836bdc21
  Phil Hughes authored Apr 17, 2018
```
Resolve "Collapsed diff spacing wrong when failed to load"

Closes #45271 and #45317

See merge request gitlab-org/gitlab-ce!18351
```
  836bdc21
- Merge branch '10-7-stable-prepare-rc6-fix-conflict-18366' into '10-7-stable-prepare-rc6' · aed60daa
  Dmitriy Zaporozhets authored Apr 17, 2018
```
Resolve conflicts for Don't reset application settings checkboxes when save another section

See merge request gitlab-org/gitlab-ce!18423
```
  aed60daa
- Merge branch 'dm-archived-read-only' into 'master' · 58590b8a
  Robert Speicher authored Apr 12, 2018
```
Make archived projects completely read-only

Closes #44788

See merge request gitlab-org/gitlab-ce!18136
```
  58590b8a
- Fix conflict in app/controllers/admin/application_settings_controller.rb · b1d3090e
  Dmitriy Zaporozhets authored Apr 17, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b1d3090e
- Merge branch 'sh-memoize-repository-empty' into 'master' · 30acfab5
  Grzegorz Bizon authored Apr 17, 2018
```
Memoize Git::Repository#has_visible_content?

See merge request gitlab-org/gitlab-ce!18383
```
  30acfab5
- Merge branch 'workhorse-4-1-0' into 'master' · 372b6584
  Douwe Maan authored Apr 12, 2018
```
Update GitLab Workhorse to v4.1.0

See merge request gitlab-org/gitlab-ce!18327
```
  372b6584
- Merge branch '45269-double-checked-internal-ids' into 'master' · 365e45fd
  Yorick Peterse authored Apr 16, 2018
```
Double-checked internal ID generation for transition phase

Closes #45269

See merge request gitlab-org/gitlab-ce!18392
```
  365e45fd
- Merge branch 'docs/gb/add-support-note-to-variables-policy-docs' into 'master' · 9422e563
  Grzegorz Bizon authored Apr 16, 2018
```
Add note about support of variables policy to docs

Closes #45301

See merge request gitlab-org/gitlab-ce!18387
```
  9422e563
- Merge branch 'fix_container_scanning_in_vendored_gitlab_ci_yml_for_auto_devops' into 'master' · 8da7858a
  Robert Speicher authored Apr 16, 2018
```
Fix container scanning in vendored GitLab CI configuration for Auto Devops

See merge request gitlab-org/gitlab-ce!18374
```
  8da7858a
- Merge branch 'jramsay-ha-plugin-docs' into 'master' · 0fabf59c
  Marcia Ramos authored Apr 16, 2018
```
Add note about HA configurations

See merge request gitlab-org/gitlab-ce!18354
```
  0fabf59c
- Merge branch 'docs-for-failure-reason-tooltip' into 'master' · 27b1f960
  Achilleas Pipinellis authored Apr 13, 2018
```
Add missing documentation about failure reason

Closes #45300

See merge request gitlab-org/gitlab-ce!18352
```
  27b1f960
- Merge branch 'revert-93869c63' into 'master' · 967b3a3e
  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
```
  967b3a3e
- Merge branch 'jprovazn-fix-references' into 'master' · f1aeef98
  Douwe Maan authored Apr 13, 2018
```
Fix reference filters in group context

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

See merge request gitlab-org/gitlab-ce!18339
```
  14454a91
- Merge branch '10-7-update-files' into 'master' · b1fe29cc
  James Lopez authored Apr 12, 2018
```
Update the .gitignore, .gitlab-ci.yml, and Dockerfile templates

See merge request gitlab-org/gitlab-ce!18338
```
  b1fe29cc
- Merge branch 'docs-update-instal-guide-10-7' into 'master' · ccfac068
  James Lopez authored Apr 12, 2018
```
Updates installation and update guides

See merge request gitlab-org/gitlab-ce!18337
```
  ccfac068
- Merge branch '5103-mention-reply-by-email-in-user-docs' into 'master' · a78d7f3e
  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
```
  a78d7f3e
- Merge branch '41436-use-simpler-env-vars-for-auto-devops-replicas' into 'master' · 48820443
  Achilleas Pipinellis authored Apr 12, 2018
```
Update Auto-Devops docs to mention new REPLICAS env var

See merge request gitlab-org/gitlab-ce!18036
```
  48820443
- Merge branch 'dz-fix-admin-import-sources' into 'master' · d9a15628
  Douwe Maan authored Apr 16, 2018
```
Don't reset application settings checkboxes when save another section

Closes #45343

See merge request gitlab-org/gitlab-ce!18366
```
  d9a15628
12 Apr, 2018 6 commits
- Update VERSION to 10.7.0-rc5 · 7a0303cf
  James Lopez authored Apr 12, 2018
  
  7a0303cf
- Merge branch '10-7-stable-prepare-rc5' into '10-7-stable' · 63623dc7
  James Lopez authored Apr 12, 2018
```
Prepare 10.7 RC5 release

See merge request gitlab-org/gitlab-ce!18308
```
  63623dc7
- Merge branch 'fix/gb/fix-pipeline-statuses-illustrations' into 'master' · 8e26fbfe
  Marin Jankovski authored Apr 12, 2018
```
Fix empty state for build that does not have a trace

Closes #45204

See merge request gitlab-org/gitlab-ce!18278
```
  8e26fbfe
- Merge branch 'fix/wiki-find-file-gitaly' into 'master' · 6e5d1595
  Robert Speicher authored Apr 11, 2018
```
Fix finding wiki file when Gitaly is enabled

Closes gitaly#1126

See merge request gitlab-org/gitlab-ce!18317
```
  6e5d1595
- Merge branch 'ide-markdown-temp-file-fix' into 'master' · 0fd4bd35
  Tim Zallmann authored Apr 11, 2018
```
Fixed markdown preview in IDE not working for new files

See merge request gitlab-org/gitlab-ce!18287
```
  0fd4bd35
- Merge remote-tracking branch 'origin/10-7-stable' into 10-7-stable-prepare-rc5 · 0015fc7d
  James Lopez authored Apr 12, 2018
  
  0015fc7d
11 Apr, 2018 13 commits
- Update VERSION to 10.7.0-rc4 · c393a44f
  James Lopez authored Apr 11, 2018
  
  c393a44f
- Merge branch 'revert-e9e800f5' into 'master' · 6df03ea9
  Marin Jankovski authored Apr 10, 2018
```
Revert "Merge branch 'improve-jobs-queuing-time-metric' into 'master'"

See merge request gitlab-org/gitlab-ce!18276
```
  6df03ea9
- Merge branch 'fix/gb/fix-variables-collection-item-file' into 'master' · 7029aa1a
  Kamil Trzciński authored Apr 11, 2018
```
Fix file-specific variables collection item option

Closes gitlab-ee#5444

See merge request gitlab-org/gitlab-ce!18307
```
  7029aa1a
- Merge branch '10-7-stable' into 10-7-stable-prepare-rc4 · 24a654db
  Robert Speicher authored Apr 10, 2018
  
  24a654db
- Merge branch 'gitaly-0.95.0' into 'master' · e289f071
  Sean McGivern authored Apr 10, 2018
```
Use Gitaly 0.95.0

See merge request gitlab-org/gitlab-ce!18256
```
  e289f071
- Merge branch 'update_vendored_gitlab_ci_yml_for_auto_devops' into 'master' · 46dbd965
  Robert Speicher authored Apr 10, 2018
```
Update vendored .gitlab-ci.yml for Auto-Devops

See merge request gitlab-org/gitlab-ce!18289
```
  46dbd965
- Merge branch 'ab-37125-assigned-issues-query' into 'master' · f0ee75f1
  Yorick Peterse authored Apr 10, 2018
```
Reduce complexity of issuable finder query.

Closes #37125

See merge request gitlab-org/gitlab-ce!18219
```
  f0ee75f1
- Merge branch 'revert-e9e800f5' into 'master' · fd35eb84
  Marin Jankovski authored Apr 10, 2018
```
Revert "Merge branch 'improve-jobs-queuing-time-metric' into 'master'"

See merge request gitlab-org/gitlab-ce!18276
```
  fd35eb84
- Merge branch 'fix-n-plus-one-when-getting-notification-settings-for-recipients' into 'master' · 84200564
  Yorick Peterse authored Apr 09, 2018
```
Use Goldiloader for handling N+1 queries

See merge request gitlab-org/gitlab-ce!18217
```
  84200564
- Merge branch 'deploy-tokens-container-registry-specs' into 'master' · 44b89668
  Kamil Trzciński authored Apr 10, 2018
```
Verify that deploy token has valid access when pulling container registry image

Closes #45148

See merge request gitlab-org/gitlab-ce!18260
```
  44b89668
- Merge branch 'gitlab-shell-7.1.2' into 'master' · bff933f0
  Douwe Maan authored Apr 09, 2018
```
Use gitlab-shell 7.1.2

See merge request gitlab-org/gitlab-ce!18258
```
  bff933f0
- Merge branch 'sh-fix-issue-45152' into 'master' · deafb72e
  Grzegorz Bizon authored Apr 09, 2018
```
Fix undefined method `one?` when pushing to an existing merge request

Closes #45152

See merge request gitlab-org/gitlab-ce!18243
```
  deafb72e
- Merge branch 'sh-handle-legacy-archive-requests' into 'master' · 9719d276
  Douwe Maan authored Apr 09, 2018
```
Handle legacy repository archive requests with no ref given

Closes #45154

See merge request gitlab-org/gitlab-ce!18246
```
  9719d276