Commits · 1b0156204dd624f3645100d77f0eeed7e8b8e626 · nexedi / gitlab-ce

18 Apr, 2018 28 commits
- Recover from errors when a parent is not preloaded · 1b015620
  Bob Van Landuyt authored Apr 13, 2018
  
  1b015620
- Merge branch 'rfc-3676-mailsig' into 'master' · d8dd75ca
  Sean McGivern authored Apr 18, 2018
```
set proper signature marker in mails

Closes #43617

See merge request gitlab-org/gitlab-ce!17979
```
  d8dd75ca
- Merge branch 'improve-cleanup-steps-for-background-migrations' into 'master' · 08b1bff7
  Sean McGivern authored Apr 18, 2018
```
Add more detail to cleanup steps for background migrations

See merge request gitlab-org/gitlab-ce!18448
```
  08b1bff7
- Merge branch '45446-new-sha-widget-breaks-on-new-merge-request' into 'master' · 9c2f6e04
  Filipa Lacerda authored Apr 18, 2018
```
Fix regression around new SHA widget in "New Merge Request" Screen

Closes #45446

See merge request gitlab-org/gitlab-ce!18422
```
  9c2f6e04
- Merge branch 'ide-commit-box-highlight' into 'master' · d411fb82
  Filipa Lacerda authored Apr 18, 2018
```
Improve web IDE commit input

Closes #44832

See merge request gitlab-org/gitlab-ce!18389
```
  d411fb82
- Merge branch 'bw-commonmark-cached-markdown-version' into 'master' · 019c0d57
  Sean McGivern authored Apr 18, 2018
```
Ensure that cached_markdown_version is handled correctly for CommonMark

See merge request gitlab-org/gitlab-ce!18431
```
  019c0d57
- Merge branch 'blackst0ne-rails5-add-safe-params-helper' into 'master' · 320ae8ff
  Sean McGivern authored Apr 18, 2018
```
[Rails5] Add `safe_params` helper

See merge request gitlab-org/gitlab-ce!18241
```
  320ae8ff
- Add more detail to cleanup steps for background migrations · 37723104
  Sean McGivern authored Apr 18, 2018
```
1. We can't just steal from the queue, in case there was a problem with Sidekiq.
2. We need to consider import / export.
```
  37723104
- changelog: added entry · f46fba2b
  Enrico Scholz authored Apr 18, 2018
```
Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
```
  f46fba2b
- set proper signature marker in mails · 931f6e6d
  Enrico Scholz authored Mar 10, 2018
```
use rfc 3676 mail signature delimiters ("-- ") instead of the previous
"---" one.

closes #43617
Signed-off-by: Enrico Scholz <enrico.scholz@ensc.de>
```
  931f6e6d
- Revert "Merge branch 'fix-size-and-position-for-fork-icon' into 'master'" · f150f262
  Douwe Maan authored Apr 18, 2018
```
This reverts merge request !18399
```
  f150f262
- Merge branch 'fix/security-docs-link' into 'master' · 923f5af2
  Marin Jankovski authored Apr 18, 2018
```
Fix link in Security Developer Workflow.md

See merge request gitlab-org/gitlab-ce!18445
```
  923f5af2
- Fix link in Security Developer Workflow.md · 769ab42d
  James Lopez authored Apr 18, 2018
  
  769ab42d
- Merge branch 'stuartnelson3/gitlab-ce-stn/issue-due-email' into 'master' · 84eeb946
  Douwe Maan authored Apr 18, 2018
```
Email notification on issue due date

Closes #27500

See merge request gitlab-org/gitlab-ce!17985
```
  84eeb946
- Merge branch '42889-avoid-return-inside-block' into 'master' · 40653b65
  Rémy Coutable authored Apr 18, 2018
```
Resolve "Make a Rubocop that forbids returning from a block"

Closes #42889

See merge request gitlab-org/gitlab-ce!18000
```
  40653b65
- Resolve "Make a Rubocop that forbids returning from a block" · c6b1043e
  🙈 jacopo beschi 🙉 authored Apr 18, 2018
  
  c6b1043e
- Merge branch '45456-improve-performance-of-cicd-jobs-request' into 'master' · 3529ccae
  Kamil Trzciński (OoO till 16th of April) authored Apr 18, 2018
```
Resolve "Concurrent requests to api/v4/jobs/request cause DB locks on ci_builds_metadata table"

Closes #45456

See merge request gitlab-org/gitlab-ce!18428
```
  3529ccae
- Merge branch '45473-temporary-fix-for-ci-register-jobs-service' into 'master' · 4e64c9f4
  Kamil Trzciński (OoO till 16th of April) authored Apr 18, 2018
```
Resolve "Using goldiloader results in Ci::RegisterJobService#execute spending a lot of time eager loading a lot of associations"

See merge request gitlab-org/gitlab-ce!18439
```
  4e64c9f4
- Merge branch '40402-time-estimate-system-notes-can-be-confusing' into 'master' · 5db76a3b
  Sean McGivern authored Apr 18, 2018
```
Resolve "Time estimate system notes can be confusing"

Closes #40402

See merge request gitlab-org/gitlab-ce!18326
```
  5db76a3b
- Merge branch 'docs-update-assign-labels-to-subgroups' into 'master' · 77d08731
  Sean McGivern authored Apr 18, 2018
```
Docs assign labels to subgroups

See merge request gitlab-org/gitlab-ce!18438
```
  77d08731
- Merge branch 'sh-fix-web-ide-typo-docs' into 'master' · 3325e748
  Rémy Coutable authored Apr 18, 2018
```
Fix Markdown typo in Web IDE docs

See merge request gitlab-org/gitlab-ce!18443
```
  3325e748
- Merge branch '44981-http-io-trace-with-multi-byte-char' into 'master' · df0a457d
  Kamil Trzciński (OoO till 16th of April) authored Apr 18, 2018
```
Fix `Trace::HttpIO` can not render multi-byte chars

Closes #44981

See merge request gitlab-org/gitlab-ce!18417
```
  df0a457d
- Merge branch 'improve-jobs-queuing-time-metric' into 'master' · 55ce9d24
  Kamil Trzciński (OoO till 16th of April) authored Apr 18, 2018
```
Improve jobs queuing time metric (fixed version)

Closes #45205

See merge request gitlab-org/gitlab-ce!18283
```
  55ce9d24
- Merge branch 'zj-uri-type-empty' into 'master' · 019e881d
  Douwe Maan authored Apr 18, 2018
```
Return nil on empty path

Closes gitaly#1115

See merge request gitlab-org/gitlab-ce!18430
```
  019e881d
- Merge branch 'blackst0ne-rails5-fix-gitlab-ci-trace-stream-delegate-valid' into 'master' · e27aa43d
  Rémy Coutable authored Apr 18, 2018
```
[Rails5] Remove `as` keyword from `Gitlab:Ci:Trace:Stream.delegate :valid?`

See merge request gitlab-org/gitlab-ce!18270
```
  e27aa43d
- [Rails5] Remove `as` keyword from `Gitlab:Ci:Trace:Stream.delegate :valid?` · 18c2b062
  blackst0ne authored Apr 18, 2018
  
  18c2b062
- Merge branch 'fix-size-and-position-for-fork-icon' into 'master' · 9a5765bf
  Tim Zallmann authored Apr 18, 2018
```
Fix size and position for fork icon

Closes #42582

See merge request gitlab-org/gitlab-ce!18399
```
  9a5765bf
- Fix Markdown typo in Web IDE docs · 4310b0cd
  Stan Hu authored Apr 17, 2018
```
As seen in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5399
```
  4310b0cd
17 Apr, 2018 12 commits
- Merge branch '42543-hide-divergence-graph-on-branches-for-mobile' into 'master' · adcdb25b
  Clement Ho authored Apr 17, 2018
```
Remove ahead/behind graphs on project branches on mobile

Closes #42543

See merge request gitlab-org/gitlab-ce!18415
```
  adcdb25b
- Temporary fix for eager loading issue in Ci::RegisterJobService · cca5797f
  Tomasz Maczukin authored Apr 17, 2018
  
  cca5797f
- Fix size and position for fork icon · 5a34d3bd
  George Tsiolis authored Apr 16, 2018
  
  5a34d3bd
- Docs assign labels to subgroups · 5a5d2092
  Victor Wu authored Apr 17, 2018
  
  5a5d2092
- Merge branch 'docs-web-ide-ce-fix' into 'master' · 2cc78c0b
  Marcia Ramos authored Apr 17, 2018
```
Docs: update Web IDE > CE (10.7)

See merge request gitlab-org/gitlab-ce!18433
```
  2cc78c0b
- Merge branch 'docs-add-badges' into 'master' · 25eb9430
  Gabriel Mazetto authored Apr 17, 2018
```
Docs: add product badges to docs

Closes #42631

See merge request gitlab-org/gitlab-ce!18408
```
  25eb9430
- Merge branch 'zj-ref-exists-opt-out' into 'master' · b3ed751c
  Nick Thomas authored Apr 17, 2018
```
Move Gitaly RefExists check to OPT_OUT

Closes gitaly#401

See merge request gitlab-org/gitlab-ce!18333
```
  b3ed751c
- fixes ambiguity · c30211b3
  Marcia Ramos authored Apr 17, 2018
  
  c30211b3
- Merge branch 'security-dev-docs' into 'master' · 8feab949
  Marin Jankovski authored Apr 17, 2018
```
add initial dev task template for working on a security issue

Closes gitlab-org/release/docs#9

See merge request gitlab-org/gitlab-ce!18133
```
  8feab949
- add initial dev task template for working on a security issue · 22e198da
  James Lopez authored Apr 17, 2018
  
  22e198da
- update badges guidelines · d8cd3f4b
  Marcia Ramos authored Apr 17, 2018
  
  d8cd3f4b
- Merge branch 'update-git-to-2-16-3-in-installation-docs' into 'master' · a6486f76
  Stan Hu authored Apr 17, 2018
```
Update to Git 2.16.3 in doc/install/installation.md

See merge request gitlab-org/gitlab-ce!18434
```
  a6486f76