Commits · f36a28e5dd51b04397fc5d261996adf6937b7257 · nexedi / gitlab-ce

06 Jul, 2018 15 commits
- 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
05 Jul, 2018 25 commits
- Merge branch 'ce-to-ee-2018-07-05' into 'master' · 3effb9ac
  Robert Speicher authored Jul 05, 2018
```
CE upstream - 2018-07-05 12:27 UTC

Closes charts/gitlab#565 and #4266

See merge request gitlab-org/gitlab-ee!6393
```
  3effb9ac
- Merge branch 'docs-dast-passive-scanning' into 'master' · fde933c2
  Philippe Lafoucrière authored Jul 05, 2018
```
Make clear that DAST is passive scanning only

See merge request gitlab-org/gitlab-ee!6348
```
  fde933c2
- Merge branch '6145-unify-issuable-search-bar-ee' into 'master' · 8fbb0907
  Robert Speicher authored Jul 05, 2018
```
Unify app/views/shared/issuable/_search_bar.html.haml

Closes #6145

See merge request gitlab-org/gitlab-ee!6327
```
  8fbb0907
- Merge branch 'docs/container-scanning-note-ee' into 'master' · 7f79eb86
  Achilleas Pipinellis authored Jul 05, 2018
```
Verify version on container scanning note

See merge request gitlab-org/gitlab-ee!6394
```
  7f79eb86
- Merge branch 'ee-revert-8678cf9b' into 'master' · 19a1584d
  Grzegorz Bizon authored Jul 05, 2018
```
Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'master'"

Closes gitlab-qa#287

See merge request gitlab-org/gitlab-ee!6389
```
  19a1584d
- Merge branch '5960-consider-EE-ahead-of-CE' into 'master' · 587231d2
  Rémy Coutable authored Jul 05, 2018
```
Update CE branch whenever EE is ahead of CE branch

Closes #5960

See merge request gitlab-org/gitlab-ee!5719
```
  587231d2
- Merge branch 'ee-gitaly-timeouts' into 'master' · f8eba60d
  Rémy Coutable authored Jul 05, 2018
```
Updated Gitaly timeout values

See merge request gitlab-org/gitlab-ee!6391
```
  f8eba60d
- Updated Gitaly timeout values · 435f40c8
  Andrew Newdigate authored Jul 05, 2018
  
  435f40c8
- Merge branch '6510-es-filter-docs' into 'master' · 0291bc06
  Marcia Ramos authored Jul 05, 2018
```
Add documentation for new search filtering functionality for ES

Closes #6510

See merge request gitlab-org/gitlab-ee!6210
```
  0291bc06
- Verify version on container scanning note · 3f0b1a66
  Cindy Pallares 🦉 authored Jul 05, 2018
  
  3f0b1a66
- Merge branch 'ee-fj-web-terminal-ci-build' into 'master' · 95c23424
  Douwe Maan authored Jul 05, 2018
```
[Port] Add Web Terminal for CI builds

See merge request gitlab-org/gitlab-ee!6208
```
  95c23424
- When no CE branch, find merge-base between CE and HEAD · 6953fb79
  Lin Jen-Shin authored Jul 05, 2018
  
  6953fb79
- Use current_head to avoid missing branch. · 007ac501
  Lin Jen-Shin authored Jul 04, 2018
```
See:
https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/79125195
```
  007ac501
- Make it more clear and put heavy condi in the last · 7dbdc0ab
  Lin Jen-Shin authored Jul 03, 2018
  
  7dbdc0ab
- Fetch deeper as we need · 842df676
  Lin Jen-Shin authored Jul 03, 2018
  
  842df676
- Merge with a message · 4c137ed3
  Lin Jen-Shin authored Jul 03, 2018
  
  4c137ed3
- We should just pass the merge-base after all · 44b91aca
  Lin Jen-Shin authored Jul 02, 2018
  
  44b91aca
- Make it more verbose and fix the case when · 6220bdbb
  Lin Jen-Shin authored Jul 02, 2018
```
CE branch is up-to-date.
```
  6220bdbb
- Resolve conflict in spec/features/protected_branches_spec.rb · c98a9fce
  Winnie Hellmann authored Jul 05, 2018
  
  c98a9fce
- Resolve conflicts in spec/features/projects/members/share_with_group_and_members_spec.rb · 753eea11
  Winnie Hellmann authored Jul 05, 2018
  
  753eea11
- Resolve conflict in spec/features/admin/admin_settings_spec.rb · 179b0d37
  Winnie Hellmann authored Jul 05, 2018
  
  179b0d37
- Fixed conflict in group model · b0bef50c
  Jan Provaznik authored Jul 05, 2018
  
  b0bef50c
- Resolve conflict in app/assets/stylesheets/pages/settings.scss · f8126dee
  Imre Farkas authored Jul 05, 2018
  
  f8126dee
- Merge branch '3561-support-jira-sub-group' into 'master' · 8eaf40a2
  Sean McGivern authored Jul 05, 2018
```
Resolve "Support GitLab subgroups in Jira development panel"

Closes #3561

See merge request gitlab-org/gitlab-ee!6290
```
  8eaf40a2
- Resolve "Support GitLab subgroups in Jira development panel" · e950acfb
  Mark Chao authored Jul 05, 2018
  
  e950acfb