Commits · a325f6323cb8c7ee53982c6a576a80812a4d77a0 · nexedi / gitlab-ce

26 Jul, 2018 11 commits
- Add changelog · a325f632
  Annabel Dunstone Gray authored Jul 26, 2018
  
  a325f632
- Add left-padding to diverged-from-upstream label · 841308c4
  Annabel Dunstone Gray authored Jul 24, 2018
  
  841308c4
- Merge branch '49614-dynamic-component-in-report-issue-ee' into 'master' · 8cb9f02e
  Phil Hughes authored Jul 26, 2018
```
Use new extendable report_issues.vue (gitlab-ce!20843)

See merge request gitlab-org/gitlab-ee!6667
```
  8cb9f02e
- Use new extendable report_issues.vue (gitlab-ce!20843) · 87482577
  Lukas Eipert authored Jul 26, 2018
  
  87482577
- Merge branch 'winh-fail-slow-karma-tests-ee' into 'master' · 6eca39f8
  Tim Zallmann authored Jul 26, 2018
```
Fail Karma tests that take longer than a second (EE-port)

Closes gitlab-ce#44174

See merge request gitlab-org/gitlab-ee!6477
```
  6eca39f8
- Merge branch '5158-backend-metrics-alerting' into 'master' · fc73854d
  Sean McGivern authored Jul 26, 2018
```
Backend logic for MVC of SLI Alerts

Closes #5158

See merge request gitlab-org/gitlab-ee!6590
```
  fc73854d
- Merge branch 'winh-geo-nodes-tests-timing' into 'master' · a4318136
  Phil Hughes authored Jul 26, 2018
```
Fix timing in geo_nodes/components/app_spec.js

Closes #7012

See merge request gitlab-org/gitlab-ee!6661
```
  a4318136
- Fix timing in geo_nodes/components/app_spec.js · 7e55ac02
  Winnie Hellmann authored Jul 26, 2018
  
  7e55ac02
- Merge branch 'issue-boards-js-fix' into 'master' · 8f693d3c
  Tim Zallmann authored Jul 26, 2018
```
Fixed JS error in issue boards

See merge request gitlab-org/gitlab-ee!6660
```
  8f693d3c
- Merge branch 'ce-to-ee-2018-07-25' into 'master' · bcc6eef4
  Robert Speicher authored Jul 26, 2018
```
CE upstream - 2018-07-25 18:23 UTC

See merge request gitlab-org/gitlab-ee!6668
```
  bcc6eef4
- Add ms to setTimeout in app_spec · c4040355
  Paul Slaughter authored Jul 25, 2018
  
  c4040355
25 Jul, 2018 29 commits
- Merge branch 'gitlab-ce-32783-api-all-members-with-ancestors-ee' into 'master' · 01e78192
  Robert Speicher authored Jul 25, 2018
```
[EE] Resolve "API endpoint that returns all members, including the inherited membership through ancestor group"

See merge request gitlab-org/gitlab-ee!6669
```
  01e78192
- Resolve app/models/project_feature.rb · aad745c9
  Robert Speicher authored Jul 25, 2018
  
  aad745c9
- Resolve db/schema.rb · 384e6728
  Robert Speicher authored Jul 25, 2018
  
  384e6728
- Merge branch 'ee-ch-gitlab-ui-progress-bar' into 'master' · ba729a82
  Tim Zallmann authored Jul 25, 2018
```
Replace issues time tracking progress bar with gitlab-ui's progress bar (EE)

See merge request gitlab-org/gitlab-ee!6666
```
  ba729a82
- Merge remote-tracking branch... · f8a041cc
  Robert Speicher authored Jul 25, 2018
```
Merge remote-tracking branch 'ce/jacopo-beschi/gitlab-ce-32783-api-all-members-with-ancestors' into gitlab-ce-32783-api-all-members-with-ancestors-ee
```
  f8a041cc
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-25 · f4a5bfc3
  GitLab Bot authored Jul 25, 2018
```
# Conflicts:
#	app/models/project_feature.rb
#	db/schema.rb

[ci skip]
```
  f4a5bfc3
- Merge branch '49364-fix-broadcast-margin' into 'master' · 0fd8b7da
  Annabel Gray authored Jul 25, 2018
```
Resolve "Broadcast message is misaligned on sign in page"

Closes #49364

See merge request gitlab-org/gitlab-ce!20794
```
  0fd8b7da
- Merge branch '6064-geo-sql-query-for-counting-projects-with-wikis-is-very-slow' into 'master' · 6644041e
  Douglas Barbosa Alexandre authored Jul 25, 2018
```
Geo: Improve Geo Status API performance with cached counters in SiteStatistic

Closes #6064

See merge request gitlab-org/gitlab-ee!6328
```
  6644041e
- Geo: Improve Geo Status API performance with cached counters in SiteStatistic · 5b47b3b5
  Gabriel Mazetto authored Jul 25, 2018
  
  5b47b3b5
- Merge branch 'ce-6064-geo-sql-query-for-counting-projects-with-wikis-is-very-slow' into 'master' · 65d7ea10
  Douglas Barbosa Alexandre authored Jul 25, 2018
```
[CE Backport] Geo: Cache projects_count and wikis_count in SiteStatistic

See merge request gitlab-org/gitlab-ce!20413
```
  65d7ea10
- Merge branch '5158-frontend-metrics-alerting' into '5158-backend-metrics-alerting' · b53749e3
  Phil Hughes authored Jul 25, 2018
```
Frontend logic for MVC of SLI Alerts

See merge request gitlab-org/gitlab-ee!6656
```
  b53749e3
- Replace issues time tracking progress bar with gitlab-ui's progress bar (EE) · b1ab5c2e
  Clement Ho authored Jul 25, 2018
  
  b1ab5c2e
- Merge branch 'ce-to-ee-2018-07-25' into 'master' · 8223d547
  Lin Jen-Shin authored Jul 25, 2018
```
CE upstream - 2018-07-25 15:24 UTC

See merge request gitlab-org/gitlab-ee!6662
```
  8223d547
- Merge branch 'issue47716-email_confirmations-squash' into 'master' · a0779cbb
  Douwe Maan authored Jul 25, 2018
```
fixes #47716 where email confirmation fails after adding additional emails

Closes #47716

See merge request gitlab-org/gitlab-ce!20084
```
  a0779cbb
- fixes #47716 where email confirmation fails after adding additional emails · 42d44009
  Muhammad Nuzaihan authored Jul 25, 2018
  
  42d44009
- Merge branch 'sh-include-rbtrace' into 'master' · d8e75980
  Douwe Maan authored Jul 25, 2018
```
Add rbtrace to Gemfile

See merge request gitlab-org/gitlab-ce!20831
```
  d8e75980
- Resolve db/migrate/20180503193542_add_indexes_to_remote_mirror.rb · a58b3bd2
  Lin Jen-Shin authored Jul 25, 2018
  
  a58b3bd2
- Merge branch '3871-part-3' into 'master' · 1911375e
  Phil Hughes authored Jul 25, 2018
```
Resolve "Move EE JavaScript tests to their own respective directory"

See merge request gitlab-org/gitlab-ee!6655
```
  1911375e
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-25 · b37d0e6d
  GitLab Bot authored Jul 25, 2018
```
# Conflicts:
#	db/migrate/20180503193542_add_indexes_to_remote_mirror.rb

[ci skip]
```
  b37d0e6d
- Merge branch 'ce-to-ee-2018-07-25' into 'master' · df91318a
  Rémy Coutable authored Jul 25, 2018
```
CE upstream - 2018-07-25 12:22 UTC

See merge request gitlab-org/gitlab-ee!6659
```
  df91318a
- Adds changelog entry · 24bab47e
  Tiago Botelho authored Jul 25, 2018
  
  24bab47e
- Adds Frontend related changes to prometheus alerts · 84f3f2dd
  Tiago Botelho authored Jul 25, 2018
  
  84f3f2dd
- fixed tests · 80a06bc5
  Phil Hughes authored Jul 25, 2018
  
  80a06bc5
- Regenerated locale/gitlab.pot · 33dfca35
  Lin Jen-Shin authored Jul 25, 2018
  
  33dfca35
- Resolve conflicts for app/views/layouts · 692d049b
  Lin Jen-Shin authored Jul 25, 2018
  
  692d049b
- Resolve doc/api/users.md · 43c87a2f
  Lin Jen-Shin authored Jul 25, 2018
  
  43c87a2f
- Merge branch '49582-enable-cops-for-db' into 'master' · 3f14c56b
  Rémy Coutable authored Jul 25, 2018
```
Enable rubocop for db/**/* and ee/db/**/*

Closes #49582

See merge request gitlab-org/gitlab-ce!20834
```
  3f14c56b
- Merge branch 'ee-49582-enable-cops-for-db' into 'master' · b01739ac
  Rémy Coutable authored Jul 25, 2018
```
EE: Enable rubocop for db/**/* and ee/db/**/*

See merge request gitlab-org/gitlab-ee!6654
```
  b01739ac
- Fixed JS error in issue boards · 928cfd76
  Phil Hughes authored Jul 25, 2018
  
  928cfd76