Commits · 32ad854e87a9c3567f0497fc8ac376d74ecbfce6 · nexedi / gitlab-ce

05 Dec, 2017 15 commits
- Merge branch 'improve-epic-nav' into 'master' · 32ad854e
  Sean McGivern authored Dec 05, 2017
```
Extract epic nav into separate partial for easier CE => EE

Closes #4027

See merge request gitlab-org/gitlab-ee!3587
```
  32ad854e
- Extract epic nav into separate partial for easier CE => EE · 19b0c677
  Clement Ho authored Dec 05, 2017
  
  19b0c677
- Merge branch 'dm-application-worker-ee' into 'master' · 21384d80
  Sean McGivern authored Dec 05, 2017
```
[EE] Add ApplicationWorker and make every worker include it

See merge request gitlab-org/gitlab-ee!3577
```
  21384d80
- 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
- Consistently schedule Sidekiq jobs · f803eb79
  Douwe Maan authored Nov 29, 2017
  
  f803eb79
- Update docs · a963c4ee
  Douwe Maan authored Nov 30, 2017
  
  a963c4ee
- Add `--dryrun` option to `bin/sidekiq-cluster`, and spec to verify it actually runs · 5711eeed
  Douwe Maan authored Dec 01, 2017
  
  5711eeed
- Add ApplicationWorker and make every worker include it · c5bd57e8
  Douwe Maan authored Nov 28, 2017
  
  c5bd57e8
- 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
- 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
04 Dec, 2017 25 commits
- resolve spec conflict · 954105e8
  Simon Knox authored Dec 05, 2017
  
  954105e8
- 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 '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 remote-tracking branch 'upstream/master' into ce-to-ee-2017-12-04 · e262d9f2
  Dmitriy Zaporozhets authored Dec 04, 2017
```
# Conflicts:
#	app/services/ci/create_pipeline_service.rb
#	lib/gitlab/shell.rb
#	spec/javascripts/notes/components/issue_comment_form_spec.js
#	spec/services/projects/count_service_spec.rb

[ci skip]
```
  e262d9f2
- Decrease the push mirror backoff delay and add rate limiting to the push... · a4f9aece
  Tiago Botelho authored Nov 28, 2017
```
Decrease the push mirror backoff delay and add rate limiting to the push mirror scheduling algorithm.
```
  a4f9aece
- Merge branch '39869_show_closed_status_of_links_to_issues_on_wiki_pages' into 'master' · 8f9622bb
  Robert Speicher authored Dec 04, 2017
```
Show status of issuable links in wiki pages

See merge request gitlab-org/gitlab-ce!15694
```
  8f9622bb
- show status of issue links in wiki page · e5430712
  haseeb authored Dec 04, 2017
  
  e5430712
- Merge branch 'psimyn-issue-note-refac' into 'master' · 8503fec2
  Fatih Acet authored Dec 04, 2017
```
issue note component rename

See merge request gitlab-org/gitlab-ce!15587
```
  8503fec2
- issue note component rename · bf85a900
  Simon Knox authored Dec 04, 2017
  
  bf85a900
- Merge branch 'ee-psimyn-issue-note-refac' into 'master' · ffe6e3f6
  Fatih Acet authored Dec 04, 2017
```
issue note component rename

See merge request gitlab-org/gitlab-ee!3568
```
  ffe6e3f6
- Fix a NoMethodError in Geo::MetricsUpdateService · 87b8d1a1
  Nick Thomas authored Dec 04, 2017
  
  87b8d1a1
- Merge branch 'git-fsck-worker-client-prep' into 'master' · a1cd9be4
  Douwe Maan authored Dec 04, 2017
```
Move SingleRepositoryWorker#fsck into Gitlab::Git::Repository

Closes gitaly#802

See merge request gitlab-org/gitlab-ce!15710
```
  a1cd9be4
- Merge branch 'elastic-search-support-future' into 'master' · fd1ef1ad
  Nick Thomas authored Dec 04, 2017
```
Elastic search support for 6.0 in the future

See merge request gitlab-org/gitlab-ee!3622
```
  fd1ef1ad
- Run the Geo specs on dedicated runners · 734e48f2
  Nick Thomas authored Dec 04, 2017
  
  734e48f2
- Elastic search support for 6.0 in the future · 46522d32
  Victor Wu authored Dec 04, 2017
  
  46522d32
- Merge branch 'zj-diverging-commit-count-no-rugged' into 'master' · 0f3f50d1
  Robert Speicher authored Dec 04, 2017
```
Use commit finder instead of rev parse

See merge request gitlab-org/gitlab-ce!15683
```
  0f3f50d1
- Merge branch 'sh-optimize-groups-api-ee' into 'master' · 0fd66f26
  Douwe Maan authored Dec 04, 2017
```
Port from CE: Optimize API /groups/:id/projects by preloading assocations

See merge request gitlab-org/gitlab-ee!3604
```
  0fd66f26
- Port from CE: Optimize API /groups/:id/projects by preloading assocations · 281f4cf6
  Francisco Javier López authored Dec 04, 2017
  
  281f4cf6
- Merge branch 'sh-optimize-groups-api' into 'master' · 65b7a7a0
  Douwe Maan authored Dec 04, 2017
```
Optimize API /groups/:id/projects by preloading assocations

Closes #40308

See merge request gitlab-org/gitlab-ce!15475
```
  65b7a7a0
- Merge branch '40691-upgrade-rails-to-4-2-10' into 'master' · 6a27f9b1
  Douwe Maan authored Dec 04, 2017
```
Resolve "Upgrade Rails to 4.2.10"

Closes #40691

See merge request gitlab-org/gitlab-ce!15662
```
  6a27f9b1
- Merge branch 'ce-to-ee-2017-11-30' into 'master' · e160f89a
  Rémy Coutable authored Dec 04, 2017
```
CE upstream - Thursday

Closes gitlab-ce#40671

See merge request gitlab-org/gitlab-ee!3593
```
  e160f89a