delta/gitlab/gitlab-ce.git, branch 43315-gpg-popover gitlab.com: gitlab-org/gitlab-ce.git Add missing class to parent element and remove extra CSS 2018-02-26T11:18:45+00:00 Filipa Lacerda filipa@gitlab.com 2018-02-26T11:18:45+00:00 d74aa827c4cb9f327ab028497182341921e56fbf 






[ci skip] Merge branch 'master' into 43315-gpg-popover
2018-02-26T10:30:18+00:00

Filipa Lacerda
filipa@gitlab.com

2018-02-26T10:30:18+00:00

bca29417ab4dcedfed23179c055fd0f3d5c5bce6

* master: (39 commits)
  Restart Unicorn and Sidekiq when GRPC throws 14:Endpoint read failed
  Add changelog entry
  Use imported `DropdownUtils`
  Update CHANGELOG.md for 10.5.2
  Respond 404 when repo does not exist
  Fix deletion attempts on dropped tables
  Fix specs
  prevent localStorage.clear from running when it would cause an error
  Removed webpack tag
  move webpack bundles we intend to keep below the list of bundles we're refactoring to reduce conflicts
  Explicitly add uncovered files to troubleMakers
  Backport custom metrics ce components
  remove issue_show webpack bundle in favor of pages/projects/issues/show/index.js
  Revert "Revert "Use Dir.mktmpdir""
  Revert "Use Dir.mktmpdir"
  Use Dir.mktmpdir
  Refactored webpack bundle tag for deploy keys
  Change FileUtils.cp to FileUtils.copy
  Bring back the initial commit
  Add a button to deploy a runner to a Kubernetes cluster in the settings page
  ...





* master: (39 commits)
  Restart Unicorn and Sidekiq when GRPC throws 14:Endpoint read failed
  Add changelog entry
  Use imported `DropdownUtils`
  Update CHANGELOG.md for 10.5.2
  Respond 404 when repo does not exist
  Fix deletion attempts on dropped tables
  Fix specs
  prevent localStorage.clear from running when it would cause an error
  Removed webpack tag
  move webpack bundles we intend to keep below the list of bundles we're refactoring to reduce conflicts
  Explicitly add uncovered files to troubleMakers
  Backport custom metrics ce components
  remove issue_show webpack bundle in favor of pages/projects/issues/show/index.js
  Revert "Revert "Use Dir.mktmpdir""
  Revert "Use Dir.mktmpdir"
  Use Dir.mktmpdir
  Refactored webpack bundle tag for deploy keys
  Change FileUtils.cp to FileUtils.copy
  Bring back the initial commit
  Add a button to deploy a runner to a Kubernetes cluster in the settings page
  ...







Merge branch '43598-fix-duplicate-label-load-failure' into 'master'
2018-02-26T10:02:40+00:00

Phil Hughes
me@iamphill.com

2018-02-26T10:02:40+00:00

d1ceb60068c9c1a8a91e20ddffc108f82f313790

Fix Group labels load failure when there are duplicate labels present

Closes #43598

See merge request gitlab-org/gitlab-ce!17353




Fix Group labels load failure when there are duplicate labels present

Closes #43598

See merge request gitlab-org/gitlab-ce!17353






Merge branch 'mk/fix-error-code-for-repo-does-not-exist' into 'master'
2018-02-26T09:57:11+00:00

Douwe Maan
douwe@gitlab.com

2018-02-26T09:57:11+00:00

336f01c20885e8c648754b7b708ccde07873d415

Respond with more appropriate HTTP status code when repo does not exist

See merge request gitlab-org/gitlab-ce!17341




Respond with more appropriate HTTP status code when repo does not exist

See merge request gitlab-org/gitlab-ce!17341






Merge branch 'grpc-unavailable-restart' into 'master'
2018-02-26T09:54:20+00:00

Douwe Maan
douwe@gitlab.com

2018-02-26T09:54:20+00:00

ef9b9b5d56d92f05d511e6043a664d6441918fb2

Restart Unicorn and Sidekiq when GRPC throws 14:Endpoint read failed

Closes gitaly#1036

See merge request gitlab-org/gitlab-ce!17293




Restart Unicorn and Sidekiq when GRPC throws 14:Endpoint read failed

Closes gitaly#1036

See merge request gitlab-org/gitlab-ce!17293






Restart Unicorn and Sidekiq when GRPC throws 14:Endpoint read failed
2018-02-26T09:54:20+00:00

Jacob Vosmaer (GitLab)
jacob@gitlab.com

2018-02-26T09:54:20+00:00

006753110a462e62f549cdf3c410e73eed068dbf












Add changelog entry
2018-02-26T07:19:24+00:00

Kushal Pandya
kushal@gitlab.com

2018-02-26T07:19:24+00:00

c0145298b3f65151da3bb169c00b631fb8fd7040












Use imported `DropdownUtils`
2018-02-26T07:12:55+00:00

Kushal Pandya
kushal@gitlab.com

2018-02-26T07:12:55+00:00

936280934ba820846c646f3b10ef2dc533c7a76e












Update CHANGELOG.md for 10.5.2
2018-02-25T17:42:19+00:00

Ian Baum
ibaum@gitlab.com

2018-02-25T17:42:19+00:00

e1de8a77d5d9749eaa596bfa15e6d11f1828db95

[ci skip]




[ci skip]






Merge branch 'backport-qa_78' into 'master'
2018-02-25T07:58:23+00:00

Grzegorz Bizon
grzegorz@gitlab.com

2018-02-25T07:58:23+00:00

7eaafea288cc43f7e314e44c6e46c87661cfd21d

QA BACKPORT - Test merge request rebase

See merge request gitlab-org/gitlab-ce!17186




QA BACKPORT - Test merge request rebase

See merge request gitlab-org/gitlab-ce!17186