Commits · 19a1584d40ca44a9a35321ab0163252e1d6a124c · nexedi / gitlab-ce

05 Jul, 2018 27 commits
- 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
- 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
- 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
- Merge branch 'ce-to-ee-2018-07-04' into 'master' · 05542079
  Rémy Coutable authored Jul 05, 2018
```
CE upstream - 2018-07-04 12:21 UTC

Closes gitaly#329, gitaly#320, gitaly#323 et gitaly#328

See merge request gitlab-org/gitlab-ee!6381
```
  05542079
- Changed terminal page title · f15f523d
  Francisco Javier López authored Jul 05, 2018
  
  f15f523d
- Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'master'" · be46592e
  Jacob Vosmaer (GitLab) authored Jul 05, 2018
```
This reverts merge request !20339
```
  be46592e
- Allow 2 more queries in spec/controllers/projects/pipelines_controller_spec.rb · c32af9da
  Rémy Coutable authored Jul 05, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  c32af9da
- Update CHANGELOG.md for 11.0.3 · 8078f779
  GitLab Release Tools Bot authored Jul 05, 2018
```
[ci skip]
```
  8078f779
- Update CHANGELOG-EE.md for 11.0.3-ee · 3ad14d4e
  GitLab Release Tools Bot authored Jul 05, 2018
```
[ci skip]
```
  3ad14d4e
- Merge branch '5787-extract-ee-boards' into 'master' · 4cabcba5
  Phil Hughes authored Jul 05, 2018
```
Extract EE specific files/lines for app/assets/javascripts/boards

See merge request gitlab-org/gitlab-ee!6006
```
  4cabcba5
- Extract EE specific files/lines for app/assets/javascripts/boards · 92f8df4a
  Paul Slaughter authored Jul 05, 2018
  
  92f8df4a
- Merge branch 'minor-profile-pref-update-doc' into 'master' · de46bf61
  Achilleas Pipinellis authored Jul 05, 2018
```
Minor layout width update in profile preferences docs

See merge request gitlab-org/gitlab-ee!6380
```
  de46bf61
- Replace .shared? with .instance_type? in ee/app/models/ee/ci/build.rb · 8d5382e8
  Rémy Coutable authored Jul 05, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  8d5382e8
- Merge branch 'winh-rubocop-capybara-featuremethods-ee' into 'master' · e21f486a
  Rémy Coutable authored Jul 05, 2018
```
Enable Capybara/FeatureMethods cop (EE-port)

See merge request gitlab-org/gitlab-ee!6385
```
  e21f486a
- Enable Capybara/FeatureMethods cop (EE-port) · 57900720
  Winnie Hellmann authored Jul 05, 2018
  
  57900720
04 Jul, 2018 13 commits
- Added subject scope to build policy · 999b6f4d
  Francisco Javier López authored Jul 04, 2018
  
  999b6f4d
- Add filters to Advanced Syntax Search docs · dd26a5cf
  Mario de la Ossa authored Jun 20, 2018
  
  dd26a5cf
- Code review comments applied · 27e788a2
  Francisco Javier López authored Jul 04, 2018
  
  27e788a2
- Merge branch '4266-board-with-config-api' into 'master' · 0cc2caaf
  Douwe Maan authored Jul 04, 2018
```
Resolve "Board with config API"

Closes #4266

See merge request gitlab-org/gitlab-ee!5954
```
  0cc2caaf
- Add Web Terminal for CI builds · 32a76a68
  Francisco Javier López authored Jun 13, 2018
  
  32a76a68
- Fixed ee spec · 8a63ad11
  Francisco Javier López authored Jun 21, 2018
  
  8a63ad11
- Small changes · 73d7b213
  Francisco Javier López authored Jun 20, 2018
  
  73d7b213
- Add Web Terminal for CI builds · d3974f1e
  Francisco Javier López authored Jun 13, 2018
  
  d3974f1e
- Merge branch 'ee-43446-new-cluster-page-tabs' into 'master' · 873de89b
  Kamil Trzciński (OoO till 3th) authored Jul 04, 2018
```
port 43446-new-cluster-page-tabs to EE

See merge request gitlab-org/gitlab-ee!5944
```
  873de89b
- Merge branch 'revert-b5c890cc' into 'master' · 514b7c10
  Sean McGivern authored Jul 04, 2018
```
Revert "Merge branch 'ee-44726-cancel_lease_upon_completion_in_project_cache_worker' into 'master'"

See merge request gitlab-org/gitlab-ee!6378
```
  514b7c10
- fix failing CI jobs · ea79aab7
  Dennis Tang authored Jul 04, 2018
  
  ea79aab7
- Add API endpoint for viewing and editing board config · a5521d78
  Mark Chao authored Jun 04, 2018
```
Allow Labels::FindOrCreateService to find ancestor group labels
```
  a5521d78
- Remove duplicated api endpoint already existed in CE · c4bbfe3e
  Mark Chao authored Jun 07, 2018
  
  c4bbfe3e