Commits · 0f4a6d0fb3ddec42df4eed79f0d0512503342022 · nexedi / gitlab-ce

21 Sep, 2017 21 commits
- 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
- 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
- Merge branch '10-0-sync-master' into 'master' · 251ed2d4
  Simon Knox authored Sep 21, 2017
```
Sync dev to gitlab.com

See merge request gitlab-org/gitlab-ce!14406
```
  251ed2d4
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into 10-0-sync-master · b1cbc455
  Jarka Kadlecova authored Sep 21, 2017
  
  b1cbc455
- Merge branch 'elastic-docfix' into 'master' · 59c471b3
  Rémy Coutable authored Sep 21, 2017
```
Fix / add instructions for installations from source to elasticsearch docs

See merge request gitlab-org/gitlab-ee!2958
```
  59c471b3
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · e20d47aa
  Jarka Kadlecova authored Sep 21, 2017
  
  e20d47aa
20 Sep, 2017 19 commits
- Merge branch 'fix-image-diff-swipe-handle' into 'master' · 47f172bc
  Annabel Dunstone Gray authored Sep 20, 2017
```
Fix image diff swipe handle offset to correctly align with the frame

Closes #37928

See merge request gitlab-org/gitlab-ce!14392
```
  47f172bc
- Make resolve discussion icon gray · 22d930ae
  Annabel Dunstone Gray authored Sep 20, 2017
  
  22d930ae
- Merge branch '38049-fix-resolve-in-new-issue-btn' into 'master' · d3ee059d
  Annabel Dunstone Gray authored Sep 20, 2017
```
Fix the "resolve discussion in a new issue" button

Closes #38049

See merge request gitlab-org/gitlab-ce!14357
```
  d3ee059d
- Deleted another Fixture due to User Callout · eebd99b2
  Tim Zallmann authored Sep 20, 2017
  
  eebd99b2
- Fixture Creation removed · 2e08a13f
  Tim Zallmann authored Sep 20, 2017
  
  2e08a13f
- Deleted Karma Specs for userCallout · dce15f24
  Tim Zallmann authored Sep 20, 2017
  
  dce15f24
- Removed User Callout for Customer Experience · 37213cc3
  Tim Zallmann authored Sep 20, 2017
  
  37213cc3
- Fix the "resolve discussion in a new issue" button · 6f8d669d
  Nick Thomas authored Sep 19, 2017
  
  6f8d669d
- Merge branch '3453-rework-repo-sync-worker' into 'master' · df51a3d5
  Robert Speicher authored Sep 20, 2017
```
Rework Geo::BaseSchedulerWorker to be clearer and log per-loop information

See merge request gitlab-org/gitlab-ee!2961
```
  df51a3d5
- Merge branch '3488-fix-service-desk' into 'master' · 87855e4a
  Douwe Maan authored Sep 20, 2017
```
Resolve "Service Desk filter Error 500"

Closes #3488

See merge request gitlab-org/gitlab-ee!2969
```
  87855e4a
- Merge branch '37862-breadcrumbs-mobile' into 'master' · 8612b088
  Tim Zallmann authored Sep 20, 2017
```
Fix mobile sidebar button to match height of desktop breadcrumbs

Closes #37862

See merge request gitlab-org/gitlab-ce!14282
```
  8612b088
- Upgrade gitlab-markup gem · 0c46598a
  Markus Koller authored Sep 20, 2017
  
  0c46598a
- Merge branch 'gitlab-git-popen' into 'master' · 70dc7e9a
  Douwe Maan authored Sep 20, 2017
```
Use Gitlab::Git's Popen on that module's code

Closes gitaly#597

See merge request gitlab-org/gitlab-ce!14237
```
  70dc7e9a
- Merge branch '32796-tighten-up-remove-old-while-backing-up-gitlab' into 'master' · 2ce49b53
  Rémy Coutable authored Sep 20, 2017
```
Tighten up remove_old regex from gitlab backup manager.

Closes #32796

See merge request gitlab-org/gitlab-ce!14333
```
  2ce49b53
- Merge branch '1834-mirroring-to-remote-repository-fails-after-a-force-push' into 'master' · 871e051b
  Robert Speicher authored Sep 20, 2017
```
Mirroring to remote repository no longer fails after a force push.

Closes #1834

See merge request gitlab-org/gitlab-ee!2919
```
  871e051b
- Rework Geo::BaseSchedulerWorker to be clearer and log per-loop information · 71cd24bb
  Nick Thomas authored Sep 19, 2017
  
  71cd24bb
- Merge branch 'workhorse-3.1.0' into 'master' · ff1deab6
  Rémy Coutable authored Sep 20, 2017
```
Use gitlab-workhorse 3.1.0

See merge request gitlab-org/gitlab-ce!14390
```
  ff1deab6
- Fix image diff swipe handle offset to correctly align with the frame · 15290375
  Clement Ho authored Sep 20, 2017
  
  15290375
- Fix searching by assignee in the service desk · 21a3d58e
  Nick Thomas authored Sep 20, 2017
  
  21a3d58e