Commits · f704d542530406410c0a6a53721de83ba411cca5 · nexedi / gitlab-ce

30 Jun, 2018 10 commits
- EE-Port: Performance Improvements to Vue MR page · f704d542
  Tim Zallmann authored Jun 30, 2018
  
  f704d542
- Merge branch 'ce-to-ee-2018-06-30' into 'master' · 0447d65f
  Stan Hu authored Jun 30, 2018
```
CE upstream - 2018-06-30 06:21 UTC

See merge request gitlab-org/gitlab-ee!6338
```
  0447d65f
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-30 · 7a1e6fed
  GitLab Bot authored Jun 30, 2018
  
  7a1e6fed
- Merge branch 'ce-to-ee-2018-06-30' into 'master' · b21bd8bb
  Stan Hu authored Jun 30, 2018
```
CE upstream - 2018-06-30 03:21 UTC

See merge request gitlab-org/gitlab-ee!6337
```
  b21bd8bb
- Merge branch 'bw-fix-ee-dashboard' into 'master' · 3a3233a5
  Stan Hu authored Jun 30, 2018
```
EE/Geo information paritals not rendered on dashboard

See merge request gitlab-org/gitlab-ce!20276
```
  3a3233a5
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-30 · 4bd543e8
  GitLab Bot authored Jun 30, 2018
  
  4bd543e8
- Merge branch 'docs/install-requirements' into 'master' · 854d39ad
  Mike Lewis authored Jun 30, 2018
```
Update requirements.md to make 8GB the minimum instance size

See merge request gitlab-org/gitlab-ce!20133
```
  854d39ad
- namespace partial paths on dashboard · bd2e41aa
  Brett Walker authored Jun 29, 2018
  
  bd2e41aa
- Merge branch 'ce-to-ee-2018-06-30' into 'master' · 31903a27
  Stan Hu authored Jun 30, 2018
```
CE upstream - 2018-06-30 00:21 UTC

See merge request gitlab-org/gitlab-ee!6336
```
  31903a27
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-30 · 72086c4c
  GitLab Bot authored Jun 30, 2018
  
  72086c4c
29 Jun, 2018 30 commits
- Merge branch 'ce-to-ee-2018-06-29' into 'master' · 9bb4ee9e
  Stan Hu authored Jun 29, 2018
```
CE upstream - 2018-06-29 21:22 UTC

See merge request gitlab-org/gitlab-ee!6334
```
  9bb4ee9e
- Merge branch '48495-merge-request-collapse-icon-is-tiny' into 'master' · 00c1a58b
  Fatih Acet authored Jun 29, 2018
```
Resolve "Merge request collapse icon is tiny"

Closes #48495

See merge request gitlab-org/gitlab-ce!20267
```
  00c1a58b
- Resolve "Merge request collapse icon is tiny" · 9ecb06ae
  Tim Zallmann authored Jun 29, 2018
  
  9ecb06ae
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-29 · 7614e169
  GitLab Bot authored Jun 29, 2018
  
  7614e169
- Merge branch 'include-all-axios-requests-in-performance-bar' into 'master' · e325367a
  Mike Greiling authored Jun 29, 2018
```
Start performance bar eagerly

See merge request gitlab-org/gitlab-ce!20201
```
  e325367a
- Merge branch 'fix-tooltip-flicker' into 'master' · 83ea3d68
  Mike Greiling authored Jun 29, 2018
```
Fix tooltip flicker

Closes #48614

See merge request gitlab-org/gitlab-ce!20270
```
  83ea3d68
- Fix tooltip flicker · f2cf9b9e
  Clement Ho authored Jun 29, 2018
  
  f2cf9b9e
- Merge branch '47516-pipe-scroll' into 'master' · fb770344
  Mike Greiling authored Jun 29, 2018
```
Resolve "Tooltips scroll along the list within Pipeline jobs dropdown on MR widget"

Closes #47516

See merge request gitlab-org/gitlab-ce!20171
```
  fb770344
- Resolve "Tooltips scroll along the list within Pipeline jobs dropdown on MR widget" · e64d4fd3
  Simon Knox authored Jun 29, 2018
  
  e64d4fd3
- Merge branch '47661-merge-request-box-disappearing-on-chrome' into 'master' · 906e07fb
  Mike Greiling authored Jun 29, 2018
```
Replace deprecated bs.affix in merge request tabs with sticky polyfill

Closes #47661

See merge request gitlab-org/gitlab-ce!20269
```
  906e07fb
- Replace deprecated bs.affix in merge request tabs with sticky polyfill · e5b406d6
  Clement Ho authored Jun 29, 2018
  
  e5b406d6
- Merge branch '47865-changelog-for-style-updates' into 'master' · 436d17a0
  Clement Ho authored Jun 29, 2018
```
Update personal access token form styles

See merge request gitlab-org/gitlab-ce!20275
```
  436d17a0
- Merge branch 'ce-to-ee-2018-06-29' into 'master' · a4deb7c4
  Clement Ho authored Jun 29, 2018
```
CE upstream - 2018-06-29 18:21 UTC

See merge request gitlab-org/gitlab-ee!6332
```
  a4deb7c4
- Replace .scope-description with .text-secondary · 8b6ff3e0
  Paul Slaughter authored Jun 29, 2018
  
  8b6ff3e0
- Merge branch '5956-auto-devops-multi-cluster-help-text' into 'master' · 1426dfed
  Fatih Acet authored Jun 29, 2018
```
Quick link fixes to "Update auto devops flow to support multi-cluster setup"

Closes #5956

See merge request gitlab-org/gitlab-ee!6088
```
  1426dfed
- Merge branch... · 016707e4
  Fatih Acet authored Jun 29, 2018
```
Merge branch '48603-merge-request-refactor-title-and-copy-to-clipboard-button-are-behind-the-action-buttons' into 'master'

Resolve "Merge request refactor: Title and copy to clipboard button are behind the action buttons"

Closes #48603

See merge request gitlab-org/gitlab-ce!20274
```
  016707e4
- Resolve "Merge request refactor: Title and copy to clipboard button are behind the action buttons" · 28170488
  André Luís authored Jun 29, 2018
  
  28170488
- Resolve merge conflicts in 'settings.scss' · 9e25def2
  Paul Slaughter authored Jun 29, 2018
  
  9e25def2
- Add changelog for personal access token style updates · 2cd08579
  Paul Slaughter authored Jun 29, 2018
  
  2cd08579
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-29 · 3fb488d1
  GitLab Bot authored Jun 29, 2018
```
# Conflicts:
#	app/assets/stylesheets/pages/settings.scss

[ci skip]
```
  3fb488d1
- Merge branch 'da-exclusive-lease-helpers' into 'master' · efaca5de
  Robert Speicher authored Jun 29, 2018
```
Add helper methods to stub Gitlab::ExclusiveLease

See merge request gitlab-org/gitlab-ce!20253
```
  efaca5de
- Merge branch 'ee-da-exclusive-lease-helpers' into 'master' · b957b2b5
  Robert Speicher authored Jun 29, 2018
```
[EE] Add helper methods to stub Gitlab::ExclusiveLease

See merge request gitlab-org/gitlab-ee!6322
```
  b957b2b5
- Merge branch 'ce-to-ee-2018-06-28' into 'master' · f6dbacb8
  Robert Speicher authored Jun 29, 2018
```
CE upstream - 2018-06-28 18:21 UTC

See merge request gitlab-org/gitlab-ee!6321
```
  f6dbacb8
- Merge branch 'i18n-extract-app/views/admin-identities' into 'master' · 70cf3bff
  Rémy Coutable authored Jun 29, 2018
```
i18n: externalize strings from 'app/views/admin/identities'

See merge request gitlab-org/gitlab-ce!19927
```
  70cf3bff
- Merge branch '47865-access-token-for-projects-fe' into 'master' · af848e4c
  Clement Ho authored Jun 29, 2018
```
Style updates for personal access token form

See merge request gitlab-org/gitlab-ce!20052
```
  af848e4c
- Style updates for personal access token form · 07e4455e
  Paul Slaughter authored Jun 29, 2018
  
  07e4455e
- Merge branch '48497-merge-request-refactor-displays-changes-dropdown-incorrectly-fix' into 'master' · 1503e899
  Tim Zallmann authored Jun 29, 2018
```
Resolve "Merge request refactor displays changes dropdown incorrectly"

Closes #48497

See merge request gitlab-org/gitlab-ce!20245
```
  1503e899
- Resolve "Merge request refactor displays changes dropdown incorrectly" · 60379c7c
  Constance Okoghenun authored Jun 29, 2018
  
  60379c7c
- Merge branch 'ide-more-error-improvements' into 'master' · a0ff7724
  Filipa Lacerda authored Jun 29, 2018
```
Improve error messaging across various IDE actions

See merge request gitlab-org/gitlab-ce!20241
```
  a0ff7724
- Merge branch 'backstage/gb/stages-position-migration-clean-up' into 'master' · 2c22c17b
  Nick Thomas authored Jun 29, 2018
```
Add pipeline stages position clean-up migration

Closes #45956

See merge request gitlab-org/gitlab-ce!19369
```
  2c22c17b