Commits · f47f0b332a8b1f988135be4e0e1019136b769584 · nexedi / gitlab-ce

05 Dec, 2017 24 commits
- [CE->EE] resolve lib/gitlab/git/repository.rb · f47f0b33
  Valery Sizov authored Dec 05, 2017
  
  f47f0b33
- [CE->EE] resolve app/views/shared/issuable/_nav.html.haml [ci skip] · 9f065c97
  Valery Sizov authored Dec 05, 2017
  
  9f065c97
- [CE->EE] Resolve app/assets/javascripts/sidebar/sidebar_bundle.js[ci skip] · 498887cc
  Valery Sizov authored Dec 05, 2017
  
  498887cc
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-12-05 · 7c526a73
  GitLab Bot authored Dec 05, 2017
```
# Conflicts:
#	app/assets/javascripts/sidebar/sidebar_bundle.js
#	app/views/shared/issuable/_nav.html.haml
#	lib/gitlab/git/repository.rb
#	spec/models/namespace_spec.rb

[ci skip]
```
  7c526a73
- Merge branch 'ce-to-ee-2017-12-04' into 'master' · 97f24dbd
  Dmitriy Zaporozhets authored Dec 05, 2017
```
CE upstream - Monday

Closes gitaly#802 and omnibus-gitlab#3006

See merge request gitlab-org/gitlab-ee!3624
```
  97f24dbd
- Merge branch '3832-decrease-push-mirror-delay' into 'master' · 8eba4eb6
  Douwe Maan authored Dec 05, 2017
```
Decrease the push mirror backoff delay and add rate limiting to the push mirror…

Closes #3832

See merge request gitlab-org/gitlab-ee!3575
```
  8eba4eb6
- Merge branch 'gitaly-conflict-file' into 'master' · 9f75b7a4
  Sean McGivern authored Dec 05, 2017
```
Small Gitlab::Git fixes for Gitaly

See merge request gitlab-org/gitlab-ce!15675
```
  9f75b7a4
- Merge branch '35616-move-k8-to-cluster-page' into 'master' · c925820a
  Grzegorz Bizon authored Dec 05, 2017
```
Second iteration of Move Kubernetes from service to Cluster page

Closes #35616 and #39826

See merge request gitlab-org/gitlab-ce!14805
```
  c925820a
- Second iteration of Move Kubernetes from service to Cluster page · 4b66bdfa
  Filipa Lacerda authored Dec 05, 2017
  
  4b66bdfa
- Merge branch 'bvl-limit-fork-queries-on-project-show' into 'master' · 04a882d8
  Sean McGivern authored Dec 05, 2017
```
Cache the forks in a namespace in the RequestStore

Closes #40625

See merge request gitlab-org/gitlab-ce!15663
```
  04a882d8
- Merge branch 'backport-epic-nav' into 'master' · 4258bfcb
  Sean McGivern authored Dec 05, 2017
```
Backport Extract epic nav into separate partial for easier CE => EE

See merge request gitlab-org/gitlab-ce!15655
```
  4258bfcb
- Backport Extract epic nav into separate partial for easier CE => EE · 1a2ba2af
  Clement Ho authored Dec 05, 2017
  
  1a2ba2af
- Merge branch 'ce-gitaly-worktree-refactor' into 'master' · 515c619c
  Sean McGivern authored Dec 05, 2017
```
[CE] Move git operations for squash and rebase into Gitlab::Git

See merge request gitlab-org/gitlab-ce!15673
```
  515c619c
- Merge branch 'docs/clarify-review-docs-process' into 'master' · e25b2df8
  Rémy Coutable authored Dec 05, 2017
```
Clarify the docs review process and mention the supported repos

See merge request gitlab-org/gitlab-ce!15573
```
  e25b2df8
- Merge branch 'feature/improve-geo-logging' into 'master' · 2d08a15f
  Stan Hu authored Dec 05, 2017
```
Improve Geo logging of repository errors

Closes #2968

See merge request gitlab-org/gitlab-ee!3402
```
  2d08a15f
- Resolve conflicts in lib/gitlab/shell.rb · 74585d54
  Dmitriy Zaporozhets authored Dec 05, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  74585d54
- Merge branch '1379-update-sidebar-weight-to-vue-and-add-to-boards' into 'master' · 091d1f97
  Phil Hughes authored Dec 05, 2017
```
Refactor sidebar weight block to use Vue and be async + add to Issue Boards

Closes #1379

See merge request gitlab-org/gitlab-ee!3566
```
  091d1f97
- Refactor sidebar weight block to use Vue and be async + add to Issue Boards · e5d48566
  Eric Eastwood authored Dec 05, 2017
  
  e5d48566
- Merge branch 'ce-1379-update-sidebar-weight-to-vue-and-add-to-boards' into 'master' · 4ca4b0ff
  Phil Hughes authored Dec 05, 2017
```
Backport EE changes from refactor sidebar weight block Vue and move to Issue Boards

See merge request gitlab-org/gitlab-ce!15706
```
  4ca4b0ff
- Merge branch '39367-fix-new-email-session-path' into 'master' · 0131c97c
  Douwe Maan authored Dec 05, 2017
```
remove ambiguity about which resource type to be using for new sessions

Closes #39367

See merge request gitlab-org/gitlab-ce!15726
```
  0131c97c
- remove ambiguity about which resource type to be using for new sessions · b0e2e21b
  Brett Walker authored Dec 05, 2017
  
  b0e2e21b
- Extract class responsible for building a pipeline / EE · 43b492ec
  Kamil Trzciński authored Dec 04, 2017
```
See merge request gitlab-org/gitlab-ee!3602

Conflicts:
	app/services/ci/create_pipeline_service.rb
```
  43b492ec
- rename geo nodes failures endpoint to current/failures · 38ec49a2
  James Lopez authored Dec 05, 2017
  
  38ec49a2
- Merge branch '40739-access-404' into 'master' · 61392168
  Grzegorz Bizon authored Dec 05, 2017
```
Prevent job link form rendering when user does not have permissions

Closes #40739

See merge request gitlab-org/gitlab-ce!15723
```
  61392168
04 Dec, 2017 16 commits
- resolve spec conflict · 954105e8
  Simon Knox authored Dec 05, 2017
  
  954105e8
- Backport changes from refactor sidebar weight block Vue and move to Issue Boards · f3433d8a
  Eric Eastwood authored Dec 03, 2017
```
See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3566
```
  f3433d8a
- Merge branch 'backstage/gb/build-pipeline-in-a-separate-class-ee' into 'master' · ded4e2aa
  Kamil Trzciński authored Dec 04, 2017
```
Extract class responsible for building a pipeline / EE

See merge request gitlab-org/gitlab-ee!3602
```
  ded4e2aa
- Extract class responsible for building a pipeline / EE · 9f844dd0
  Grzegorz Bizon authored Dec 04, 2017
  
  9f844dd0
- Merge branch 'feature/migrate-cherry-pick-to-gitaly' into 'master' · f3a3bd50
  Robert Speicher authored Dec 04, 2017
```
Migrate Gitlab::Git::Repository#cherry_pick to Gitaly

Closes gitaly#737

See merge request gitlab-org/gitlab-ce!15517
```
  f3a3bd50
- Use `String#end_with?` instead of `String#ends_with?` · 359b65be
  Alejandro Rodríguez authored Dec 01, 2017
```
The former is in Ruby's core lib, so is more flexible.
```
  359b65be
- Add missing attr_accessor to Gitlab::Git::Conflict::File · 2286681e
  Alejandro Rodríguez authored Nov 30, 2017
  
  2286681e
- Backport Squash/Rebase refactor from EE · f91c5c5b
  Alejandro Rodríguez authored Dec 04, 2017
  
  f91c5c5b
- Merge branch 'user-agent-gke-api' into 'master' · c7940733
  Kamil Trzciński authored Dec 04, 2017
```
Use custom User-Agent header in GCP Client requests

Closes #40583

See merge request gitlab-org/gitlab-ce!15705
```
  c7940733
- Merge branch 'backstage/gb/improve-pipeline-chain-reduce-side-effects' into 'master' · 08125a6b
  Kamil Trzciński authored Dec 04, 2017
```
Reduce pipeline chain life span to minimize side effects

See merge request gitlab-org/gitlab-ce!15716
```
  08125a6b
- Migrate Gitlab::Git::Repository#cherry_pick to Gitaly · 8be9567c
  Ahmad Sherif authored Nov 21, 2017
```
Closes gitaly#737
```
  8be9567c
- Merge branch 'fix-nil-method-error-metrics-update-service' into 'master' · 84eab3c9
  Robert Speicher authored Dec 04, 2017
```
Fix a NoMethodError in Geo::MetricsUpdateService

See merge request gitlab-org/gitlab-ee!3623
```
  84eab3c9
- Fixed test · 1007791a
  Francisco Lopez authored Dec 04, 2017
  
  1007791a
- Merge branch 'sh-geo-check-url-column-check' into 'master' · 8d85935c
  Nick Thomas authored Dec 04, 2017
```
Check that the "url" column exists in the GeoNode table before attempting to use it

Closes #4214

See merge request gitlab-org/gitlab-ee!3608
```
  8d85935c
- Merge branch 'fix-rspec-pg-dedicated-runner' into 'master' · a930a04b
  Rémy Coutable authored Dec 04, 2017
```
Run the Geo specs on dedicated runners

See merge request gitlab-org/gitlab-ee!3619
```
  a930a04b
- Merge branch '39727-add-axios-to-common' into 'master' · 6e12e83d
  Phil Hughes authored Dec 04, 2017
```
Import axios utils in commons chunks

See merge request gitlab-org/gitlab-ce!15721
```
  6e12e83d