Commits · aa4cc48c9d011639e8ec91e2e2e38e1dcde116cf · nexedi / gitlab-ce

23 Jun, 2018 2 commits
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-23 · aa4cc48c
  GitLab Bot authored Jun 23, 2018
  
  aa4cc48c
- Merge branch 'ce-to-ee-2018-06-22' into 'master' · 2d9d806d
  Stan Hu authored Jun 23, 2018
```
CE upstream - 2018-06-22 18:21 UTC

Closes gitaly#222

See merge request gitlab-org/gitlab-ee!6251
```
  2d9d806d
22 Jun, 2018 38 commits
- Merge branch 'docs/refactor-issue-boards-ee' into 'master' · 550d65c8
  Mike Lewis authored Jun 22, 2018
```
Refactor issue boards

Closes #6434

See merge request gitlab-org/gitlab-ee!6136
```
  550d65c8
- Update issue_board.md · cc645d46
  Mike Lewis authored Jun 22, 2018
  
  cc645d46
- edit issue_board.md · fbfd99e7
  Mike Lewis authored Jun 22, 2018
  
  fbfd99e7
- edits to issue_board.md · b1492c85
  Mike Lewis authored Jun 22, 2018
  
  b1492c85
- Merge branch 'jl-helm-polish-docs' into 'master' · c1fa6f7c
  Mike Lewis authored Jun 22, 2018
```
Minor fixes for the Helm docs

See merge request gitlab-org/gitlab-ce!20078
```
  c1fa6f7c
- Update gitlab_chart.md · 2eb168c6
  Mike Lewis authored Jun 22, 2018
  
  2eb168c6
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-22 · 759c2f10
  GitLab Bot authored Jun 22, 2018
  
  759c2f10
- Merge branch '48296-remove-top-padding-on-gpg-popovers' into 'master' · 59d48848
  Mike Greiling authored Jun 22, 2018
```
Resolve "Remove top padding on GPG popovers"

Closes #48296

See merge request gitlab-org/gitlab-ce!20110
```
  59d48848
- Merge branch 'qa/gb/fix-geo-secondary-services-not-being-ready' into 'master' · 267ffa26
  Stan Hu authored Jun 22, 2018
```
Fix Geo secondary node API tests by waiting for services to start properly

See merge request gitlab-org/gitlab-ee!6243
```
  267ffa26
- Merge branch 'rs-update-sprockets' into 'master' · 95842f23
  Stan Hu authored Jun 22, 2018
```
Bump sprockets to 3.7.2 to address CVE-2018-3760

See merge request gitlab-org/gitlab-ce!20109
```
  95842f23
- Merge branch 'unify-boards-create_service.rb' into 'master' · 0f5e40b4
  Robert Speicher authored Jun 22, 2018
```
Unify app/services/boards

See merge request gitlab-org/gitlab-ee!6245
```
  0f5e40b4
- Merge branch 'unify-match_ids.rb' into 'master' · 643466f6
  Robert Speicher authored Jun 22, 2018
```
Unify spec/support/matchers/match_ids.rb

See merge request gitlab-org/gitlab-ce!20108
```
  643466f6
- Remove top margin for bootstrap popover headers · 0c9da2e4
  Clement Ho authored Jun 22, 2018
  
  0c9da2e4
- Bump sprockets to 3.7.2 to address CVE-2018-3760 · fce42cbc
  Robert Speicher authored Jun 22, 2018
  
  fce42cbc
- Merge branch 'zj-commit-raw-diffs' into 'master' · 70bc8665
  Douwe Maan authored Jun 22, 2018
```
Raw diffs are served from Gitaly

Closes gitaly#222

See merge request gitlab-org/gitlab-ce!20091
```
  70bc8665
- Merge branch 'unify-admin_groups_spec.rb' into 'master' · 1db24239
  Douwe Maan authored Jun 22, 2018
```
Unify spec/features/admin/admin_groups_spec.rb

See merge request gitlab-org/gitlab-ce!20107
```
  1db24239
- Merge branch 'ce-to-ee-2018-06-22' into 'master' · c8578ac9
  Marin Jankovski authored Jun 22, 2018
```
CE upstream - 2018-06-22 15:22 UTC

Closes gitaly#221 and gitaly#393

See merge request gitlab-org/gitlab-ee!6247
```
  c8578ac9
- Bring changes from EE · 3c242dda
  Lin Jen-Shin authored Jun 22, 2018
  
  3c242dda
- Merge branch 'fix-boards-issue-highlight' into 'master' · 69a7a9f9
  Clement Ho authored Jun 22, 2018
```
Fix boards issue highlight

Closes #48068

See merge request gitlab-org/gitlab-ce!20063
```
  69a7a9f9
- Move EE changes from Boards::BaseService to its own module · bed774a8
  Lin Jen-Shin authored Jun 22, 2018
  
  bed774a8
- Merge branch 'rs-lib-gitlab-git-gitlab_projects-parity' into 'master' · 254e589d
  Robert Speicher authored Jun 22, 2018
```
CE-EE parity for lib/gitlab/git/gitlab_projects.rb

See merge request gitlab-org/gitlab-ce!20047
```
  254e589d
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-22 · 990bb8b3
  GitLab Bot authored Jun 22, 2018
  
  990bb8b3
- Merge branch 'sh-add-geo-setup-help' into 'master' · 49090c95
  Nick Thomas authored Jun 22, 2018
```
Geo: Add a suggestion to run `make geo-setup` in the development environment

See merge request gitlab-org/gitlab-ee!6244
```
  49090c95
- Bring changes from EE · b2a4b41c
  Lin Jen-Shin authored Jun 22, 2018
  
  b2a4b41c
- Merge branch 'blackst0ne-rails5-fix-data-store-spec' into 'master' · 70bf08b5
  Kamil Trzciński authored Jun 22, 2018
```
[Rails5] Fix "'-1' is not a valid data_store"

See merge request gitlab-org/gitlab-ce!19917
```
  70bf08b5
- Merge branch 'patch-29' into 'master' · afb1ee87
  Kamil Trzciński authored Jun 22, 2018
```
Update lfs_administration.md with language edits

See merge request gitlab-org/gitlab-ce!19950
```
  afb1ee87
- Merge branch 'docs/sm/trouble-shooting-guid-for-timeout-of-background-upload' into 'master' · 69e54faa
  Kamil Trzciński authored Jun 22, 2018
```
Add troubleshooting guide for lfs uploading timeouts

See merge request gitlab-org/gitlab-ce!19949
```
  69e54faa
- Merge branch 'zj-find-ref-name' into 'master' · 510e45fd
  Douwe Maan authored Jun 22, 2018
```
FindRefName RPC now mandatory

Closes gitaly#221

See merge request gitlab-org/gitlab-ce!20090
```
  510e45fd
- Move EE changes to EE module · c7edc332
  Lin Jen-Shin authored Jun 22, 2018
  
  c7edc332
- Simplify the decode secret step · ccbaa480
  Joshua Lambert authored Jun 22, 2018
  
  ccbaa480
- Merge branch 'ce-to-ee-2018-06-22' into 'master' · 729a4b58
  Stan Hu authored Jun 22, 2018
```
CE upstream - 2018-06-22 12:21 UTC

Closes gitaly#327 and gitlab-ce#47893

See merge request gitlab-org/gitlab-ee!6242
```
  729a4b58
- Merge branch 'docs-add-inline-badges-autodevops' into 'master' · 5ef58816
  Achilleas Pipinellis authored Jun 22, 2018
```
Docs: add inline badges to Auto DevOps features list

See merge request gitlab-org/gitlab-ce!20096
```
  5ef58816
- Merge branch 'docs-add-inline-badges-autodevops-ee' into 'master' · 97f7e560
  Achilleas Pipinellis authored Jun 22, 2018
```
Docs: add inline badges to Auto DevOps features list

See merge request gitlab-org/gitlab-ee!6240
```
  97f7e560
- Merge branch 'update-large-tables-cop' into 'master' · d3059622
  Grzegorz Bizon authored Jun 22, 2018
```
Disallow methods that copy data on large tables

See merge request gitlab-org/gitlab-ce!20021
```
  d3059622
- Merge branch 'bjk/48176_ruby_gc' into 'master' · f855cbf6
  Yorick Peterse authored Jun 22, 2018
```
Fix ruby sampler metrics

See merge request gitlab-org/gitlab-ce!20039
```
  f855cbf6
- Geo: Add a suggestion to run `make geo-setup` in the development environment · 97fe2f14
  Stan Hu authored Jun 22, 2018
  
  97fe2f14
- Merge branch 'zj-repository-size-ee' into 'master' · 370afb7f
  Douwe Maan authored Jun 22, 2018
```
Resolve EE merge conflict

See merge request gitlab-org/gitlab-ee!6239
```
  370afb7f
- Merge branch 'zj-repository-size' into 'master' · 4b8ac87b
  Douwe Maan authored Jun 22, 2018
```
Repository size is Gitaly only

Closes gitaly#393

See merge request gitlab-org/gitlab-ce!20089
```
  4b8ac87b