Commits · 7683c4de35107518d746ea6acd6e56e9573597ce · nexedi / gitlab-ce

24 May, 2019 40 commits
- Automatic merge of gitlab-org/gitlab-ce master · 7683c4de
  GitLab Bot authored May 24, 2019
  
  7683c4de
- Merge branch 'master' into 'master' · b13a92d6
  Achilleas Pipinellis authored May 24, 2019
```
Update proofreader.md

See merge request gitlab-org/gitlab-ce!28649
```
  b13a92d6
- Merge branch 'docs-missing-images-1' into 'master' · b655186b
  Achilleas Pipinellis authored May 24, 2019
```
Docs: Put back deleted HA images

Closes #62261

See merge request gitlab-org/gitlab-ce!28692
```
  b655186b
- Docs: Put back deleted HA images · ed201a21
  Marcel Amirault authored May 24, 2019
  
  ed201a21
- Automatic merge of gitlab-org/gitlab-ce master · 14114791
  GitLab Bot authored May 24, 2019
  
  14114791
- Merge branch 'winh-board_form-showPage-ee' into 'master' · 9f0eb115
  Clement Ho authored May 24, 2019
```
Use existing showPage() from BoardsStoreEE in BoardForm

See merge request gitlab-org/gitlab-ee!13243
```
  9f0eb115
- Use existing showPage() from BoardsStoreEE in BoardForm · 7a890d78
  Winnie Hellmann authored May 24, 2019
  
  7a890d78
- Merge branch 'js-i18n-u' into 'master' · d6df4fb2
  Clement Ho authored May 24, 2019
```
I18N JS files starting with u

See merge request gitlab-org/gitlab-ce!28177
```
  d6df4fb2
- Merge branch 'ee-js-i18n-u' into 'master' · a1a49158
  Clement Ho authored May 24, 2019
```
i18n JS files starting with u - EE

See merge request gitlab-org/gitlab-ee!12457
```
  a1a49158
- Automatic merge of gitlab-org/gitlab-ce master · 6aa8cc06
  GitLab Bot authored May 24, 2019
  
  6aa8cc06
- Merge branch '58632-fix-mr-widget-padding' into 'master' · 8552e8e3
  Mike Greiling authored May 24, 2019
```
Fix MR widget padding

Closes #58632

See merge request gitlab-org/gitlab-ce!28472
```
  8552e8e3
- Merge branch '58632-fix-mr-widget-padding-ee' into 'master' · 4b350c5f
  Mike Greiling authored May 24, 2019
```
[EE] Fix MR widget padding

See merge request gitlab-org/gitlab-ee!13008
```
  4b350c5f
- Automatic merge of gitlab-org/gitlab-ce master · 0ec0f57a
  GitLab Bot authored May 24, 2019
  
  0ec0f57a
- Merge branch 'jl-add-source-gdk-components-docs' into 'master' · 80c19bba
  Achilleas Pipinellis authored May 24, 2019
```
Add source and gdk installations to components

See merge request gitlab-org/gitlab-ce!28691
```
  80c19bba
- Add source and gdk installations to components · a3b4b648
  Joshua Lambert authored May 24, 2019
  
  a3b4b648
- Automatic merge of gitlab-org/gitlab-ce master · f5890e9f
  GitLab Bot authored May 24, 2019
  
  f5890e9f
- Merge branch 'ee-62151-broken-master' into 'master' · 6359b817
  Kamil Trzciński authored May 24, 2019
```
[EE] Fix MySQL CI jobs

Closes gitlab-ce#62156 and gitlab-ce#62151

See merge request gitlab-org/gitlab-ee!13149
```
  6359b817
- Merge branch '62151-broken-master' into 'master' · 21c809ce
  Kamil Trzciński authored May 24, 2019
```
Fix MySQL CI jobs

Closes #62156 and #62151

See merge request gitlab-org/gitlab-ce!28593
```
  21c809ce
- Merge branch... · 38f273e3
  Yorick Peterse authored May 24, 2019
```
Merge branch '6578-extract-ee-specific-files-lines-for-spec-features-security-project-snippet' into 'master'

Resolve "Extract EE specific files/lines for spec/features/security/project/snippet"

Closes #6578

See merge request gitlab-org/gitlab-ee!13275
```
  38f273e3
- Automatic merge of gitlab-org/gitlab-ce master · 3b4d8dce
  GitLab Bot authored May 24, 2019
  
  3b4d8dce
- Merge branch 'ce-jej/group-saml-cleans-up-identity' into 'master' · c0ea4164
  Mayra Cabrera authored May 24, 2019
```
Adds Identity#for_user for use in an EE MR

See merge request gitlab-org/gitlab-ce!28697
```
  c0ea4164
- Merge branch '62283-fix-job-app-spec' into 'master' · e7e0792a
  Filipa Lacerda authored May 24, 2019
```
Replaces a hard-coded date in the job app spec

Closes #62283

See merge request gitlab-org/gitlab-ce!28709
```
  e7e0792a
- Automatic merge of gitlab-org/gitlab-ce master · 3c613896
  GitLab Bot authored May 24, 2019
  
  3c613896
- Merge branch 'add-mem-profiler' into 'master' · 336dfa19
  Stan Hu authored May 24, 2019
```
Add `memory_profiler` and `derailed_benchmarks`

See merge request gitlab-org/gitlab-ce!28698
```
  336dfa19
- Merge branch 'winh-copy_metadata-description' into 'master' · f39c931a
  Mayra Cabrera authored May 24, 2019
```
Clarify that /copy_metadata only works within same project

See merge request gitlab-org/gitlab-ce!28671
```
  f39c931a
- Clarify that /copy_metadata only works within same project · ddd6a51f
  Winnie Hellmann authored May 24, 2019
  
  ddd6a51f
- Automatic merge of gitlab-org/gitlab-ce master · 8a276861
  GitLab Bot authored May 24, 2019
  
  8a276861
- Merge branch 'vue-repo-list-backend-frontend' into 'master' · 7307a762
  Filipa Lacerda authored May 24, 2019
```
Pull files for repository tree from GraphQL API

See merge request gitlab-org/gitlab-ce!28638
```
  7307a762
- Merge branch 'vue-repo-list-backend-frontend-ee' into 'master' · f61e8c97
  Filipa Lacerda authored May 24, 2019
```
EE port of vue-repo-list-backend-frontend

See merge request gitlab-org/gitlab-ee!13273
```
  f61e8c97
- Replaces a hard-coded date in the job app spec · 234bc46b
  samdbeckham authored May 24, 2019
  
  234bc46b
- Automatic merge of gitlab-org/gitlab-ce master · 3a2b4d54
  GitLab Bot authored May 24, 2019
  
  3a2b4d54
- Merge branch '60778-input-text-height' into 'master' · 52758b92
  Filipa Lacerda authored May 24, 2019
```
Fix height of input groups

Closes #61304, #61303, #59254, and #60778

See merge request gitlab-org/gitlab-ce!28495
```
  52758b92
- Pull files for repository tree from GraphQL API · d8bb8d45
  Phil Hughes authored May 24, 2019
  
  d8bb8d45
- EE port of vue-repo-list-backend-frontend · 203660fd
  Phil Hughes authored May 24, 2019
  
  203660fd
- Automatic merge of gitlab-org/gitlab-ce master · 24d58296
  GitLab Bot authored May 24, 2019
  
  24d58296
- Merge branch 'ce-jej/unflag-group-saml-metadata' into 'master' · c509b35b
  Douwe Maan authored May 24, 2019
```
Group SAML docs explain metadata configuration

See merge request gitlab-org/gitlab-ce!28700
```
  c509b35b
- Merge branch 'jej/unflag-group-saml-metadata' into 'master' · 260cd2af
  Douwe Maan authored May 24, 2019
```
Remove feature flag for GroupSaml metadata

Closes #9657

See merge request gitlab-org/gitlab-ee!12659
```
  260cd2af
- Merge branch 'fix-milestone-references-with-escaped-html-entities' into 'master' · 6b89b7cb
  Jan Provaznik authored May 24, 2019
```
Fix milestone references with HTML entities in the name

Closes #62114

See merge request gitlab-org/gitlab-ce!28667
```
  6b89b7cb
- Merge branch 'kp-add-graphql-full-config-support' into 'master' · 64d13d5a
  Phil Hughes authored May 24, 2019
```
Add support for second `config` param in GraphQL wrapper lib

See merge request gitlab-org/gitlab-ce!28705
```
  64d13d5a
- Add support for second `config` param · 6a57552a
  Kushal Pandya authored May 24, 2019
  
  6a57552a