Commits · 7c4a0452cff67569f486aeb341959a7255785808 · nexedi / gitlab-ce

13 Nov, 2018 12 commits
- Merge branch 'gt-change-issue-analytics-breadcrumb' into 'master' · 7c4a0452
  Sean McGivern authored Nov 13, 2018
```
Change issues analytics breadcrumb

Closes #8402

See merge request gitlab-org/gitlab-ee!8414
```
  7c4a0452
- Merge branch '8255-transient-failure-of-dashboard_spec-js' into 'master' · 07ab8b33
  Phil Hughes authored Nov 13, 2018
```
Resolve "Transient failure of dashboard_spec.js"

Closes #8255

See merge request gitlab-org/gitlab-ee!8369
```
  07ab8b33
- Merge branch 'ce-to-ee-2018-11-13' into 'master' · 08e5896e
  🤖 GitLab Bot 🤖 authored Nov 13, 2018
```
CE upstream - 2018-11-13 04:22 UTC

See merge request gitlab-org/gitlab-ee!8417
```
  08e5896e
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-13 · e39fa43b
  GitLab Bot authored Nov 13, 2018
  
  e39fa43b
- Merge branch '53894-docs-update-adding-project-txt-to-match-up-with-image' into 'master' · 5fd652de
  Evan Read authored Nov 13, 2018
```
Resolve "Docs update - adding project txt to match up with image"

Closes #53894

See merge request gitlab-org/gitlab-ce!23008
```
  5fd652de
- Merge branch 'ce-to-ee-2018-11-13' into 'master' · 5d3eace2
  🤖 GitLab Bot 🤖 authored Nov 13, 2018
```
CE upstream - 2018-11-13 01:21 UTC

Closes gitlab-org/quality/team-tasks#24

See merge request gitlab-org/gitlab-ee!8416
```
  5d3eace2
- Adding what Projects permission is needed as text to match up with the image. · 0b639cb8
  astrachan authored Nov 13, 2018
  
  0b639cb8
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-13 · e291e14a
  GitLab Bot authored Nov 13, 2018
  
  e291e14a
- Merge branch 'ce-to-ee-2018-11-13' into 'master' · c406372a
  🤖 GitLab Bot 🤖 authored Nov 13, 2018
```
CE upstream - 2018-11-13 00:21 UTC

See merge request gitlab-org/gitlab-ee!8415
```
  c406372a
- Merge branch 'docs-quality/team-tasks-24' into 'master' · 03e46cf7
  Mek Stittri authored Nov 13, 2018
```
Improve the 'Testing levels' documentation

Closes gitlab-org/quality/team-tasks#24

See merge request gitlab-org/gitlab-ce!21505
```
  03e46cf7
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-13 · 8b93ae82
  GitLab Bot authored Nov 13, 2018
  
  8b93ae82
- Merge branch 'ce-to-ee-2018-11-12' into 'master' · db28195b
  Stan Hu authored Nov 13, 2018
```
CE upstream - 2018-11-12 21:21 UTC

See merge request gitlab-org/gitlab-ee!8413
```
  db28195b
12 Nov, 2018 28 commits
- Resolve conflicts in app/services/issues/move_service.rb · 1040d3a4
  Stan Hu authored Nov 12, 2018
  
  1040d3a4
- Merge branch 'align-vertical-discussion-line' into 'master' · dbb342d4
  Fatih Acet authored Nov 12, 2018
```
Align all avatars and system notes in discussion

See merge request gitlab-org/gitlab-ce!22994
```
  dbb342d4
- Add externalized string for issues analytics breadcrumb · a9a839b7
  George Tsiolis authored Nov 13, 2018
  
  a9a839b7
- Change issues analytics breadcrumb · b4c9e293
  George Tsiolis authored Nov 13, 2018
  
  b4c9e293
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-12 · 3616bc1a
  GitLab Bot authored Nov 12, 2018
```
# Conflicts:
#	app/services/issues/move_service.rb

[ci skip]
```
  3616bc1a
- Merge branch 'ce-to-ee-2018-11-12' into 'master' · a579b8af
  🤖 GitLab Bot 🤖 authored Nov 12, 2018
```
CE upstream - 2018-11-12 20:21 UTC

Closes gitlab-ce#53180 and #8397

See merge request gitlab-org/gitlab-ee!8411
```
  a579b8af
- Fix transient dashboard spec failure · f4d58dcc
  Adriel Santiago authored Nov 08, 2018
  
  f4d58dcc
- Merge branch 'ce-3777-promote-to-epic' into 'master' · ec3712c2
  Rémy Coutable authored Nov 12, 2018
```
Refactoring Issues::MoveService (port of promote epics)

See merge request gitlab-org/gitlab-ce!22766
```
  ec3712c2
- Merge branch 'ce-3777-promote-to-epic-preparation' into 'master' · d1dff7de
  Rémy Coutable authored Nov 12, 2018
```
Extract code from Issues::MoveService

See merge request gitlab-org/gitlab-ee!8402
```
  d1dff7de
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-12 · 6f80a80b
  GitLab Bot authored Nov 12, 2018
  
  6f80a80b
- Merge branch 'fix-tags-for-envs' into 'master' · 8f60a8ba
  Stan Hu authored Nov 12, 2018
```
Fix tags for environments

Closes gitlab-ee#8397

See merge request gitlab-org/gitlab-ce!22993
```
  8f60a8ba
- Merge branch 'sh-53180-append-path' into 'master' · 33cd8efb
  Rémy Coutable authored Nov 12, 2018
```
Make sure there's only one slash as path separator

Closes #53180

See merge request gitlab-org/gitlab-ce!22954
```
  33cd8efb
- Merge branch 'ee-53180-append-path' into 'master' · 296db0e0
  Rémy Coutable authored Nov 12, 2018
```
Make sure there's only one slash as path separator

See merge request gitlab-org/gitlab-ee!8084
```
  296db0e0
- Make sure there's only one slash as path separator · a241e295
  Lin Jen-Shin authored Nov 12, 2018
  
  a241e295
- Fix non-hacking way · 08ef7b9f
  Kamil Trzciński authored Nov 12, 2018
  
  08ef7b9f
- Revert "Just fix (hack) specs" · 7a98f0bd
  Kamil Trzciński authored Nov 12, 2018
```
This reverts commit c739b8e0.
```
  7a98f0bd
- Just fix (hack) specs · c739b8e0
  Kamil Trzciński authored Nov 12, 2018
  
  c739b8e0
- Align all avatars and system notes in discussion · 4c7a326f
  Annabel Dunstone Gray authored Nov 12, 2018
  
  4c7a326f
- Merge branch 'ce-to-ee-2018-11-12' into 'master' · 35c2d695
  Rémy Coutable authored Nov 12, 2018
```
CE upstream - 2018-11-12 18:21 UTC

Closes gitlab-ce#53853

See merge request gitlab-org/gitlab-ee!8408
```
  35c2d695
- Simplify test · bb8d0e7c
  Kamil Trzciński authored Nov 12, 2018
  
  bb8d0e7c
- Do not reload self on hooks when creating deployment · db9ecc76
  Kamil Trzciński authored Nov 12, 2018
  
  db9ecc76
- tags test · b45a7cc0
  Kamil Trzciński authored Nov 12, 2018
  
  b45a7cc0
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-12 · 2107e6a7
  GitLab Bot authored Nov 12, 2018
  
  2107e6a7
- Merge branch 'sh-fix-refresh-service-deleted-branch' into 'master' · 21a3a3e1
  Douwe Maan authored Nov 12, 2018
```
Fix MergeRequestService erroring out on deleted branch

Closes #53853

See merge request gitlab-org/gitlab-ce!22989
```
  21a3a3e1
- Merge branch 'ce-to-ee-2018-11-12' into 'master' · 8809a09b
  Filipa Lacerda authored Nov 12, 2018
```
CE upstream - 2018-11-12 16:21 UTC

Closes gitlab-ce#53781

See merge request gitlab-org/gitlab-ee!8407
```
  8809a09b
- Merge branch 'dm-disable-codeowners' into 'master' · 0ff34e77
  Sean McGivern authored Nov 12, 2018
```
Disable CODEOWNERS for the time being

See merge request gitlab-org/gitlab-ce!22991
```
  0ff34e77
- Fix MergeRequestService erroring out on deleted branch · b0535009
  Stan Hu authored Nov 12, 2018
```
When a branch is deleted, the push commit IDs is an empty array.
The previous change would attempt to call `[].exists?`, which is
invalid. Fix this by returning `MergeRequestDiffCommit.none` instead.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53853
```
  b0535009
- Resolve conflicts in `.gitlab-ci.yml` · 29639431
  Lukas Eipert authored Nov 12, 2018
  
  29639431