Commits · af6551f33b45a0063e20ddfa7f711842879b3a75 · nexedi / gitlab-ce

18 Jul, 2018 9 commits
- Merge branch 'frozen-string-enable-apps-services-inner-more' into 'master' · af6551f3
  Rémy Coutable authored Jul 18, 2018
```
Enable more frozen string in app/services/**/*.rb

See merge request gitlab-org/gitlab-ce!20677
```
  af6551f3
- Merge branch 'osw-fallback-to-collection-when-no-diff-refs' into 'master' · 89f47854
  Sean McGivern authored Jul 18, 2018
```
Render MR page when no persisted diff_refs or diffs size

Closes #49342

See merge request gitlab-org/gitlab-ce!20680
```
  89f47854
- Render MR page when no persisted diff_refs or diffs size · 3ecc2b04
  Oswaldo Ferreira authored Jul 17, 2018
  
  3ecc2b04
- Merge branch 'Docs-Repo-Size' into 'master' · 953a061d
  Tomasz Maczukin authored Jul 18, 2018
```
Update index.md to add link to reducing repo size doc

See merge request gitlab-org/gitlab-ce!20281
```
  953a061d
- Update index.md to add link to reducing repo size doc · dd3011f9
  Marcel Amirault authored Jul 18, 2018
  
  dd3011f9
- Merge branch '45318-FE-junit-tests' into 'master' · 75e1a061
  Phil Hughes authored Jul 18, 2018
```
Backports security reusable components into CE to use in JUnit report

See merge request gitlab-org/gitlab-ce!20613
```
  75e1a061
- Merge branch '47419-Fix-breadcrumbs' into 'master' · f97c4425
  Phil Hughes authored Jul 18, 2018
```
Resolve "broken breadcrumb in admin/user when switching tabs"

Closes #47419

See merge request gitlab-org/gitlab-ce!19608
```
  f97c4425
- Merge branch 'features/show-project-id-on-home-panel' into 'master' · fb735d0a
  Phil Hughes authored Jul 18, 2018
```
Features/show project id on home panel

Closes #46342

See merge request gitlab-org/gitlab-ce!20305
```
  fb735d0a
- Features/show project id on home panel · 742cf277
  Tuğçe Nur Taş authored Jul 18, 2018
  
  742cf277
17 Jul, 2018 31 commits
- Merge branch 'jivl-dev-master-into-com-master' into 'master' · 9bdc9b1a
  Felipe Artur authored Jul 17, 2018
```
Merge dev master to CE .com master as part of the security release process

Closes #49133

See merge request gitlab-org/gitlab-ce!20681
```
  9bdc9b1a
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into jivl-dev-master-into-com-master · df041608
  Jose authored Jul 17, 2018
  
  df041608
- Enable more frozen string in app/services/**/*.rb · fbde8354
  gfyoung authored Jul 17, 2018
```
Partially addresses #47424.
```
  fbde8354
- Merge branch 'fix-issue-49133' into 'master' · 465da1c7
  José Iván Vargas López authored Jul 17, 2018
```
Fix symlink vulnerability in project import

See merge request gitlab/gitlabhq!2440
```
  465da1c7
- Merge branch '48804-redesign-gcp-banner' into 'master' · 489025bb
  Mike Greiling authored Jul 17, 2018
```
Resolve "Redesign GCP banner"

Closes #48804

See merge request gitlab-org/gitlab-ce!20542
```
  489025bb
- Resolve "Redesign GCP banner" · c2c8f25e
  Taurie Davis authored Jul 17, 2018
  
  c2c8f25e
- Merge branch... · cb1a827e
  Clement Ho authored Jul 17, 2018
```
Merge branch '49257-metrics-drop-down-doesn-t-show-all-environment-some-not-clickable' into 'master'

Resolve "Metrics drop down doesn't show all environment, some not clickable"

Closes #49257

See merge request gitlab-org/gitlab-ce!20651
```
  cb1a827e
- Resolve "Metrics drop down doesn't show all environment, some not clickable" · 236e752b
  Jose Ivan Vargas authored Jul 17, 2018
  
  236e752b
- Merge branch 'fix-web-ide-header-button-background' into 'master' · 2f16eab0
  Filipa Lacerda authored Jul 17, 2018
```
Fix ide-tree-header button background

See merge request gitlab-org/gitlab-ce!20662
```
  2f16eab0
- Fix broken breadcrumb in admin/user · 2d5c8a59
  Robin Naundorf authored Jun 09, 2018
```
  * Fix broken breadcrumb when switching tabs in admin/user

Closes #47419
```
  2d5c8a59
- Removes commented code · cdbff400
  Filipa Lacerda authored Jul 17, 2018
  
  cdbff400
- Merge branch 'extract-ee-specific-banzai-filters' into 'master' · 29d1629f
  Robert Speicher authored Jul 17, 2018
```
Extract EE-specific lines from Banzai pipelines

See merge request gitlab-org/gitlab-ce!20636
```
  29d1629f
- Merge branch 'frozen-string-enable-apps-services-inner' into 'master' · d015702f
  Rémy Coutable authored Jul 17, 2018
```
Enable frozen string in app/services/**/*.rb

See merge request gitlab-org/gitlab-ce!20656
```
  d015702f
- Merge branch 'update-specific-runners-help-url' into 'master' · a992f81b
  Clement Ho authored Jul 17, 2018
```
Update specific runners help URL

See merge request gitlab-org/gitlab-ce!20213
```
  a992f81b
- Update specific runners help URL · f9126a50
  George Tsiolis authored Jul 17, 2018
  
  f9126a50
- Merge branch 'satishperala/gitlab-ce-20720_webhooks_full_image_url' into 'master' · 10bd8002
  Douwe Maan authored Jul 17, 2018
```
Include full image URL in webhooks for uploaded images

Closes #20720

See merge request gitlab-org/gitlab-ce!18109
```
  10bd8002
- Merge branch '48964-mr-reduce-the-memory-footprint-of-the-component-tree' into 'master' · 05bef3c6
  Fatih Acet authored Jul 17, 2018
```
Resolve "MR: Reduce the memory footprint of the component tree"

Closes #48964

See merge request gitlab-org/gitlab-ce!20448
```
  05bef3c6
- Resolve "MR: Reduce the memory footprint of the component tree" · 422dcfde
  Tim Zallmann authored Jul 17, 2018
  
  422dcfde
- Merge branch 'add-merge-request-header-branch-details-right-margin' into 'master' · 98547133
  Annabel Gray authored Jul 17, 2018
```
Add merge request header branch actions left margin

Closes #49238

See merge request gitlab-org/gitlab-ce!20643
```
  98547133
- Merge branch '49165-pipeline-graph-in-new-merge-request-widget-is-flickering' into 'master' · 6fdc6976
  Annabel Gray authored Jul 17, 2018
```
Resolve "Pipeline graph in new merge request widget is flickering"

Closes #49165

See merge request gitlab-org/gitlab-ce!20660
```
  6fdc6976
- Fix ide-tree-header button background · 11d79a52
  Paul Slaughter authored Jul 17, 2018
  
  11d79a52
- Merge branch 'person-tags-better' into 'master' · 258086c9
  Annabel Gray authored Jul 17, 2018
```
Highlighting of person mentions now better visible on low contrast screens and…

See merge request gitlab-org/gitlab-ce!20509
```
  258086c9
- Highlighting of person mentions now better visible on low contrast screens and… · 1be31d1f
  Dimitrie Hoekstra authored Jul 17, 2018
  
  1be31d1f
- Merge branch 'zj-remove-sanitize-repo-path' into 'master' · f66d5c5f
  Sean McGivern authored Jul 17, 2018
```
Remove sanitize_repo_path

Closes gitaly#1235

See merge request gitlab-org/gitlab-ce!20666
```
  f66d5c5f
- Keep #absolute_image_urls as a private instance method · fc580935
  Sean McGivern authored Jul 17, 2018
  
  fc580935
- Merge branch 'qa-48464-add-edit-delete-file-scenario' into 'master' · 71ffe5e8
  Rémy Coutable authored Jul 17, 2018
```
QA scenario to add/edit/delete a file via the Web UI

See merge request gitlab-org/gitlab-ce!20265
```
  71ffe5e8
- QA scenario to add/edit/delete a file via the Web UI · 7e1f90ab
  Sanad Liaquat authored Jul 17, 2018
  
  7e1f90ab
- Update CHANGELOG.md for 10.7.7 · ffa970a5
  GitLab Release Tools Bot authored Jul 17, 2018
```
[ci skip]
```
  ffa970a5
- Update CHANGELOG.md for 10.8.6 · 1714e608
  GitLab Release Tools Bot authored Jul 17, 2018
```
[ci skip]
```
  1714e608
- Update CHANGELOG.md for 11.0.4 · bef5bf62
  GitLab Release Tools Bot authored Jul 17, 2018
```
[ci skip]
```
  bef5bf62
- Merge branch 'docs-merge-templates-updates' into 'master' · 59b82fbc
  Rémy Coutable authored Jul 17, 2018
```
Merge Templates updates

See merge request gitlab-org/gitlab-ce!20585
```
  59b82fbc