Commits · a4e4b66bed603b68196d9206d941847b3676499d · nexedi / gitlab-ce

01 Jul, 2018 8 commits
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-01 · a4e4b66b
  GitLab Bot authored Jul 01, 2018
  
  a4e4b66b
- Merge branch 'ccr/add_locked_state' into 'master' · 3cf68362
  Rémy Coutable authored Jul 01, 2018
```
Add locked state to merge request API

See merge request gitlab-org/gitlab-ce!20186
```
  3cf68362
- Merge branch 'ee-ccr/add_locked_state' into 'master' · 972d01b9
  Rémy Coutable authored Jul 01, 2018
```
Port of ccr/add_locked_state to EE

See merge request gitlab-org/gitlab-ee!6307
```
  972d01b9
- Merge branch 'bcrypt-update' into 'master' · 61c17b25
  Rémy Coutable authored Jul 01, 2018
```
update to support latest bcrypt. resolves #48149

Closes #48149

See merge request gitlab-org/gitlab-ce!20260
```
  61c17b25
- update to support latest bcrypt. resolves #48149 · 912fe2c5
  Muhammad Nuzaihan authored Jul 01, 2018
  
  912fe2c5
- Merge branch 'i18n-extract-app/views/projects-settings' into 'master' · 7f9dfacf
  Rémy Coutable authored Jul 01, 2018
```
i18n: externalize strings from 'app/views/projects/settings'

See merge request gitlab-org/gitlab-ce!19821
```
  7f9dfacf
- Merge branch 'docs-ee-features-link' into 'master' · 59804e26
  Rémy Coutable authored Jul 01, 2018
```
Update ee_features.md to fix link

See merge request gitlab-org/gitlab-ce!20283
```
  59804e26
- i18n: externalize strings from 'app/views/projects/settings' · 9e99eb6c
  Tao Wang authored Jun 14, 2018
```
Signed-off-by: Tao Wang <twang2218@gmail.com>
```
  9e99eb6c
30 Jun, 2018 16 commits
- Merge branch 'ce-to-ee-2018-06-30' into 'master' · 37b56ca8
  Stan Hu authored Jun 30, 2018
```
CE upstream - 2018-06-30 15:21 UTC

See merge request gitlab-org/gitlab-ee!6339
```
  37b56ca8
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-30 · fe436498
  GitLab Bot authored Jun 30, 2018
  
  fe436498
- Merge branch 'tz-mr-diff-performance' into 'master' · 923172c9
  Fatih Acet authored Jun 30, 2018
```
Performance Improvements to Vue MR page

Closes #48492

See merge request gitlab-org/gitlab-ce!20246
```
  923172c9
- Performance Improvements to Vue MR page · fb44cb3d
  Tim Zallmann authored Jun 30, 2018
  
  fb44cb3d
- Merge branch 'ee-tz-mr-diff-performance' into 'master' · 06dcd2f3
  Fatih Acet authored Jun 30, 2018
```
EE-Port: Performance Improvements to Vue MR page

See merge request gitlab-org/gitlab-ee!6326
```
  06dcd2f3
- EE-Port: Performance Improvements to Vue MR page · f704d542
  Tim Zallmann authored Jun 30, 2018
  
  f704d542
- Update ee_features.md to fix link · a0f3c585
  Marcel Amirault authored Jun 30, 2018
  
  a0f3c585
- 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 16 commits
- Port of ccr/add_locked_state to EE · 2d88d6cf
  Chantal Rollison authored Jun 26, 2018
  
  2d88d6cf
- 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