Commits · e3feec81b046d4b6be3c78a84bad020619654297 · nexedi / gitlab-ce

22 Sep, 2017 7 commits
- Update CHANGELOG.md for 10.0.0 · e3feec81
  Jarka Kadlecova authored Sep 22, 2017
```
[ci skip]
```
  e3feec81
- Update CHANGELOG-EE.md for 10.0.0-ee · feda761b
  Jarka Kadlecova authored Sep 22, 2017
```
[ci skip]
```
  feda761b
- Merge branch 'patch-3' into 'master' · f06a7691
  Achilleas Pipinellis authored Sep 22, 2017
```
Update database.md Geo docs to clarify Postgres needs to be manually restarted

See merge request gitlab-org/gitlab-ee!2992
```
  f06a7691
- Merge branch 'sh-bump-nokogiri' into 'master' · fc805edf
  Robert Speicher authored Sep 22, 2017
```
Upgrade Nokogiri because of CVE-2017-9050

See merge request gitlab-org/gitlab-ee!2996
```
  fc805edf
- Merge branch 'ee-36231-better-svg-usage-in-the-frontend' into 'master' · 8fd99806
  Phil Hughes authored Sep 22, 2017
```
EE-Port "Better SVG Usage in the Frontend"

See merge request gitlab-org/gitlab-ee!2973
```
  8fd99806
- EE-Port "Better SVG Usage in the Frontend" · 3d036617
  Tim Zallmann authored Sep 22, 2017
  
  3d036617
- Merge branch 'winh-upgrade-nokogiri' into 'master' · 34797ad3
  Robert Speicher authored Sep 21, 2017
```
Upgrade Nokogiri because of CVE-2017-9050

See merge request gitlab-org/gitlab-ce!14427
```
  34797ad3
21 Sep, 2017 33 commits
- Merge branch 'docs-fix-broken-link' into 'master' · fd0482d6
  Robert Speicher authored Sep 21, 2017
```
Docs: fix link

[ci skip]

See merge request gitlab-org/gitlab-ee!2995
```
  fd0482d6
- fix link for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2991 · 64061f61
  Marcia Ramos authored Sep 21, 2017
  
  64061f61
- Merge branch 'remove-duplicate-group-boards-docs' into 'master' · 89432f1d
  Marcia Ramos authored Sep 21, 2017
```
Remove duplicate group boards doc

See merge request gitlab-org/gitlab-ee!2991
```
  89432f1d
- Merge branch 'bpj-ee-pretty-time-update' into 'master' · 78bbdcda
  Fatih Acet authored Sep 21, 2017
```
Update references to parseSeconds and stringifyTime in geo_nodes.

See merge request gitlab-org/gitlab-ee!2963
```
  78bbdcda
- Update database.md Geo docs to clarify Postgres needs to be manually restarted · 4eec9fb5
  Lee Matos authored Sep 21, 2017
  
  4eec9fb5
- Remove duplicate group boards doc · 39004a6f
  Achilleas Pipinellis authored Sep 21, 2017
```
The feature is already documented in https://docs.gitlab.com/ee/user/project/issue_board.html#group-level-issue-boards
```
  39004a6f
- Merge branch 'docs/autodevops-cleanup-ee' into 'master' · 5d31778c
  Marcia Ramos authored Sep 21, 2017
```
Auto DevOps docs cleanup

See merge request gitlab-org/gitlab-ee!2989
```
  5d31778c
- Merge branch 'docs/owners-can-create-subgroups-ee' into 'master' · 47395a05
  Marcia Ramos authored Sep 21, 2017
```
Document that group Owners can always create subgroups

See merge request gitlab-org/gitlab-ee!2988
```
  47395a05
- Auto DevOps docs cleanup · 4039c228
  Achilleas Pipinellis authored Sep 21, 2017
  
  4039c228
- Document that group Owners can always create subgroups · d929f134
  Achilleas Pipinellis authored Sep 21, 2017
```
Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/30473
MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14046
```
  d929f134
- Merge branch '3505-disable-key-updates-on-secondaries' into 'master' · 10d1f449
  Rémy Coutable authored Sep 21, 2017
```
Resolve "Geo: Disable updates to Key#last_used_at"

Closes #3505

See merge request gitlab-org/gitlab-ee!2983
```
  10d1f449
- Merge branch 'ce-to-ee-2017-09-21' into 'master' · 86b41da8
  Rémy Coutable authored Sep 21, 2017
```
CE upstream: Thursday

Closes gitaly#597, gitlab-ce#36663, gitlab-ce#38129 et gitlab-ce#38061

See merge request gitlab-org/gitlab-ee!2981
```
  86b41da8
- Merge branch '3142-fix-merge-request-approvals-validation-error' into 'master' · 92f5a5fd
  Douwe Maan authored Sep 21, 2017
```
fix the approvals_before_merge project fallback

Closes #3142

See merge request gitlab-org/gitlab-ee!2932
```
  92f5a5fd
- Prevent a database update on Geo secondaries · a52eff6c
  Nick Thomas authored Sep 21, 2017
  
  a52eff6c
- Merge branch '3471-burndown-chart-banner-shows-up-even-if-group-has-upgraded' into 'master' · 82d65226
  Douwe Maan authored Sep 21, 2017
```
Resolve "Burndown chart Banner shows up even if group has upgraded"

Closes #3471 and #3474

See merge request gitlab-org/gitlab-ee!2945
```
  82d65226
- CE->EE: Fix merge conflicts · 0f4a6d0f
  Nick Thomas authored Sep 21, 2017
  
  0f4a6d0f
- Merge remote-tracking branch 'ce/master' into ce-to-ee-2017-09-21 · 52fa1bb5
  Nick Thomas authored Sep 21, 2017
  
  52fa1bb5
- Merge branch 'ee-37220-es-modules' into 'master' · 051daa03
  Phil Hughes authored Sep 21, 2017
```
Port of 37220-es-modules to EE

See merge request gitlab-org/gitlab-ee!2914
```
  051daa03
- Port of 37220-es-modules to EE · 2328e10a
  Filipa Lacerda authored Sep 21, 2017
  
  2328e10a
- Merge branch '37220-es-modules' into 'master' · 598b1a17
  Phil Hughes authored Sep 21, 2017
```
Use modules in common utils

See merge request gitlab-org/gitlab-ce!14074
```
  598b1a17
- Merge branch 'feature/plantuml-restructured-text' into 'master' · ac044ba0
  Douwe Maan authored Sep 21, 2017
```
Upgrade gitlab-markup gem

See merge request gitlab-org/gitlab-ce!14395
```
  ac044ba0
- Merge branch '38088-remove-banner-to-customize-experience' into 'master' · 39b90bce
  Douwe Maan authored Sep 21, 2017
```
Resolve "Remove banner to customize experience"

Closes #38088

See merge request gitlab-org/gitlab-ce!14384
```
  39b90bce
- Merge branch 'ce-to-ee-2017-09-20' into 'master' · 7c627ac8
  Rémy Coutable authored Sep 21, 2017
```
CE upstream - Wednesday

Closes gitaly#589, gitlab-qa#66, gitlab-ce#33287, gitlab-ce#36877, gitlab-ce#37893, gitlab-ce#37259 et gitlab-ce#37465

See merge request gitlab-org/gitlab-ee!2965
```
  7c627ac8
- Added QUestion Mark to Feature Promotion Call · 25eb3544
  Tim Zallmann authored Sep 21, 2017
  
  25eb3544
- Merge branch 'events-redundant-where' into 'master' · 87f179e0
  Rémy Coutable authored Sep 21, 2017
```
Remove redundant WHERE from event queries

Closes #38129

See merge request gitlab-org/gitlab-ce!14389
```
  87f179e0
- Merge branch 'remove-use-key-worker' into 'master' · d863326e
  Rémy Coutable authored Sep 21, 2017
```
Stop using Sidekiq for updating Key#last_used_at

Closes #36663

See merge request gitlab-org/gitlab-ce!14391
```
  d863326e
- Merge branch 'resolve-discussions-btn' into 'master' · 6374530d
  Phil Hughes authored Sep 21, 2017
```
Make resolve discussion icon gray

See merge request gitlab-org/gitlab-ce!14398
```
  6374530d
- Merge branch '3441-group-board-labels' into 'master' · a52cd764
  Phil Hughes authored Sep 21, 2017
```
show project labels on group board cards

Closes #3441

See merge request gitlab-org/gitlab-ee!2957
```
  a52cd764
- Merge branch 'dm-license-features' into 'master' · c653ae39
  Rémy Coutable authored Sep 21, 2017
```
Simplify specification of EE license/plan features

Closes #2466

See merge request gitlab-org/gitlab-ee!2943
```
  c653ae39
- Simplify specification of EE license/plan features · 4aa10f53
  Douwe Maan authored Sep 21, 2017
  
  4aa10f53
- Revert "Fix db/schema.rb" · 2f023955
  Rémy Coutable authored Sep 21, 2017
```
This reverts commit 8e007e88.
```
  2f023955
- Fix db/schema.rb · ba056f9b
  Rémy Coutable authored Sep 21, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  ba056f9b
- Merge branch '10-0-sync-master' into 'master' · 13ef4412
  Simon Knox authored Sep 21, 2017
```
Sync dev to gitlab.com

See merge request gitlab-org/gitlab-ee!2979
```
  13ef4412