Commits · e856300921865b20d34929d9e4ff79b7fbebb888 · nexedi / gitlab-ce

06 Jul, 2018 38 commits
- [QA] Add a new scenario to test GitHub import · e8563009
  Rémy Coutable authored Jun 18, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  e8563009
- [QA] Add a new Page::Issuable::Show page · 1809e079
  Rémy Coutable authored Jun 20, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  1809e079
- Merge branch 'ce-to-ee-2018-07-06' into 'master' · 2bfdc414
  Alessio Caiazza authored Jul 06, 2018
```
CE upstream - 2018-07-06 09:21 UTC

See merge request gitlab-org/gitlab-ee!6403
```
  2bfdc414
- Merge branch '5605-epic-autocomplete' into 'master' · 2362e500
  Sean McGivern authored Jul 06, 2018
```
Add support for autocompleting Epics and Labels within Epics

Closes #5604 and #5605

See merge request gitlab-org/gitlab-ee!6195
```
  2362e500
- Merge branch 'bvl-wrap-cross-project-group-permissions-ee' into 'master' · 94d5adec
  Douwe Maan authored Jul 06, 2018
```
[EE-Port] Create cross project group features

Closes #4829

See merge request gitlab-org/gitlab-ee!6363
```
  94d5adec
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-06 · 09477da9
  GitLab Bot authored Jul 06, 2018
  
  09477da9
- Merge branch 'ce-to-ee-2018-07-06' into 'master' · 62772e4d
  Grzegorz Bizon authored Jul 06, 2018
```
CE upstream - 2018-07-06 00:21 UTC

Closes gitaly#1254, #6753, and #6561

See merge request gitlab-org/gitlab-ee!6401
```
  62772e4d
- Remove unnecessary checks; Refactor · 8f14f931
  Mark Chao authored Jul 06, 2018
  
  8f14f931
- Merge branch 'fix-trace-archive-cron-worker-race-condition' into 'master' · 82f6b4b0
  Kamil Trzciński authored Jul 06, 2018
```
Check if the existences of archived traces before archive it

Closes #48705

See merge request gitlab-org/gitlab-ce!20297
```
  82f6b4b0
- Create cross project group features · e78dac0a
  Bob Van Landuyt authored Jul 03, 2018
```
This allows us to check specific abilities in views, while still
enabling/disabling them at once.
```
  e78dac0a
- Wrap contribution analytics and epics in ability · ad618c2a
  Bob Van Landuyt authored Jul 03, 2018
  
  ad618c2a
- Merge branch 'move-contributing-link-to-partial-for-ee-exclusion' into 'master' · a29124bf
  Phil Hughes authored Jul 06, 2018
```
CE for "Remove new contributing link from EE"

See merge request gitlab-org/gitlab-ce!20334
```
  a29124bf
- CE for "Remove new contributing link from EE" · d06b3664
  Luke Bennett authored Jul 06, 2018
  
  d06b3664
- Merge branch 'remove-new-contributing-link-from-ee' into 'master' · 9429048d
  Phil Hughes authored Jul 06, 2018
```
Remove new contributing link from EE

Closes gitlab-ce#47274

See merge request gitlab-org/gitlab-ee!6297
```
  9429048d
- Remove new contributing link from EE · 910da80d
  Luke Bennett authored Jul 06, 2018
  
  910da80d
- Merge branch 'fj-43565-wrong-role-displayed' into 'master' · 19e85cc8
  Douwe Maan authored Jul 06, 2018
```
Fix User role displayed on projects dashboard

Closes #43565

See merge request gitlab-org/gitlab-ce!20374
```
  19e85cc8
- Fix User role displayed on projects dashboard · 837c3b3d
  Francisco Javier López authored Jul 06, 2018
  
  837c3b3d
- Merge branch '31583-osw-gfm-complete-status-indication' into 'master' · 83f79ced
  Sean McGivern authored Jul 06, 2018
```
Resolve "GFM preview should have status indicator"

Closes #31583

See merge request gitlab-org/gitlab-ce!20418
```
  83f79ced
- Use AlreadyArchivedError if it's the case · 1667b65c
  Shinya Maeda authored Jul 06, 2018
  
  1667b65c
- Merge branch 'master' into fix-trace-archive-cron-worker-race-condition · 9c9bb49b
  Shinya Maeda authored Jul 06, 2018
  
  9c9bb49b
- Fix code style · f36a28e5
  Mark Chao authored Jul 06, 2018
  
  f36a28e5
- Fix coding style · 96b7ffa0
  Mark Chao authored Jul 06, 2018
  
  96b7ffa0
- Add spec to test CE autocomplete sources for project in EE helper · 99fdb7d9
  Mark Chao authored Jul 03, 2018
  
  99fdb7d9
- Refactor Projects::AutocompleteService · a05a447b
  Mark Chao authored Jul 03, 2018
  
  a05a447b
- Add changelog entry · ad438f02
  Kushal Pandya authored Jun 29, 2018
  
  ad438f02
- Add feature spec for labels · 54395a94
  Mark Chao authored Jun 29, 2018
  
  54395a94
- Only display current group's epics, because frontend does not yet · 7f5e6c88
  Mark Chao authored Jun 28, 2018
```
support otherwise.

Add spec
```
  7f5e6c88
- Refactor Groups::AutocompleteService#labels · 9727255a
  Mark Chao authored Jun 22, 2018
  
  9727255a
- Add `&` support for epics autocompletion · a3cfd4b4
  Kushal Pandya authored Jun 21, 2018
  
  a3cfd4b4
- Fix rubocop offence Layout/EmptyLinesAroundBlockBody · 499fb780
  Kushal Pandya authored Jun 21, 2018
  
  499fb780
- Add spec for labels auto complete · d7107d44
  Mark Chao authored Jun 21, 2018
  
  d7107d44
- Fix autoload constant lookup dependency issue · 9968c60f
  Mark Chao authored Jun 21, 2018
```
Also patch existing classes
```
  9968c60f
- Add label autocomplete for groups · 27c5f8bd
  Mark Chao authored Jun 20, 2018
  
  27c5f8bd
- Add autocomplete_sources/epics endpoint · 5e699c98
  Mark Chao authored Jun 20, 2018
```
Add epics path to autocomplete_data_sources
```
  5e699c98
- Add Group::AutocompleteService for epics · 05ad2887
  Mark Chao authored Jun 20, 2018
  
  05ad2887
- Present state indication on GFM preview · d038fac4
  Oswaldo Ferreira authored Jul 05, 2018
  
  d038fac4
- Update retry_build_service_spec.rb · db07a722
  Francisco Javier López authored Jul 06, 2018
  
  db07a722
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-06 · 2b6dd165
  GitLab Bot authored Jul 06, 2018
```
# Conflicts:
#	spec/services/ci/retry_build_service_spec.rb

[ci skip]
```
  2b6dd165
05 Jul, 2018 2 commits
- Merge branch '48803-mrs-are-showing-some-discussions-as-unresolved' into 'master' · 969b7c56
  Fatih Acet authored Jul 05, 2018
```
Resolve "MRs are showing some discussions as unresolved"

Closes #48803

See merge request gitlab-org/gitlab-ce!20351
```
  969b7c56
- Resolve "MRs are showing some discussions as unresolved" · 9dc6b039
  Simon Knox authored Jul 05, 2018
  
  9dc6b039