Commits · 72f73b429cc71b8650628e277726bfae0c032d51 · nexedi / gitlab-ce

07 May, 2018 40 commits
- Merge branch 'dm-project-factory-import-state-ee' into 'master' · 72f73b42
  Robert Speicher authored May 07, 2018
```
[EE] Fix project factory `import_*` traits

See merge request gitlab-org/gitlab-ee!5599
```
  72f73b42
- Merge branch 'ce-to-ee-2018-05-04' into 'master' · 783cfb9e
  Robert Speicher authored May 07, 2018
```
CE upstream - 2018-05-04 21:23 UTC

See merge request gitlab-org/gitlab-ee!5586
```
  783cfb9e
- Merge branch '5480-epic-notifications' into 'master' · 3930c3fc
  Douwe Maan authored May 07, 2018
```
Resolve "Email notifications for epics"

Closes #5480

See merge request gitlab-org/gitlab-ee!5496
```
  3930c3fc
- Merge branch 'ee-upgrade-to-webpack-v4' into 'master' · ca162184
  Clement Ho authored May 07, 2018
```
Upgrade to Webpack 4

See merge request gitlab-org/gitlab-ee!5569
```
  ca162184
- Upgrade to Webpack 4 · 73fd426d
  Mike Greiling authored May 07, 2018
  
  73fd426d
- Add project_mirror_data columns at the appropriate times · 7f67108a
  Douwe Maan authored May 07, 2018
  
  7f67108a
- Add notification unsubscribe redirect path for epics · 74c7f240
  Mario de la Ossa authored May 04, 2018
  
  74c7f240
- Epic Sidebar Subscriptions Component · 40c725b4
  Kushal Pandya authored May 04, 2018
  
  40c725b4
- Epic Sidebar Participants Component · c1918874
  Kushal Pandya authored May 04, 2018
  
  c1918874
- Remove gravatar URLs for unnecessary network request during tests · 654824df
  Kushal Pandya authored May 04, 2018
  
  654824df
- Change `subscription` store property to `subscribed` · fd47fa51
  Kushal Pandya authored May 04, 2018
  
  fd47fa51
- Make Epic sidebar auto-expand when participants & label icon is clicked · 9c1e042d
  Kushal Pandya authored May 03, 2018
  
  9c1e042d
- Add Participants and Subscription toggle to Epic sidebar · 7a262134
  Kushal Pandya authored May 02, 2018
  
  7a262134
- Add notifications to Epics · baa05571
  Mario de la Ossa authored Apr 25, 2018
  
  baa05571
- Force creation of new import_state when setting an import state field · d361aa71
  Douwe Maan authored May 07, 2018
  
  d361aa71
- Don't always create a new import_state record from project factory · cedc0974
  Douwe Maan authored May 07, 2018
  
  cedc0974
- Merge branch '43557-osw-present-merge-sha-commit-ee' into 'master' · 52df6f78
  Filipa Lacerda authored May 07, 2018
```
Port "Display merge commit SHA in merge widget after merge"

See merge request gitlab-org/gitlab-ee!5587
```
  52df6f78
- Ensure we use the same migration versions in CE and EE, and that CE can be upgraded to EE · c3a8d277
  Douwe Maan authored May 07, 2018
  
  c3a8d277
- Merge branch 'ccr/weight_1481' into 'master' · 546a3b0e
  Douwe Maan authored May 07, 2018
```
add system note for weight change, closes #1481

Closes #1481

See merge request gitlab-org/gitlab-ee!5531
```
  546a3b0e
- add system note for weight change, closes #1481 · ecab5398
  Chantal Rollison authored Apr 30, 2018
  
  ecab5398
- Merge branch 'bw-verification-resync-fix' into 'master' · daf543ff
  Stan Hu authored May 07, 2018
```
Geo repository verification: ignore repos/wikis needing resync

See merge request gitlab-org/gitlab-ee!5568
```
  daf543ff
- Geo repository verification: ignore repos/wikis needing resync · f8f16b18
  Brett Walker authored May 07, 2018
  
  f8f16b18
- Merge branch 'live-trace-v2-efficient-destroy-all-ee' into 'master' · 625caf57
  Grzegorz Bizon authored May 07, 2018
```
Port to EE: Live trace: Use efficient destroy all (for `dependent: :destory` problem)

See merge request gitlab-org/gitlab-ee!5593
```
  625caf57
- Merge branch '42099-port-push-mirroring-to-ce' into 'master' · 72764ff1
  Douwe Maan authored May 07, 2018
```
Make push mirrors CE

See merge request gitlab-org/gitlab-ee!5484
```
  72764ff1
- Merge branch 'issue_5242' into 'master' · 83396a95
  Kamil Trzciński authored May 07, 2018
```
Show pod name for each deploy replica

Closes #5242

See merge request gitlab-org/gitlab-ee!5523
```
  83396a95
- Show pod name for each deploy replica · b155898d
  Felipe Artur authored May 07, 2018
  
  b155898d
- Avoid conflicts with gitlab-ce!18722 · 1cf6e217
  Oswaldo Ferreira authored May 07, 2018
  
  1cf6e217
- Merge branch 'bw-add-geo-console-message' into 'master' · 8ba3b6d4
  Robert Speicher authored May 07, 2018
```
Add Geo information to console message

See merge request gitlab-org/gitlab-ee!5588
```
  8ba3b6d4
- Add Geo information to console message · 954b8603
  Brett Walker authored May 07, 2018
  
  954b8603
- Merge branch '2646-osw-support-mrs-on-jira-dev-panel' into 'master' · 53d04fa3
  Douwe Maan authored May 07, 2018
```
Add Merge Requests support for Jira Development Panel

Closes #2646

See merge request gitlab-org/gitlab-ee!5534
```
  53d04fa3
- Merge branch '5894-show-git-status-to-debug' into 'master' · 87c3890b
  Douwe Maan authored May 07, 2018
```
Report git status whenever ee-specific-lines-check failed to rebase cleanly

See merge request gitlab-org/gitlab-ee!5594
```
  87c3890b
- Merge branch 'tc-repo-verify-mails-ee' into 'master' · 21fd3c4d
  Douwe Maan authored May 07, 2018
```
Repository verification on Geo secondary

Closes #5564 and #4746

See merge request gitlab-org/gitlab-ee!5550
```
  21fd3c4d
- Present MRs on Jira development panel integration · a5ea8b16
  Oswaldo Ferreira authored May 01, 2018
  
  a5ea8b16
- Fix rubocop violation · a224f6f4
  Toon Claes authored May 07, 2018
  
  a224f6f4
- Remove extra line in MigrateImportAttributesDataFromProjectsToProjectMirrorData · 108e83ce
  Tiago Botelho authored May 07, 2018
  
  108e83ce
- Merge branch 'live-trace-v2-efficient-destroy-all' into 'master' · 21bbed2d
  Grzegorz Bizon authored May 07, 2018
```
Live trace: Use efficient destroy all (for `dependent: :destory` problem)

See merge request gitlab-org/gitlab-ce!18575
```
  21bbed2d
- Merge branch '5146-help-text-for-verification-info' into 'master' · 88e5f4e9
  Tim Zallmann authored May 07, 2018
```
Update item titles and add help text in Geo nodes admin dashboard

Closes #5146

See merge request gitlab-org/gitlab-ee!5306
```
  88e5f4e9
- Switch to timestamp with time zone · a4df30c3
  Toon Claes authored May 07, 2018
  
  a4df30c3
- Use push events again to determine if repo needs checking · f7d26635
  Toon Claes authored May 07, 2018
  
  f7d26635
- Removes EE version of MigrateImportAttributesDataFromProjectsToProjectMirrorData · adf0b2a7
  Tiago Botelho authored May 07, 2018
  
  adf0b2a7