Commits · 44aec942deb91797a2a975ce4cd231b63637412e · nexedi / gitlab-ce

30 Jul, 2018 14 commits
- New translations gitlab.pot (Italian) · 44aec942
  GitLab Crowdin Bot authored Jul 30, 2018
```
[skip ci]
```
  44aec942
- New translations gitlab.pot (Japanese) · 3fc9f87e
  GitLab Crowdin Bot authored Jul 30, 2018
```
[skip ci]
```
  3fc9f87e
- New translations gitlab.pot (Korean) · 5d0a5605
  GitLab Crowdin Bot authored Jul 30, 2018
```
[skip ci]
```
  5d0a5605
- New translations gitlab.pot (Polish) · 84579a1b
  GitLab Crowdin Bot authored Jul 30, 2018
```
[skip ci]
```
  84579a1b
- New translations gitlab.pot (Portuguese, Brazilian) · ab5745b8
  GitLab Crowdin Bot authored Jul 30, 2018
```
[skip ci]
```
  ab5745b8
- New translations gitlab.pot (Russian) · bf6b91ec
  GitLab Crowdin Bot authored Jul 30, 2018
```
[skip ci]
```
  bf6b91ec
- New translations gitlab.pot (Spanish) · 9cb6d532
  GitLab Crowdin Bot authored Jul 30, 2018
```
[skip ci]
```
  9cb6d532
- New translations gitlab.pot (Turkish) · 37228fed
  GitLab Crowdin Bot authored Jul 30, 2018
```
[skip ci]
```
  37228fed
- New translations gitlab.pot (Indonesian) · 8d688f7a
  GitLab Crowdin Bot authored Jul 30, 2018
```
[skip ci]
```
  8d688f7a
- New translations gitlab.pot (Bulgarian) · fd006825
  GitLab Crowdin Bot authored Jul 30, 2018
```
[skip ci]
```
  fd006825
- Merge branch 'bvl-wrap-skip-ci-in-crowdin-config' into 'master' · f171f6a4
  Rémy Coutable authored Jul 30, 2018
```
Wrap `[skip ci]` in quotes in Crowdin.yml

See merge request gitlab-org/gitlab-ee!6690
```
  f171f6a4
- Merge branch 'ee-rails5-update-gemfile-lock-2' into 'master' · aee7e524
  Rémy Coutable authored Jul 30, 2018
```
[EE port 20858] Rails5 update Gemfile.rails5.lock

See merge request gitlab-org/gitlab-ee!6686
```
  aee7e524
- Merge branch '5488_license_management_app_blacklist_backend' into 'master' · 1c2e67ff
  Sean McGivern authored Jul 30, 2018
```
Add License Management API to the backend

Closes #5488

See merge request gitlab-org/gitlab-ee!6246
```
  1c2e67ff
- Add License Management API to the backend · 68a087e7
  Gilbert Roulot authored Jul 30, 2018
  
  68a087e7
27 Jul, 2018 18 commits
- Merge branch '7027-unable-to-load-kubernetes-helm' into 'master' · 63e4129d
  Stan Hu authored Jul 27, 2018
```
Resolve "Unable to load 'lib/gitlab/kubernetes/helm'"

Closes #7027

See merge request gitlab-org/gitlab-ee!6683
```
  63e4129d
- Update CHANGELOG.md for 11.1.3 · b3d30182
  GitLab Release Tools Bot authored Jul 27, 2018
```
[ci skip]
```
  b3d30182
- Update CHANGELOG-EE.md for 11.1.3-ee · 6a834fa7
  GitLab Release Tools Bot authored Jul 27, 2018
```
[ci skip]
```
  6a834fa7
- Merge branch... · c2ae136c
  Nick Thomas authored Jul 27, 2018
```
Merge branch '6877-geo-the-storage-config-in-the-other-section-is-broken-in-the-geo-nodes-admin-page' into 'master'

Resolve "Geo - The "Storage config" in the "Other section" is broken in the Geo nodes admin page"

Closes #6877 and #4851

See merge request gitlab-org/gitlab-ee!6608
```
  c2ae136c
- Merge branch 'docs-jenkins-fix-badge' into 'master' · 758af4ac
  🚄 Job van der Voort 🚀 authored Jul 27, 2018
```
Docs: add Starter badge to Jenkins integration

See merge request gitlab-org/gitlab-ee!6693
```
  758af4ac
- add Starter badge · 871a0c0b
  Marcia Ramos authored Jul 27, 2018
  
  871a0c0b
- Merge branch 'ee-stop-dynamic-routable-creation' into 'master' · 56f8303f
  Douwe Maan authored Jul 27, 2018
```
EE: Stop building Route rows on the fly

See merge request gitlab-org/gitlab-ee!6591
```
  56f8303f
- Wrap `[skip ci]` in quotes in Crowdin.yml · 54d487ca
  Bob Van Landuyt authored Jul 27, 2018
```
As recommended by the folks at Crowdin
```
  54d487ca
- Merge branch '7000-introduce-PolicyCheckable' into 'master' · ab4bb67f
  Grzegorz Bizon authored Jul 27, 2018
```
Add PolicyCheckable concern for things passing to policy check

Closes #7000

See merge request gitlab-org/gitlab-ee!6641
```
  ab4bb67f
- Rename the module and add a simple test to check · c6dbd435
  Lin Jen-Shin authored Jul 27, 2018
```
if all methods are also presented in the user.
```
  c6dbd435
- Merge branch '48567-the-comparison-list-for-the-modified-icons-ee' into 'master' · 0e92a772
  Phil Hughes authored Jul 27, 2018
```
EE-Port of gitlab-ce!20501

See merge request gitlab-org/gitlab-ee!6484
```
  0e92a772
- EE-Port of gitlab-ce!20501 · f2025604
  Lukas Eipert authored Jul 27, 2018
  
  f2025604
- Merge branch 'ce-to-ee-2018-07-26' into 'master' · 4b44d0bc
  Phil Hughes authored Jul 27, 2018
```
CE upstream - 2018-07-26 17:46 UTC

Closes gitlab-qa#303

See merge request gitlab-org/gitlab-ee!6679
```
  4b44d0bc
- resolve conflicts in `app/assets/javascripts/boards/index.js` · 454214ab
  Phil Hughes authored Jul 27, 2018
  
  454214ab
- Rails5 update Gemfile.rails5.lock · 93563bea
  Jasper Maes authored Jul 26, 2018
  
  93563bea
- resolve conflict in `app/assets/javascripts/vue_shared/components/reports/issues_list.vue` · f7d7ff3a
  Lukas Eipert authored Jul 27, 2018
  
  f7d7ff3a
- resolve conflict in `app/assets/javascripts/vue_shared/components/reports/report_issues.vue` · c02356b4
  Lukas Eipert authored Jul 27, 2018
  
  c02356b4
- Merge branch 'bw-sha-attribute-geo-fix' into 'master' · 25cac8f4
  Stan Hu authored Jul 27, 2018
```
raise SecondaryNotConfigured if Geo DB is not found

See merge request gitlab-org/gitlab-ee!6680
```
  25cac8f4
26 Jul, 2018 8 commits
- Merge branch '6919-environments-dropdown-is-showing-on-the-cluster-health-page' into 'master' · fbfe390c
  Clement Ho authored Jul 26, 2018
```
Resolve "Environments dropdown is showing on the cluster health page"

Closes #6919

See merge request gitlab-org/gitlab-ee!6528
```
  fbfe390c
- Resolve "Environments dropdown is showing on the cluster health page" · faee8a34
  Jose Ivan Vargas authored Jul 26, 2018
  
  faee8a34
- fix require_dependency path · ad0ae9b7
  Brett Walker authored Jul 26, 2018
  
  ad0ae9b7
- raise SecondaryNotConfigured if Geo DB is not found · c022c44a
  Brett Walker authored Jul 26, 2018
  
  c022c44a
- Merge remote-tracking branch 'dev/master' · 3549ee7a
  Felipe Artur authored Jul 26, 2018
  
  3549ee7a
- Merge branch '5439-approved-is-confusing-wrong-wording-in-merge-request-widget' into 'master' · a654676c
  Annabel Gray authored Jul 26, 2018
```
Resolve ""Approved" is confusing / wrong wording in merge request widget"

Closes #5439

See merge request gitlab-org/gitlab-ee!6635
```
  a654676c
- Resolve ""Approved" is confusing / wrong wording in merge request widget" · 027c8c36
  Constance Okoghenun authored Jul 26, 2018
  
  027c8c36
- Merge branch 'security-fj-missing-csrf-system-hooks-ee' into 'master' · cacd7415
  Felipe Artur Cardozo authored Jul 26, 2018
```
[master] Missing CSRF in System Hooks

See merge request gitlab/gitlab-ee!647
```
  cacd7415