Commits · 83940d149dbd83e7af52786d2b690a2cfff51c3a · nexedi / gitlab-ce

07 Aug, 2018 11 commits
- Ee 36409 frontend for clarifying the usefulness of the search bar · 83940d14
  Dennis Tang authored Aug 07, 2018
  
  83940d14
- Merge branch 'ce-to-ee-2018-08-07' into 'master' · f896f1fc
  Marin Jankovski authored Aug 07, 2018
```
CE upstream - 2018-08-07 00:21 UTC

See merge request gitlab-org/gitlab-ee!6817
```
  f896f1fc
- Merge branch 'docs-codequality-version' into 'master' · 37e80aee
  Achilleas Pipinellis authored Aug 07, 2018
```
Code Quality is supported on GitLab >= 10.4

Closes gitlab-ce#49516

See merge request gitlab-org/gitlab-ee!6809
```
  37e80aee
- Code Quality is supported on GitLab >= 10.4 · 3b08d036
  Matija Čupić authored Aug 07, 2018
  
  3b08d036
- Merge branch 'docs-redis-sentinel-master-password' into 'master' · 618d674a
  Achilleas Pipinellis authored Aug 07, 2018
```
need redis[master_password] instead of redis[password]

See merge request gitlab-org/gitlab-ee!6791
```
  618d674a
- Merge branch 'docs-update-ha-docs-with-output-for-repmgr-master-check' into 'master' · f017e331
  Achilleas Pipinellis authored Aug 07, 2018
```
adding some output to repmgr master check command

See merge request gitlab-org/gitlab-ee!6769
```
  f017e331
- adding some output to repmgr master check command · 4729f2a2
  Aric Buerer authored Aug 07, 2018
  
  4729f2a2
- Resolve conflicts for locale/gitlab.pot · a870c481
  Filipa Lacerda authored Aug 07, 2018
  
  a870c481
- Merge branch '7128-increase-width-of-left-column-in-reports-modal' into 'master' · c70580c0
  Filipa Lacerda authored Aug 07, 2018
```
Resolve "Increase width of left column in reports modal"

Closes #7128

See merge request gitlab-org/gitlab-ee!6808
```
  c70580c0
- Merge branch '6293-persisted-roadmap-preset' into 'master' · 05768db8
  Kamil Trzciński authored Aug 07, 2018
```
Persist Epic Roadmap timescale choice

Closes #6293

See merge request gitlab-org/gitlab-ee!6637
```
  05768db8
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-08-07 · 5a418beb
  GitLab Bot authored Aug 07, 2018
```
# Conflicts:
#	locale/gitlab.pot

[ci skip]
```
  5a418beb
06 Aug, 2018 29 commits
- Merge branch 'mg-backport-create-item-dropdown-changes' into 'master' · dd627072
  Fatih Acet authored Aug 06, 2018
```
Update CreateItemDropdown class to allow the glDropdown filterRemote option

See merge request gitlab-org/gitlab-ce!21041
```
  dd627072
- Update CreateItemDropdown class to allow the glDropdown filterRemote option · a8c9cd41
  Mike Greiling authored Aug 06, 2018
  
  a8c9cd41
- Merge branch '47156-improve-auto-devops-settings' into 'master' · ac1d83c5
  Clement Ho authored Aug 06, 2018
```
Resolve "Improve Auto DevOps settings flow for admin and project"

Closes #47156

See merge request gitlab-org/gitlab-ce!20946
```
  ac1d83c5
- Resolve "Improve Auto DevOps settings flow for admin and project" · e3127132
  Mike Greiling authored Aug 06, 2018
  
  e3127132
- Merge branch 'ce-to-ee-2018-08-06' into 'master' · 5d5a96c6
  Stan Hu authored Aug 06, 2018
```
CE upstream - 2018-08-06 18:21 UTC

See merge request gitlab-org/gitlab-ee!6814
```
  5d5a96c6
- Resolve conflicts in locale/gitlab.pot · 7e4e1c0a
  Stan Hu authored Aug 06, 2018
  
  7e4e1c0a
- Resolve conflicts in config/application.rb · 04502c06
  Stan Hu authored Aug 06, 2018
  
  04502c06
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-08-06 · 160e5b5d
  GitLab Bot authored Aug 06, 2018
```
# Conflicts:
#	config/application.rb
#	locale/gitlab.pot

[ci skip]
```
  160e5b5d
- Merge branch 'ce-to-ee-2018-08-04' into 'master' · 00a1309e
  Mike Greiling authored Aug 06, 2018
```
CE upstream - 2018-08-04 09:23 UTC

See merge request gitlab-org/gitlab-ee!6797
```
  00a1309e
- Merge branch 'sh-support-bitbucket-server-import' into 'master' · d737abc5
  Tim Zallmann authored Aug 06, 2018
```
Add support for Bitbucket Server imports

Closes #25393

See merge request gitlab-org/gitlab-ce!20164
```
  d737abc5
- Merge branch '7124-open-view-full-report-in-new-window' into 'master' · f7b9237b
  Filipa Lacerda authored Aug 06, 2018
```
Resolve "Open "View full report" in new window"

Closes #7124

See merge request gitlab-org/gitlab-ee!6806
```
  f7b9237b
- Resolve "Open "View full report" in new window" · a3dbbb87
  Sam Beckham authored Aug 06, 2018
  
  a3dbbb87
- Merge branch '48419-charts-with-long-label-appear-oversized' into 'master' · 0ffd7931
  Clement Ho authored Aug 06, 2018
```
Resolve "Charts with long label appear oversized"

Closes #48419

See merge request gitlab-org/gitlab-ce!20866
```
  0ffd7931
- Merge branch '7065-performance-metrics-not-rendered-properly-in-merge-request-widget-ee' · b19ee556
  Philippe Lafoucrière authored Aug 06, 2018
  
  b19ee556
- Make roadmap_layout lowercase · c1908746
  Mark Chao authored Aug 07, 2018
  
  c1908746
- Merge branch 'revert-77c75d2b' into 'master' · e8b5bbf1
  Jose Ivan Vargas authored Aug 06, 2018
```
Revert "Merge branch 'bvl-instance-stats-default' into 'master'"

See merge request gitlab-org/gitlab-ce!21054
```
  e8b5bbf1
- Simplify importer_status.js failed status implementation · ee851e58
  Stan Hu authored Aug 06, 2018
  
  ee851e58
- Merge branch '48657-persist-auto-devops-banner-dismissal-per-user-cookie' into 'master' · 1fb648a3
  Fatih Acet authored Aug 06, 2018
```
Persist 'auto devops' banner dismissal globally

Closes #48657

See merge request gitlab-org/gitlab-ce!20540
```
  1fb648a3
- Merge branch 'background-migrations-system-load' into 'master' · 964d9f43
  Stan Hu authored Aug 06, 2018
```
Respond to DB health in background migrations

See merge request gitlab-org/gitlab-ce!20720
```
  964d9f43
- Merge branch... · 0995bb01
  samdbeckham authored Aug 06, 2018
```
Merge branch '7065-performance-metrics-not-rendered-properly-in-merge-request-widget-ee' of gitlab.com:gitlab-org/gitlab-ee into 7065-performance-metrics-not-rendered-properly-in-merge-request-widget-ee
```
  0995bb01
- Adds a css class for mr reports to render them correctly · 35c061ab
  samdbeckham authored Aug 03, 2018
  
  35c061ab
- Merge branch '48442-rebase-grammar-docs' into 'master' · 0277bf92
  Mike Lewis authored Aug 06, 2018
```
Correct grammar on "Introduction to Git Flow" page in documentation

See merge request gitlab-org/gitlab-ee!6777
```
  0277bf92
- Merge branch 'issue_44821' into 'master' · b4415c01
  Sean McGivern authored Aug 06, 2018
```
Retrieve merge request closing issues from database cache

Closes #44821

See merge request gitlab-org/gitlab-ce!20911
```
  b4415c01
- Revert "Merge branch 'bvl-instance-stats-default' into 'master'" · e96862f2
  Bob Van Landuyt authored Aug 06, 2018
```
This reverts merge request !21044
```
  e96862f2
- fix environment_item conflicts · 48d5e55d
  Jose Vargas authored Aug 06, 2018
  
  48d5e55d
- Merge branch... · 0dd1aded
  samdbeckham authored Aug 06, 2018
```
Merge branch '7065-performance-metrics-not-rendered-properly-in-merge-request-widget-ee' of gitlab.com:gitlab-org/gitlab-ee into 7065-performance-metrics-not-rendered-properly-in-merge-request-widget-ee
```
  0dd1aded
- Adds a css class for mr reports to render them correctly · cf766c1f
  samdbeckham authored Aug 03, 2018
  
  cf766c1f
- Retrieve merge request closing issues from database cache · fdb5f285
  Felipe Artur authored Jul 30, 2018
  
  fdb5f285
- Adds the changelog · 331b360e
  samdbeckham authored Aug 06, 2018
  
  331b360e