Commits · df3cd9723f90707c4fac4116e0cd414ca98d1e37 · nexedi / gitlab-ce

12 Jun, 2018 5 commits
- Merge branch 'update-profile-preferences-docs' into 'master' · df3cd972
  Marcia Ramos authored Jun 12, 2018
```
Add navigation theme documentation

See merge request gitlab-org/gitlab-ce!19645
```
  df3cd972
- Merge branch 'ee-unify-ci-variables-form-row' into 'master' · 572d3940
  Kamil Trzciński authored Jun 12, 2018
```
Unify app/views/ci/variables/_variable_row.html.haml

See merge request gitlab-org/gitlab-ee!6063
```
  572d3940
- Merge branch 'jr-6237-mirroring-hook-docs' into 'master' · 862c3656
  Douwe Maan authored Jun 12, 2018
```
Add example `pre-receive` mirroring hook for bidirectional mirroring

Closes #6237

See merge request gitlab-org/gitlab-ee!5891
```
  862c3656
- Merge branch '6382-remove-lfs-warning-from-ee-import-interface' into 'master' · 8c1ebc8a
  Douwe Maan authored Jun 12, 2018
```
Remove LFS warning from EE import interface

Closes #6382

See merge request gitlab-org/gitlab-ee!6083
```
  8c1ebc8a
- Merge branch '6169-add-security-reports-pipeline-view' into 'master' · 61c45e10
  Phil Hughes authored Jun 12, 2018
```
Resolve "Add DAST reports at pipeline level"

Closes #6169 and #6168

See merge request gitlab-org/gitlab-ee!6040
```
  61c45e10
11 Jun, 2018 35 commits
- Merge branch 'docs-ce-t-ee-11-0-guide' into 'master' · d8f4994f
  Mayra Cabrera authored Jun 11, 2018
```
Adss ce to ee guide for 11-0

See merge request gitlab-org/gitlab-ee!5937
```
  d8f4994f
- Merge branch 'ce-to-ee-2018-06-11' into 'master' · 936205eb
  Robert Speicher authored Jun 11, 2018
```
CE upstream - 2018-06-11 15:23 UTC

Closes gitaly#1215

See merge request gitlab-org/gitlab-ee!6079
```
  936205eb
- Merge branch 'ee-47338-sign-in-btn' into 'master' · b9eb0b32
  Clement Ho authored Jun 11, 2018
```
Fix alignment of sign in/sign up button

See merge request gitlab-org/gitlab-ee!6062
```
  b9eb0b32
- Remove outdated LFS warning · a144f399
  James Ramsay authored Jun 11, 2018
```
Support for LFS object import was added by gitlab-org/gitlab-ce!18871
```
  a144f399
- Fix alignment of sign in/sign up button · 6efdfd06
  Clement Ho authored Jun 11, 2018
  
  6efdfd06
- Use regex to whitelist branches to proxy · a43d52e5
  James Ramsay authored Jun 11, 2018
  
  a43d52e5
- Add GitFusion settings and doc link · 90205cc5
  James Ramsay authored May 29, 2018
  
  90205cc5
- Add example pre-receive hook · b8c98df5
  James Ramsay authored May 29, 2018
  
  b8c98df5
- Merge branch 'use-tooltip-component-in-mr-widget-secondary-geo-node-component' into 'master' · f7199cc6
  Filipa Lacerda authored Jun 11, 2018
```
Use tooltip component in MrWidgetSecondaryGeoNode vue component

See merge request gitlab-org/gitlab-ee!6078
```
  f7199cc6
- Update project_spec.rb · 5ae11a3c
  Francisco Javier López authored Jun 11, 2018
  
  5ae11a3c
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-11 · d76db397
  GitLab Bot authored Jun 11, 2018
```
# Conflicts:
#	spec/models/project_spec.rb

[ci skip]
```
  d76db397
- Update title attribute for ApprovalsBody vue component · 63b89cc6
  George Tsiolis authored Jun 11, 2018
  
  63b89cc6
- Adds dast and container scanning reports to summary widget in pipeline view · 18544247
  Filipa Lacerda authored Jun 11, 2018
  
  18544247
- Merge branch '47684-uploads-specs-are-failing-on-master' into 'master' · 75797ac3
  Sean McGivern authored Jun 11, 2018
```
Resolve "Uploads specs are failing on master"

Closes #47684

See merge request gitlab-org/gitlab-ce!19638
```
  75797ac3
- Merge branch 'sh-add-deletion-events-in-transaction' into 'master' · 22dcb132
  Robert Speicher authored Jun 11, 2018
```
During a project destroy, log the audit and Geo events within the transaction

See merge request gitlab-org/gitlab-ee!6059
```
  22dcb132
- Merge branch 'ce-to-ee-2018-06-11' into 'master' · cf91ff1c
  Rémy Coutable authored Jun 11, 2018
```
CE upstream - 2018-06-11 09:22 UTC

Closes gitlab-qa#269

See merge request gitlab-org/gitlab-ee!6073
```
  cf91ff1c
- Merge branch '6366_fix_vulnerability_confidence_and_severity_display' into 'master' · 534620a7
  Filipa Lacerda authored Jun 11, 2018
```
Ensure Severity and Confidence are displayed independently for SAST vulnerabilities.

See merge request gitlab-org/gitlab-ee!6065
```
  534620a7
- Ensure Severity and Confidence are displayed independently for SAST vulnerabilities. · b1089f78
  Olivier Gonzalez authored Jun 11, 2018
  
  b1089f78
- Merge branch 'ide-etag-polling' into 'master' · 3bd5e10e
  Filipa Lacerda authored Jun 11, 2018
```
Fix IDE pipelines eTagPoll not stopping

Closes #47678

See merge request gitlab-org/gitlab-ce!19636
```
  3bd5e10e
- Merge branch 'docs-11-0-installation-from-source-guide' into 'master' · 1de36a68
  Mayra Cabrera authored Jun 11, 2018
```
Update installation from source guide

See merge request gitlab-org/gitlab-ce!19320
```
  1de36a68
- Merge branch 'leipert-add-memory-info' into 'master' · 35748c08
  Tim Zallmann authored Jun 11, 2018
```
Set `max_old_space_size` option of node to 3.5GB during compile:assets

See merge request gitlab-org/gitlab-ce!19624
```
  35748c08
- Merge branch 'sh-suppress-env-leaks' into 'master' · 6d92a7a0
  Kamil Trzciński authored Jun 11, 2018
```
Prevent ENV from leaking variables in CI output

See merge request gitlab-org/gitlab-ce!19607
```
  6d92a7a0
- Use Tooltip component in MrWidgetSecondaryGeoNode vue component · ea1831d5
  George Tsiolis authored Jun 11, 2018
  
  ea1831d5
- Merge branch 'use-tooltip-component-in-mr-widget-author-time-component' into 'master' · 61ac2462
  Filipa Lacerda authored Jun 11, 2018
```
Use Tooltip component in MrWidgetAuthorTime vue component

See merge request gitlab-org/gitlab-ce!19635
```
  61ac2462
- Merge branch 'fj-relax-url-validator-rules-for-user' into 'master' · e6a5d3cc
  Douwe Maan authored Jun 11, 2018
```
Avoid checking the user format in every url validation

Closes #47526

See merge request gitlab-org/gitlab-ce!19575
```
  e6a5d3cc
- Avoid checking the user format in every url validation · 1418afc2
  Francisco Javier López authored Jun 11, 2018
  
  1418afc2
- Merge branch 'ee-fj-relax-url-validator-rules-for-user' into 'master' · f1436a2e
  Douwe Maan authored Jun 11, 2018
```
Adding parameter to UrlValidator to check the user

See merge request gitlab-org/gitlab-ee!6075
```
  f1436a2e
- Adding parameter to UrlValidator to check the user · 9993b6e3
  Francisco Javier López authored Jun 11, 2018
  
  9993b6e3
- Merge branch 'ee-unify-views-search-results' into 'master' · 7ac7691d
  Douwe Maan authored Jun 11, 2018
```
EE: Hide project name if searching against a project

See merge request gitlab-org/gitlab-ee!6076
```
  7ac7691d
- Merge branch 'unify-views-search-results' into 'master' · 180dc237
  Douwe Maan authored Jun 11, 2018
```
Hide project name if searching against a project

See merge request gitlab-org/gitlab-ce!19595
```
  180dc237
- Merge branch 'gitaly-1215-ca-count-commits' into 'master' · 77032638
  Sean McGivern authored Jun 11, 2018
```
Migrate CycleAnalytics::CommitCount to Gitaly

Closes gitaly#1215

See merge request gitlab-org/gitlab-ce!19481
```
  77032638
- Migrate CycleAnalytics::CommitCount to Gitaly · 1d50b6a4
  Kim Carlbäcker authored Jun 11, 2018
  
  1d50b6a4
- Hide project name if searching against a project · 41cfe904
  Lin Jen-Shin authored Jun 11, 2018
  
  41cfe904
- Unify app/views/search/results by using EE · a038083e
  Lin Jen-Shin authored Jun 09, 2018
  
  a038083e
- resolve conflict in Gemfile.lock · 8646f517
  Lukas Eipert authored Jun 11, 2018
  
  8646f517