Commits · 057b4ce9bc41eddf0cb7fbd5aeb42e9d4c123cd6 · nexedi / gitlab-ce

26 Oct, 2018 40 commits
- Merge branch 'ee-42790-improve-feedback-for-internal-git-access-checks-timeouts' into 'master' · 057b4ce9
  Douwe Maan authored Oct 26, 2018
```
Adds tracing messages for slow git pushes

See merge request gitlab-org/gitlab-ee!8041
```
  057b4ce9
- Merge branch '7872-license-management-dropdowns-are-broken-in-firefox' into 'master' · 05960e43
  Clement Ho authored Oct 26, 2018
```
Fix button rendering in license management in FF

Closes #7872

See merge request gitlab-org/gitlab-ee!8046
```
  05960e43
- Merge branch 'docs-add-runbooks-ee' into 'master' · 90775302
  Mike Lewis authored Oct 26, 2018
```
docs add runbooks topic ee

See merge request gitlab-org/gitlab-ee!8075
```
  90775302
- relocate runbooks under clusters folder · 83ff9b4a
  danielgruesso authored Oct 26, 2018
  
  83ff9b4a
- Merge branch 'ce-to-ee-2018-10-26' into 'master' · 2a55f04b
  🤖 GitLab Bot 🤖 authored Oct 26, 2018
```
CE upstream - 2018-10-26 15:21 UTC

See merge request gitlab-org/gitlab-ee!8110
```
  2a55f04b
- Merge branch 'winh-split-merge-request-widget-dependencies-ee' into 'master' · 47888695
  Mike Greiling authored Oct 26, 2018
```
Resolve circular dependencies in merge request widget (EE-port)

See merge request gitlab-org/gitlab-ee!8085
```
  47888695
- Merge branch 'ee-45068-no-longer-require-a-deploy-to-start-prometheus-monitoring' into 'master' · 1d55e38b
  Mike Greiling authored Oct 26, 2018
```
Resolve "No longer require a deploy to start Prometheus monitoring" - EE

See merge request gitlab-org/gitlab-ee!7976
```
  1d55e38b
- Resolve "No longer require a deploy to start Prometheus monitoring" - EE · 3fad597e
  Jose Ivan Vargas authored Oct 26, 2018
  
  3fad597e
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-26 · 7d17f9dc
  GitLab Bot authored Oct 26, 2018
  
  7d17f9dc
- Merge branch 'feature/add_license_to_project_api' into 'master' · 91765b80
  Nick Thomas authored Oct 26, 2018
```
Feature/add license to project API

See merge request gitlab-org/gitlab-ce!21606
```
  91765b80
- Feature/add license to project API · ff896803
  J.D. Bean authored Oct 26, 2018
  
  ff896803
- Merge branch 'winh-dynamic-tooltips' into 'master' · 83e898a5
  Clement Ho authored Oct 26, 2018
```
Update content of visible tooltips

See merge request gitlab-org/gitlab-ce!22504
```
  83e898a5
- Update content of visible tooltips · 79ec24da
  Winnie Hellmann authored Oct 26, 2018
  
  79ec24da
- Merge branch 'ce-to-ee-2018-10-26' into 'master' · edd6fc97
  Lin Jen-Shin authored Oct 26, 2018
```
CE upstream - 2018-10-26 13:21 UTC

See merge request gitlab-org/gitlab-ee!8106
```
  edd6fc97
- Merge remote-tracking branch 'ee/master' into ce-to-ee-2018-10-26 · 35a69135
  Lin Jen-Shin authored Oct 26, 2018
```
* ee/master:
  CE Merge conflicts for "Automatically navigate to last board visited"
```
  35a69135
- Resolve conflict db/schema.rb · 13425761
  Lin Jen-Shin authored Oct 26, 2018
  
  13425761
- Resolve conflict lib/gitlab/patch/draw_route.rb · 64153551
  Lin Jen-Shin authored Oct 26, 2018
  
  64153551
- Merge branch 'bw-automatically-navigate-to-last-board-visited-ee' into 'master' · edf6eeb3
  Nick Thomas authored Oct 26, 2018
```
CE Merge conflicts for "Automatically navigate to last board visited"

See merge request gitlab-org/gitlab-ee!8000
```
  edf6eeb3
- CE Merge conflicts for "Automatically navigate to last board visited" · 4adba5da
  Brett Walker authored Oct 26, 2018
  
  4adba5da
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-26 · 9f81c7e0
  GitLab Bot authored Oct 26, 2018
```
# Conflicts:
#	db/schema.rb
#	lib/gitlab/patch/draw_route.rb

[ci skip]
```
  9f81c7e0
- Merge branch '7864-ee-routes' into 'master' · 359474a2
  Sean McGivern authored Oct 26, 2018
```
CE: Put EE routes in EE files under EE directories

See merge request gitlab-org/gitlab-ce!22376
```
  359474a2
- Merge branch '7864-ee-routes-ee' into 'master' · e53d4238
  Sean McGivern authored Oct 26, 2018
```
Put EE routes in EE files under EE directories

Closes #7864

See merge request gitlab-org/gitlab-ee!7935
```
  e53d4238
- Merge branch 'bw-automatically-navigate-to-last-board-visited' into 'master' · dbe15b4a
  Nick Thomas authored Oct 26, 2018
```
Automatically navigate to last board visited

See merge request gitlab-org/gitlab-ce!22430
```
  dbe15b4a
- Automatically navigate to last board visited · 7aeab58f
  Brett Walker authored Oct 26, 2018
  
  7aeab58f
- Merge branch 'ce-to-ee-2018-10-26' into 'master' · a870b29c
  Marin Jankovski authored Oct 26, 2018
```
CE upstream - 2018-10-26 11:21 UTC

See merge request gitlab-org/gitlab-ee!8103
```
  a870b29c
- Merge branch 'docs/onlychanges' into 'master' · 9791f82b
  Grzegorz Bizon authored Oct 26, 2018
```
Improvement to ci/yaml documentation

See merge request gitlab-org/gitlab-ce!22613
```
  9791f82b
- Resolve conflict in `app/views/shared/boards/components/_board.html.haml` · d91ec892
  Lukas Eipert authored Oct 26, 2018
  
  d91ec892
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-26 · 9be00027
  GitLab Bot authored Oct 26, 2018
```
# Conflicts:
#	app/views/shared/boards/components/_board.html.haml

[ci skip]
```
  9be00027
- Merge branch 'ee-52545-guest-create-issue-in-group-board' into 'master' · 1b7d4f1d
  Sean McGivern authored Oct 26, 2018
```
Port of 52545-guest-create-issue-in-group-board to EE

See merge request gitlab-org/gitlab-ee!8099
```
  1b7d4f1d
- Merge branch '52545-guest-create-issue-in-group-board' into 'master' · ad8a859b
  Sean McGivern authored Oct 26, 2018
```
Resolve "Adding issues from group/project board is not allowed for project-level users"

See merge request gitlab-org/gitlab-ce!22557
```
  ad8a859b
- Merge branch 'ce-to-ee-2018-10-26' into 'master' · dbe98672
  🤖 GitLab Bot 🤖 authored Oct 26, 2018
```
CE upstream - 2018-10-26 10:21 UTC

See merge request gitlab-org/gitlab-ee!8101
```
  dbe98672
- Make it clear that we intent to use | over || · 84e441d8
  Lin Jen-Shin authored Oct 26, 2018
  
  84e441d8
- Make it clear that we intent to use | over || · ffda77fc
  Lin Jen-Shin authored Oct 26, 2018
  
  ffda77fc
- Merge branch '52384-api-filter-assignee-none-any' into 'master' · 8325a1fc
  Sean McGivern authored Oct 26, 2018
```
Resolve "Filter by `None`/`Any` for assignee_id in issues/mrs API"

Closes #52384

See merge request gitlab-org/gitlab-ce!22598
```
  8325a1fc
- Allow CE do nothing if route doesn't exist · 50976c6f
  Lin Jen-Shin authored Oct 23, 2018
  
  50976c6f
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-26 · 222c70d5
  GitLab Bot authored Oct 26, 2018
  
  222c70d5
- Port of 52545-guest-create-issue-in-group-board to EE · 0dcff519
  Heinrich Lee Yu authored Oct 26, 2018
  
  0dcff519
- Merge branch 'rpereira2-7828_add-alerts-count1' into 'master' · c9ce4db3
  Sean McGivern authored Oct 26, 2018
```
Add metric to track projects with atleast 1 alert to usage ping data

See merge request gitlab-org/gitlab-ee!8058
```
  c9ce4db3
- Add metric to track projects with atleast 1 alert to usage ping data · 7c19a242
  Reuben Pereira authored Oct 26, 2018
  
  7c19a242
- Merge branch 'ce-to-ee-2018-10-26' into 'master' · a62e2103
  🤖 GitLab Bot 🤖 authored Oct 26, 2018
```
CE upstream - 2018-10-26 08:21 UTC

See merge request gitlab-org/gitlab-ee!8096
```
  a62e2103