Commits · 06970a7caf604269d32af33036a202b82242e003 · nexedi / gitlab-ce

25 Oct, 2018 40 commits
- Merge branch 'ce-to-ee-2018-10-25' into 'master' · 06970a7c
  🤖 GitLab Bot 🤖 authored Oct 25, 2018
```
CE upstream - 2018-10-25 22:21 UTC

See merge request gitlab-org/gitlab-ee!8093
```
  06970a7c
- Merge branch 'ee-an-multithreading' into 'master' · 13bad9df
  Stan Hu authored Oct 25, 2018
```
EE Counterpart: Puma in GDK and rack server lifecycle event abstractions

Closes gitlab-ce#52762

See merge request gitlab-org/gitlab-ee!8024
```
  13bad9df
- EE Counterpart: Puma in GDK and rack server lifecycle event abstractions · ad7222cb
  Andrew Newdigate authored Oct 25, 2018
  
  ad7222cb
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-25 · 523d47b2
  GitLab Bot authored Oct 25, 2018
  
  523d47b2
- Merge branch '40372-prometheus-dashboard-broken-on-firefox' into 'master' · bcbaccb9
  Clement Ho authored Oct 25, 2018
```
Resolve "Prometheus dashboard broken on Firefox"

Closes #40372

See merge request gitlab-org/gitlab-ce!22400
```
  bcbaccb9
- Merge branch '52993-ldap-rename_provider-rake-task-broken' into 'master' · 5c166337
  Nick Thomas authored Oct 25, 2018
```
Resolve "LDAP rename_provider rake task broken"

Closes #52993

See merge request gitlab-org/gitlab-ce!22582
```
  5c166337
- Merge branch 'ce-to-ee-2018-10-25' into 'master' · e7469c9e
  🤖 GitLab Bot 🤖 authored Oct 25, 2018
```
CE upstream - 2018-10-25 21:21 UTC

Closes gitlab-qa#235

See merge request gitlab-org/gitlab-ee!8092
```
  e7469c9e
- Merge branch 'winh-countdown-component' into 'master' · 3788b9c0
  Clement Ho authored Oct 25, 2018
```
Add reusable component for counting down

See merge request gitlab-org/gitlab-ce!22499
```
  3788b9c0
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-25 · b0ae8b9a
  GitLab Bot authored Oct 25, 2018
  
  b0ae8b9a
- Merge branch 'ce-to-ee-2018-10-25' into 'master' · 203ab1dc
  🤖 GitLab Bot 🤖 authored Oct 25, 2018
```
CE upstream - 2018-10-25 20:21 UTC

Closes gitlab-ce#42673

See merge request gitlab-org/gitlab-ee!8091
```
  203ab1dc
- Merge branch 'ee-51826-single-product-defintion-qa' into 'master' · ae2beb8c
  Douglas Barbosa Alexandre authored Oct 25, 2018
```
EE: Always use `attribute` to define the product

See merge request gitlab-org/gitlab-ee!8036
```
  ae2beb8c
- EE: Always use `attribute` to define the product · 73c87651
  Lin Jen-Shin authored Oct 25, 2018
  
  73c87651
- Merge branch '51826-single-product-defintion-qa' into 'master' · 507fe190
  Douglas Barbosa Alexandre authored Oct 25, 2018
```
Always use `attribute` to define the product

Closes gitlab-qa#235 and #51826

See merge request gitlab-org/gitlab-ce!22327
```
  507fe190
- Always use `attribute` to define the product · 51518019
  Lin Jen-Shin authored Oct 25, 2018
  
  51518019
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-25 · a91e81a7
  GitLab Bot authored Oct 25, 2018
  
  a91e81a7
- Merge branch 'ce-to-ee-2018-10-25' into 'master' · 2f7a084b
  🤖 GitLab Bot 🤖 authored Oct 25, 2018
```
CE upstream - 2018-10-25 19:21 UTC

See merge request gitlab-org/gitlab-ee!8090
```
  2f7a084b
- Merge branch 'jramsay-42673-commit-tooltip' into 'master' · bf96ec85
  Douwe Maan authored Oct 25, 2018
```
Add title to commit links in list view

Closes #42673

See merge request gitlab-org/gitlab-ce!22585
```
  bf96ec85
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-25 · 0d2ce3ea
  GitLab Bot authored Oct 25, 2018
  
  0d2ce3ea
- Use gitlab_environment for ldap rake task · 75cf7234
  Cindy Pallares authored Oct 24, 2018
  
  75cf7234
- Merge branch 'prettify-all-the-things-3' into 'master' · a97e599a
  Tim Zallmann authored Oct 25, 2018
```
Prettify all the things (part 3)

See merge request gitlab-org/gitlab-ce!22251
```
  a97e599a
- Merge branch 'ce-to-ee-2018-10-25' into 'master' · 81d27fd0
  🤖 GitLab Bot 🤖 authored Oct 25, 2018
```
CE upstream - 2018-10-25 17:21 UTC

See merge request gitlab-org/gitlab-ee!8089
```
  81d27fd0
- Add title to commit links in list view · aa73ef5b
  James Ramsay authored Oct 24, 2018
```
The short commit message may be truncated making the truncated
portion unreadable. The title of the link should be the commit message
so that the commit message is shown when hovering the commit message
anchor.

Closes gitlab-org/gitlab-ce#42673
```
  aa73ef5b
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-25 · 363a9640
  GitLab Bot authored Oct 25, 2018
  
  363a9640
- Merge branch 'ee-49565-ssh-push-mirroring' into 'master' · e3110c1a
  Robert Speicher authored Oct 25, 2018
```
EE port of "backport SSH host key detection code to CE"

See merge request gitlab-org/gitlab-ee!8065
```
  e3110c1a
- Merge branch 'ce-to-ee-2018-10-25' into 'master' · 8c85be90
  Robert Speicher authored Oct 25, 2018
```
CE upstream - 2018-10-25 15:21 UTC

See merge request gitlab-org/gitlab-ee!8086
```
  8c85be90
- Merge branch '49565-ssh-push-mirroring' into 'master' · 982276c3
  Robert Speicher authored Oct 25, 2018
```
Backport SSH host key detection code to CE

See merge request gitlab-org/gitlab-ce!22577
```
  982276c3
- Merge branch '7841-geo-deleting-a-project-leaves-orphaned-lfs-objects-around' into 'master' · 9dd69e8e
  Douglas Barbosa Alexandre authored Oct 25, 2018
```
Geo: Deleting a project leaves orphaned LFS objects and Job artifacts around

Closes #7841

See merge request gitlab-org/gitlab-ee!8031
```
  9dd69e8e
- Add validation for date strings passed to GlCountdown · 6bf2cb91
  Winnie Hellmann authored Oct 24, 2018
  
  6bf2cb91
- Add reusable component for counting down · 6e680647
  Winnie Hellmann authored Oct 19, 2018
  
  6e680647
- Add calculateRemainingMilliseconds() helper function · 50222d4d
  Winnie Hellmann authored Oct 19, 2018
  
  50222d4d
- Move datetime_utility_spec.js to correct location · 048ec287
  Winnie Hellmann authored Oct 19, 2018
  
  048ec287
- Merge branch 'sh-update-parser' into 'master' · c2a8cd05
  Robert Speicher authored Oct 25, 2018
```
Upgrade parser gem to 2.5.1.2

See merge request gitlab-org/gitlab-ce!22590
```
  c2a8cd05
- Resolve merge conflicts for EE-specific changes · d5f38961
  Kushal Pandya authored Oct 25, 2018
  
  d5f38961
- Merge branch 'jej/group-saml-metadata-common-changes' into 'master' · 89571f3f
  Kamil Trzciński authored Oct 25, 2018
```
Extract SAML refactoring from metadata MR

See merge request gitlab-org/gitlab-ee!7997
```
  89571f3f
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-25 · 5a91632d
  GitLab Bot authored Oct 25, 2018
```
# Conflicts:
#	app/assets/javascripts/issuable_form.js

[ci skip]
```
  5a91632d
- Merge branch 'mj/review-apps-guard' into 'master' · 4de90041
  Robert Speicher authored Oct 25, 2018
```
Review apps cleanup schedule runs on master

See merge request gitlab-org/gitlab-ce!22601
```
  4de90041
- Merge branch 'ce-to-ee-2018-10-25' into 'master' · 653f7a91
  Filipa Lacerda authored Oct 25, 2018
```
CE upstream - 2018-10-25 12:21 UTC

See merge request gitlab-org/gitlab-ee!8083
```
  653f7a91
- Review apps cleanup schedule runs on master · 309d3ebb
  Marin Jankovski authored Oct 25, 2018
  
  309d3ebb
- Merge branch '53055-combine-date-util-functions' into 'master' · 86d8fd86
  Filipa Lacerda authored Oct 25, 2018
```
Combine all datetime library functions into `datetime_utility.js`

This MR moves datetime methods from `app/assets/javascripts/lib/utils/pretty_time.js` & `app/assets/javascripts/lib/utils/datefix.js` into `app/assets/javascripts/lib/utils/datetime_utility.js`.

Closes #53055

See merge request gitlab-org/gitlab-ce!22570
```
  86d8fd86
- Merge branch 'ee-53055-combine-date-util-functions' into 'master' · 75100705
  Filipa Lacerda authored Oct 25, 2018
```
EE Port: Combine all datetime library functions into `datetime_utility.js`

See merge request gitlab-org/gitlab-ee!8081
```
  75100705