Commits · 9de6cf95261dc580be69843e3e545f69f5dfcd4e · nexedi / gitlab-ce

10 Jul, 2019 40 commits
- Resolve "Move approval user password input from inline to a modal" · 9de6cf95
  Justin Boyson authored Jul 10, 2019
  
  9de6cf95
- Automatic merge of gitlab-org/gitlab-ce master · 51581edf
  GitLab Bot authored Jul 10, 2019
  
  51581edf
- Merge branch 'rf-optional-pipeline-for-vulnerabilities-api' into 'master' · 19a8a3d5
  Douwe Maan authored Jul 10, 2019
```
Vulnerabilities API now supports pipeline_id

See merge request gitlab-org/gitlab-ce!30086
```
  19a8a3d5
- Vulnerabilities API now supports pipeline_id · 39757992
  rossfuhrman authored Jul 10, 2019
  
  39757992
- Merge branch 'rf-optional-pipeline-for-vulnerabilities-api' into 'master' · 3f85b4c2
  Douwe Maan authored Jul 10, 2019
```
Vulnerabilities API now takes optional pipeline_id

See merge request gitlab-org/gitlab-ee!14376
```
  3f85b4c2
- Vulnerabilities API now takes optional pipeline_id · d4a5d5b0
  rossfuhrman authored Jul 10, 2019
```
Vulnerabilities API results can now be limited to a given pipeline.
```
  d4a5d5b0
- Merge branch 'winh-notes-service-deleteNote' into 'master' · af272692
  Clement Ho authored Jul 10, 2019
```
Remove deleteNote from notes service

See merge request gitlab-org/gitlab-ce!30537
```
  af272692
- Remove deleteNote from notes service · 49d5cc34
  Winnie Hellmann authored Jul 10, 2019
  
  49d5cc34
- Automatic merge of gitlab-org/gitlab-ce master · fe73e0db
  GitLab Bot authored Jul 10, 2019
  
  fe73e0db
- Merge branch 'project-dashboards-docs' into 'master' · 42659759
  Achilleas Pipinellis authored Jul 10, 2019
```
Add docs on project-based dashboard config

See merge request gitlab-org/gitlab-ce!28154
```
  42659759
- Add docs on project-based dashboard config · 35256212
  Sarah Yasonik authored Jul 10, 2019
  
  35256212
- Automatic merge of gitlab-org/gitlab-ce master · 96b7f8a9
  GitLab Bot authored Jul 10, 2019
  
  96b7f8a9
- Merge branch '62363-follow-up-from-move-more-project-routes-under-scope' into 'master' · 1dcb9b7d
  Lin Jen-Shin authored Jul 10, 2019
```
Add controller spec for deploy tokens

Closes #62363

See merge request gitlab-org/gitlab-ce!30311
```
  1dcb9b7d
- Add routing spec for deploy_tokens controller · 914c7c25
  Dmitriy Zaporozhets authored Jul 10, 2019
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  914c7c25
- Automatic merge of gitlab-org/gitlab-ce master · de9a13eb
  GitLab Bot authored Jul 10, 2019
  
  de9a13eb
- Merge branch '63044-cluster-health-group-refactor' into 'master' · 2d9cd76f
  Douglas Barbosa Alexandre authored Jul 10, 2019
```
Refactor common_metrics importer into a more extensible pattern

Closes #63044

See merge request gitlab-org/gitlab-ce!30012
```
  2d9cd76f
- Merge branch '63044-cluster-health-group-refactor' into 'master' · dcc2efdf
  Douglas Barbosa Alexandre authored Jul 10, 2019
```
Refactor common metrics importer

See merge request gitlab-org/gitlab-ee!14356
```
  dcc2efdf
- Automatic merge of gitlab-org/gitlab-ce master · fbb3355c
  GitLab Bot authored Jul 10, 2019
  
  fbb3355c
- Merge branch 'prepare-cycle-analytics-for-group-level' into 'master' · b76d4fad
  Douglas Barbosa Alexandre authored Jul 10, 2019
```
Prepare cycle analytics for group level

See merge request gitlab-org/gitlab-ce!30356
```
  b76d4fad
- Merge branch '64331-Assignee-field-in-a-new-issue-has-an-incorrect-line-wrap' into 'master' · d5d485c0
  Annabel Dunstone Gray authored Jul 10, 2019
```
Added css class to fix incorrect line wrap

Closes #64331

See merge request gitlab-org/gitlab-ce!30523
```
  d5d485c0
- Added css class to fix line wrap for assignee label in issues · ab6ec362
  Marc Schwede authored Jul 10, 2019
```
Fixes #64331
```
  ab6ec362
- Merge branch 'gitaly-version-v1.52.0' into 'master' · 27bafccd
  Kamil Trzciński authored Jul 10, 2019
```
Upgrade Gitaly to v1.52.0

See merge request gitlab-org/gitlab-ce!30568
```
  27bafccd
- Upgrade Gitaly to v1.52.0 · f36d96c6
  GitalyBot authored Jul 10, 2019
  
  f36d96c6
- Merge branch 'sh-cache-geo-check-in-memory' into 'master' · 31310c69
  Douglas Barbosa Alexandre authored Jul 10, 2019
```
Cache Geo checks for a certain time period instead of per request

Closes #12591

See merge request gitlab-org/gitlab-ee!14513
```
  31310c69
- Merge branch 'mf-modal-style-border-radius' into 'master' · 83094e5e
  Annabel Dunstone Gray authored Jul 10, 2019
```
Adjust modal border radius to match design spec

See merge request gitlab-org/gitlab-ce!30414
```
  83094e5e
- Automatic merge of gitlab-org/gitlab-ce master · 1b20b656
  GitLab Bot authored Jul 10, 2019
  
  1b20b656
- Merge branch 'fixed-dropdown-hover-styles' into 'master' · 473d36d1
  Annabel Dunstone Gray authored Jul 10, 2019
```
Fixed dropdown hover styles

Closes #64330 and #64340

See merge request gitlab-org/gitlab-ce!30534
```
  473d36d1
- Automatic merge of gitlab-org/gitlab-ce master · eee55aab
  GitLab Bot authored Jul 10, 2019
  
  eee55aab
- Merge branch 'winh-eslint-import-resolver-jest-workaround' into 'master' · e787676b
  Clement Ho authored Jul 10, 2019
```
Workaround ESLint only resolving paths in test files

Closes #64061

See merge request gitlab-org/gitlab-ce!30296
```
  e787676b
- Workaround ESLint only resolving paths in test files · a5d4c587
  Winnie Hellmann authored Jul 10, 2019
  
  a5d4c587
- Merge branch 'winh-eslint-import-resolver-jest-workaround-ee' into 'master' · b0e5b0c3
  Clement Ho authored Jul 10, 2019
```
Workaround ESLint only resolving paths in test files (EE-port)

See merge request gitlab-org/gitlab-ee!14622
```
  b0e5b0c3
- Workaround ESLint only resolving paths in test files · 27cb0b56
  Winnie Hellmann authored Jul 10, 2019
```
(cherry picked from commit 7e91d14928486725e04df1c898225b67df632ac9)
```
  27cb0b56
- Automatic merge of gitlab-org/gitlab-ce master · e879fcb8
  GitLab Bot authored Jul 10, 2019
  
  e879fcb8
- Merge branch... · 863930cd
  Clement Ho authored Jul 10, 2019
```
Merge branch '64321-wrong-url-when-creating-milestones-from-instance-milestones-dashboard' into 'master'

Fix wrong URL when creating milestones from instance milestones dashboard

Closes #64321

See merge request gitlab-org/gitlab-ce!30512
```
  863930cd
- Merge branch '11540-support-emails-as-id-in-scim' into 'master' · fd9ceec5
  James Lopez authored Jul 10, 2019
```
Resolve "Support emails as ID in SCIM"

Closes #11540

See merge request gitlab-org/gitlab-ee!14625
```
  fd9ceec5
- Resolve "Support emails as ID in SCIM" · a81db23b
  Manoj MJ authored Jul 10, 2019
  
  a81db23b
- Merge branch 'refactor-vulnerability-feedback' into 'master' · 43cfc786
  Bob Van Landuyt authored Jul 10, 2019
```
Refactor loading of vulnerability feedback

See merge request gitlab-org/gitlab-ee!14580
```
  43cfc786
- Add newline before subject · c5e2c1ca
  Małgorzata Ksionek authored Jul 10, 2019
```
Fix rubocop offences
```
  c5e2c1ca
- Automatic merge of gitlab-org/gitlab-ce master · 61ace015
  GitLab Bot authored Jul 10, 2019
  
  61ace015
- Add attribute reader to project level · 5de47766
  Małgorzata Ksionek authored Jul 10, 2019
  
  5de47766