Commits · 6567d8f23524e0c59fbe4d2222534de3bafed1ce · nexedi / gitlab-ce

27 Jun, 2018 4 commits
- Add Node.js to the languages supported by SAST · 6567d8f2
  Fabien Catteau authored Jun 27, 2018
```
Closes #5652
```
  6567d8f2
- Merge branch 'docs-starter-badge-fix' into 'master' · 2cf1f122
  Achilleas Pipinellis authored Jun 27, 2018
```
Update description_templates.md to fix starter badge

See merge request gitlab-org/gitlab-ee!6199
```
  2cf1f122
- Merge branch 'ce-to-ee-2018-06-26' into 'master' · a79d840c
  Marin Jankovski authored Jun 27, 2018
```
CE upstream - 2018-06-26 21:21 UTC

See merge request gitlab-org/gitlab-ee!6296
```
  a79d840c
- resolve conflict in `app/assets/javascripts/boards/components/sidebar/remove_issue.vue` · b9340dfd
  Lukas Eipert authored Jun 27, 2018
  
  b9340dfd
26 Jun, 2018 36 commits
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-26 · 13af95c7
  GitLab Bot authored Jun 26, 2018
```
# Conflicts:
#	app/assets/javascripts/boards/components/sidebar/remove_issue.vue

[ci skip]
```
  13af95c7
- Merge branch 'ce-to-ee-2018-06-26' into 'master' · 101cd6d6
  Robert Speicher authored Jun 26, 2018
```
CE upstream - 2018-06-26 15:22 UTC

See merge request gitlab-org/gitlab-ee!6292
```
  101cd6d6
- Merge branch 'revert-merge-request-widget-button-height' into 'master' · 76cb447f
  Clement Ho authored Jun 26, 2018
```
Revert merge request widget button max height

Closes #48441

See merge request gitlab-org/gitlab-ce!20175
```
  76cb447f
- Merge branch 'update-external-link-icon-in-header-user-dropdown' into 'master' · def0c43a
  Clement Ho authored Jun 26, 2018
```
Update external link icon in header user dropdown

See merge request gitlab-org/gitlab-ce!20150
```
  def0c43a
- Trailing newline in app/views/admin/application_settings/show.html.haml · 7bd0e09a
  Robert Speicher authored Jun 26, 2018
  
  7bd0e09a
- Revert merge request widget button max height · 34f6afe5
  George Tsiolis authored Jun 26, 2018
  
  34f6afe5
- Update CHANGELOG.md for 11.0.2 · a1bd2434
  GitLab Release Tools Bot authored Jun 26, 2018
```
[ci skip]
```
  a1bd2434
- Update CHANGELOG.md for 11.0.2 · 1ee18a7c
  GitLab Release Tools Bot authored Jun 26, 2018
```
[ci skip]
```
  1ee18a7c
- Update CHANGELOG-EE.md for 11.0.2-ee · a18c33e1
  GitLab Release Tools Bot authored Jun 26, 2018
```
[ci skip]
```
  a18c33e1
- Update external link icon in header user dropdown · 4a4226c4
  George Tsiolis authored Jun 25, 2018
  
  4a4226c4
- Merge branch 'tz-mr-vue-imagediff' into 'master' · ef648693
  Clement Ho authored Jun 26, 2018
```
Added Diff Viewer to new VUE based MR page

See merge request gitlab-org/gitlab-ce!20131
```
  ef648693
- Added Diff Viewer to new VUE based MR page · 53f77cfe
  Tim Zallmann authored Jun 26, 2018
  
  53f77cfe
- Resolve db/schema.rb · 0ae5d4bb
  Robert Speicher authored Jun 26, 2018
  
  0ae5d4bb
- Merge branch '48243-qa-deploy-key-cloning-test-sometimes-can-t-find-the-qa-element' into 'master' · 869d6450
  Robert Speicher authored Jun 26, 2018
```
Resolve "QA: Deploy key cloning test sometimes can't find the QA element"

Closes #48243

See merge request gitlab-org/gitlab-ce!20181
```
  869d6450
- Merge branch 'eslint-fix' into 'master' · f30916fc
  Filipa Lacerda authored Jun 26, 2018
```
Fixed eslint failure in IDE spec helpers

Closes #48490

See merge request gitlab-org/gitlab-ce!20182
```
  f30916fc
- resolve admin/application_settings/show.html.haml · 75d9b938
  Micaël Bergeron authored Jun 26, 2018
  
  75d9b938
- Fixed eslint failure in IDE spec helpers · f843285d
  Phil Hughes authored Jun 26, 2018
  
  f843285d
- Merge branch '6692-remove-geo-redownload-feature-flag' into 'master' · e787e52a
  Stan Hu authored Jun 26, 2018
```
Resolve "Remove Geo snapshot feature flag"

Closes #6692

See merge request gitlab-org/gitlab-ee!6286
```
  e787e52a
- Merge branch '45703-open-web-ide-file-tree' into 'master' · 8bf15ef4
  Phil Hughes authored Jun 26, 2018
```
Show file in tree on WebIDE open

Closes #45703

See merge request gitlab-org/gitlab-ce!19887
```
  8bf15ef4
- Show file in tree on WebIDE open · 1bfbee56
  Paul Slaughter authored Jun 26, 2018
  
  1bfbee56
- Merge branch '47794-environment-scope-cluster-page' into 'master' · 5f904e9c
  Mike Greiling authored Jun 26, 2018
```
Resolve "Update environment scope for starter/core plans on cluster page"

Closes #47794

See merge request gitlab-org/gitlab-ce!20166
```
  5f904e9c
- Merge branch 'avatar-upload' into 'master' · 1b592f8c
  Mike Greiling authored Jun 26, 2018
```
Bugfix for #48378 - Resetting value of input element to fix Chrome-specific issue

See merge request gitlab-org/gitlab-ce!20161
```
  1b592f8c
- Merge branch 'ce-update-branch-client-preparation' into 'master' · 0a73f646
  Robert Speicher authored Jun 26, 2018
```
Move git calls for `Repository#update_branch` inside Gitlab::Git

See merge request gitlab-org/gitlab-ce!20168
```
  0a73f646
- Merge branch 'update-branch-client-preparation' into 'master' · d0e5b349
  Robert Speicher authored Jun 26, 2018
```
Move git calls for `Repository#update_branch` inside Gitlab::Git

Closes gitaly#1250

See merge request gitlab-org/gitlab-ee!6279
```
  d0e5b349
- Remove the geo_redownload_with_snapshot feature flag · 1e17b30f
  Nick Thomas authored Jun 26, 2018
  
  1e17b30f
- Merge branch 'prefer-destructuring-fix' into 'master' · a91333c2
  Mike Greiling authored Jun 26, 2018
```
Enable "prefer-destructuring" in JS files

See merge request gitlab-org/gitlab-ce!19943
```
  a91333c2
- Merge branch 'prefer-destructuring-fix-ee' into 'master' · 87c7a959
  Mike Greiling authored Jun 26, 2018
```
Enable "prefer-destructuring": EE-Port of gitlab-ce!19943

See merge request gitlab-org/gitlab-ee!6263
```
  87c7a959
- Enable "prefer-destructuring": EE-Port of gitlab-ce!19943 · e813161f
  Lukas Eipert authored Jun 26, 2018
  
  e813161f
- Merge branch '46831-remove-unused-bootstrap-component-css' into 'master' · 7208b5b3
  Clement Ho authored Jun 26, 2018
```
Resolve "Remove unused bootstrap component CSS"

Closes #46831

See merge request gitlab-org/gitlab-ce!19257
```
  7208b5b3
- Resolve "Remove unused bootstrap component CSS" · 367e144b
  Sam Beckham authored Jun 26, 2018
  
  367e144b
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-26 · 6b5e6311
  GitLab Bot authored Jun 26, 2018
```
# Conflicts:
#	app/views/admin/application_settings/show.html.haml
#	db/schema.rb

[ci skip]
```
  6b5e6311
- Merge branch 'dm-branch-api-can-push-fix' into 'master' · 42532c92
  Robert Speicher authored Jun 26, 2018
```
Fix branch API can_push attribute and add specs

See merge request gitlab-org/gitlab-ce!20156
```
  42532c92
- Merge branch '47221-explain-what-groups-are-in-the-new-group-page' into 'master' · af9ac455
  Phil Hughes authored Jun 26, 2018
```
Resolve "Explain what Groups are in the New Group page"

Closes #47221

See merge request gitlab-org/gitlab-ce!19991
```
  af9ac455
- Resolve "Explain what Groups are in the New Group page" · 0b23423a
  Luke Bennett authored Jun 26, 2018
  
  0b23423a
- [QA] Make sure we wait for the deploy key list to load · 04df573f
  Rémy Coutable authored Jun 26, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  04df573f
- Merge branch 'patch-28' into 'master' · d374d39c
  Rémy Coutable authored Jun 26, 2018
```
Add André Gama as proofreader in Brazilian Portuguese.

See merge request gitlab-org/gitlab-ce!20005
```
  d374d39c