Commits · b59e777bc2a1c773d334ed2fa96a1edc579a520f · nexedi / gitlab-ce

27 Sep, 2017 14 commits
- Show group tab if member lock is enabled · b59e777b
  Annabel Dunstone Gray authored Sep 27, 2017
  
  b59e777b
- Merge branch 'ce_upstream' into 'master' · db4a464f
  Valery Sizov authored Sep 27, 2017
```
CE upstream

Closes gitlab-runner#2782 and gitaly#508

See merge request gitlab-org/gitlab-ee!3017
```
  db4a464f
- Merge branch 'add-consul-docs' into 'master' · 7400ba31
  Marin Jankovski authored Sep 27, 2017
```
Add basic documentation on the consul cluster

Closes omnibus-gitlab#2794

See merge request gitlab-org/gitlab-ee!3013
```
  7400ba31
- Add basic documentation on the consul cluster · 2324c152
  Ian Baum authored Sep 27, 2017
  
  2324c152
- Merge branch 'rc/update-testing-ee-docs' into 'master' · 18533135
  Achilleas Pipinellis authored Sep 27, 2017
```
Update CI parallelization description and move section about EE-specific tests to its correct place

See merge request gitlab-org/gitlab-ee!3015
```
  18533135
- Update CI parallelization description and move section about EE-specific tests to its correct place · cf8ba527
  Rémy Coutable authored Sep 27, 2017
  
  cf8ba527
- Merge branch 'docs/group-boards-link-fix' into 'master' · 8585707f
  Marcia Ramos authored Sep 27, 2017
```
Fix broken link to issue boards release post

Closes #3566

See merge request gitlab-org/gitlab-ee!3022
```
  8585707f
- Update CHANGELOG.md for 10.0.2 · f73e0486
  Jarka Kadlecova authored Sep 27, 2017
```
[ci skip]
```
  f73e0486
- Update CHANGELOG-EE.md for 10.0.2-ee · 48a1f56b
  Jarka Kadlecova authored Sep 27, 2017
```
[ci skip]
```
  48a1f56b
- Merge remote-tracking branch 'origin/master' into ce_upstream · bded707c
  Valery Sizov authored Sep 27, 2017
  
  bded707c
- [CE->EE] Resolve sorting_helper.rb · fdf6aaa5
  Valery Sizov authored Sep 27, 2017
  
  fdf6aaa5
- Merge branch 'docs-version-info-new-csv-export-fields' into 'master' · 5926adac
  Achilleas Pipinellis authored Sep 27, 2017
```
Add version info for new columns

See merge request gitlab-org/gitlab-ee!2964
```
  5926adac
- Add version info for new columns · 78a6cbb1
  Collen authored Sep 27, 2017
  
  78a6cbb1
- Fix broken link to issue boards release post · 6d6415ac
  Achilleas Pipinellis authored Sep 27, 2017
  
  6d6415ac
26 Sep, 2017 26 commits
- Merge branch 'rc/update-testing-docs-ee' into 'master' · dba5042a
  Grzegorz Bizon authored Sep 26, 2017
```
Improve the IssuableFinder#SCALAR_PARAMS array formatting and add EE_SCALAR_PARAMS

See merge request gitlab-org/gitlab-ee!3018
```
  dba5042a
- Merge branch '3360-geo-skip-unhealthy-shards' into 'master' · ffc81ac8
  Douwe Maan authored Sep 26, 2017
```
Only run Geo backfill for projects on healthy shards

Closes #3360

See merge request gitlab-org/gitlab-ee!2974
```
  ffc81ac8
- Improve the IssuableFinder#SCALAR_PARAMS array formatting and add EE_SCALAR_PARAMS · 828ff249
  Rémy Coutable authored Sep 26, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  828ff249
- [CE->EE] Conflicts resolving. Part 2 · 887471c8
  Valery Sizov authored Sep 26, 2017
  
  887471c8
- Conflicts resolvation, part 1 · d19a32fd
  Valery Sizov authored Sep 26, 2017
  
  d19a32fd
- Only run Geo backfill for projects on healthy shards · 30c34480
  Nick Thomas authored Sep 20, 2017
  
  30c34480
- Merge branch 'docs/helm-chart-upgrade-ee' into 'master' · 02f78b09
  Marcia Ramos authored Sep 26, 2017
```
Add note for upgrading Helm chart prior to 1.3.5

See merge request gitlab-org/gitlab-ee!3016
```
  02f78b09
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_upstream · dfef847d
  Valery Sizov authored Sep 26, 2017
  
  dfef847d
- Merge branch 'changes-bar-dynamic-placeholder' into 'master' · b187a3f2
  Filipa Lacerda authored Sep 26, 2017
```
Dynamically create offset for sticky bar

See merge request gitlab-org/gitlab-ce!14280
```
  b187a3f2
- Merge branch '34371-cycle-analitcs-components-vue' into 'master' · 178ae69b
  Phil Hughes authored Sep 26, 2017
```
Moves cycle analytics components into vue files

See merge request gitlab-org/gitlab-ce!14464
```
  178ae69b
- Moves cycle analytics components into vue files · b524b9eb
  Filipa Lacerda authored Sep 26, 2017
  
  b524b9eb
- Merge branch '38374-add-note-for-upgrading-helm-chart-prior-to-1-3-5-docs' into 'master' · 308de142
  Achilleas Pipinellis authored Sep 26, 2017
```
Add note for upgrading Helm chart prior to 1.3.5 - docs

Closes #38374

See merge request gitlab-org/gitlab-ce!14491
```
  308de142
- Merge branch '38374-add-note-for-upgrading-helm-chart-prior-to-1-3-5-docs' into 'master' · ba4f7413
  Achilleas Pipinellis authored Sep 26, 2017
```
Add note for upgrading Helm chart prior to 1.3.5 - docs

Closes #38374

See merge request gitlab-org/gitlab-ce!14491
```
  ba4f7413
- Add note for upgrading Helm chart prior to 1.3.5 - docs · 5e33b1df
  Joshua Lambert authored Sep 26, 2017
  
  5e33b1df
- Merge branch 'ee-remove-old-nav-styles' into 'master' · 93044dec
  Phil Hughes authored Sep 26, 2017
```
Port of remove-old-nav-styles to EE

See merge request gitlab-org/gitlab-ee!3004
```
  93044dec
- Port of remove-old-nav-styles to EE · fcf5e1b4
  Annabel Dunstone Gray authored Sep 26, 2017
  
  fcf5e1b4
- Merge branch 'remove-old-nav-styles' into 'master' · 07f5c3c3
  Phil Hughes authored Sep 26, 2017
```
Remove old nav code - Part 1

See merge request gitlab-org/gitlab-ce!14379
```
  07f5c3c3
- Merge branch 'ce-to-ee' into 'master' · d537d251
  Dmitriy Zaporozhets authored Sep 26, 2017
```
CE Upstream - Monday

Closes gitaly#524

See merge request gitlab-org/gitlab-ee!3007
```
  d537d251
- Merge branch 'winh-user-dropdown-nowrap' into 'master' · a7265abd
  Phil Hughes authored Sep 26, 2017
```
Avoid wrapping users in dropdown

Closes #38077

See merge request gitlab-org/gitlab-ce!14410
```
  a7265abd
- Merge branch 'document-background-migration-stealing' into 'master' · 3689b9e5
  Yorick Peterse authored Sep 26, 2017
```
Document manual cleanup after background migration stealing

See merge request gitlab-org/gitlab-ce!14477
```
  3689b9e5
- Merge branch 'sh-geo-handle-no-current-geo-node' into 'master' · 46a1af50
  Nick Thomas authored Sep 26, 2017
```
Gracefully handle case where current instance is not a Geo Node

See merge request gitlab-org/gitlab-ee!2977
```
  46a1af50
- Merge branch 'send-valid-project-path-as-name-for-jira' into 'master' · ac6378c0
  Sean McGivern authored Sep 26, 2017
```
Send valid project path as name for Jira dev panel integration

See merge request gitlab-org/gitlab-ee!3005
```
  ac6378c0
- Merge branch 'fix-locked-shared-runners-problem' into 'master' · 6b354370
  Kamil Trzciński authored Sep 26, 2017
```
Fix locked shared runners problem

Closes gitlab-runner#2782

See merge request gitlab-org/gitlab-ce!14483
```
  6b354370
- Merge branch 'patch-2' into 'master' · 923ad9a9
  Douwe Maan authored Sep 26, 2017
```
Update gitlab-shell to 5.9.2

See merge request gitlab-org/gitlab-ce!14446
```
  923ad9a9
- Merge branch 'rs-remove-dead-markdown-pipeline' into 'master' · d2102393
  Douwe Maan authored Sep 26, 2017
```
Remove dead `Gitlab::Markdown::Pipeline` class

See merge request gitlab-org/gitlab-ce!14487
```
  d2102393
- Merge branch '31094-define-color-priorities' into 'master' · 38a848be
  Annabel Dunstone Gray authored Sep 26, 2017
```
Update color variables

See merge request gitlab-org/gitlab-ce!14456
```
  38a848be