Commits · b5b6c9b5c692d1e77cc47d80111c8c9300e271bc · nexedi / gitlab-ce

17 Aug, 2018 24 commits
- Merge branch 'ee-blacklist-destroy-all' into 'master' · b5b6c9b5
  Robert Speicher authored Aug 17, 2018
```
EE: blacklist the use of destroy_all

See merge request gitlab-org/gitlab-ee!6914
```
  b5b6c9b5
- Merge branch 'ee-ab-49754-gh-importer-internal-ids' into 'master' · e4ce8918
  Yorick Peterse authored Aug 17, 2018
```
EE-port of " GitHub importer: Keep track of internal_ids "

See merge request gitlab-org/gitlab-ee!6925
```
  e4ce8918
- Merge branch 'ee-repopulate_site_statistics' into 'master' · 8147d3bb
  Yorick Peterse authored Aug 17, 2018
```
[EE] Fix SiteStatistics wikis_count

See merge request gitlab-org/gitlab-ee!6919
```
  8147d3bb
- [EE] Fix SiteStatistics wikis_count · 35eecbf2
  Gabriel Mazetto authored Aug 17, 2018
  
  35eecbf2
- Disable DestroyAll for all existing EE offenses · e35a8709
  Yorick Peterse authored Aug 16, 2018
  
  e35a8709
- Merge branch '7255-unable-to-see-system-header-footer-in-admin-dashboard' into 'master' · 491aba1e
  Douwe Maan authored Aug 17, 2018
```
Resolve "Unable to see system header and footer form with Ultimate license"

Closes #7255

See merge request gitlab-org/gitlab-ee!6926
```
  491aba1e
- Merge branch '49796-project-deletion-may-not-log-audit-events-during-user-deletion' into 'master' · 8052b964
  Nick Thomas authored Aug 17, 2018
```
Port of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21248

See merge request gitlab-org/gitlab-ee!6928
```
  8052b964
- Update admin_appearance_spec.rb to conform with style guides · e13428a2
  Tiago Botelho authored Aug 17, 2018
  
  e13428a2
- Fix: Project deletion may not log audit events during user deletion · 232e4fcc
  Valery Sizov authored Aug 13, 2018
```
port of CE MR - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21248
```
  232e4fcc
- Revert "Fix: Project deletion may not log audit events during user deletion" · 45376a74
  Valery Sizov authored Aug 17, 2018
```
This reverts commit ad2af8f8.
```
  45376a74
- Fix: Project deletion may not log audit events during user deletion · ad2af8f8
  Valery Sizov authored Aug 13, 2018
  
  ad2af8f8
- Cleanup internal id records for epics. · 26d13a5b
  Andreas Brandl authored Jul 26, 2018
  
  26d13a5b
- Add migration to cleanup internal_ids. · 555ad5b4
  Andreas Brandl authored Jul 23, 2018
```
See https://gitlab.com/gitlab-org/gitlab-ce/issues/49446.
```
  555ad5b4
- Fixes typo that prevented system header and footer settings from appearing in the admin dashboard · 579ae7ce
  Tiago Botelho authored Aug 17, 2018
  
  579ae7ce
- Trigger iid logic from GitHub importer for merge requests. · 705c2600
  Andreas Brandl authored Aug 06, 2018
  
  705c2600
- Trigger iid logic from GitHub importer for milestones. · d53ea02e
  Andreas Brandl authored Aug 06, 2018
  
  d53ea02e
- Trigger iid logic from GitHub importer for issues. · cc74fb53
  Andreas Brandl authored Jul 31, 2018
  
  cc74fb53
- Merge branch 'mg-keep-project-settings-expanded' into 'master' · 7ffeaf7f
  Filipa Lacerda authored Aug 17, 2018
```
Keep project settings sections expanded after submitting form

See merge request gitlab-org/gitlab-ee!6832
```
  7ffeaf7f
- Merge branch 'ce-to-ee-2018-08-15' into 'master' · 9615f7cb
  Achilleas Pipinellis authored Aug 17, 2018
```
CE upstream - 2018-08-15 15:21 UTC

Closes gitlab-ce#49953

See merge request gitlab-org/gitlab-ee!6905
```
  9615f7cb
- Merge branch 'docs-update-pages-ip-gitlabcom-ee' into 'master' · 071d60bb
  Achilleas Pipinellis authored Aug 17, 2018
```
Docs: update Pages IP address change + other DNS updates

See merge request gitlab-org/gitlab-ee!6918
```
  071d60bb
- Docs: update Pages IP address change + other DNS updates · 320888b2
  Marcia Ramos authored Aug 17, 2018
  
  320888b2
- Merge branch 'docs-fix-broken-link-configure-ldap-ee' into 'master' · 0156bb4e
  Achilleas Pipinellis authored Aug 17, 2018
```
Just a small fix for a broken link

See merge request gitlab-org/gitlab-ee!6005
```
  0156bb4e
- Merge branch 'master' into 'ce-to-ee-2018-08-15' · 681b0db6
  Achilleas Pipinellis authored Aug 17, 2018
```
# Conflicts:
#   doc/api/settings.md
```
  681b0db6
- Resolve docs conflicts · e407e1c5
  Achilleas Pipinellis authored Aug 17, 2018
  
  e407e1c5
16 Aug, 2018 16 commits
- update specs for protected environments · b9c474ef
  Mike Greiling authored Aug 16, 2018
  
  b9c474ef
- keep protected environments section expanded after form submission · 098d41be
  Mike Greiling authored Aug 16, 2018
  
  098d41be
- Merge branch 'docs/custom-templates-link' into 'master' · 2d25b865
  Mike Lewis authored Aug 16, 2018
```
Fix link under custom project template docs

See merge request gitlab-org/gitlab-ee!6917
```
  2d25b865
- fix mirror repoistory section expansion · 09f9e1a2
  Mike Greiling authored Aug 16, 2018
  
  09f9e1a2
- Fix link under custom project template docs · 3f18ffb6
  Achilleas Pipinellis authored Aug 16, 2018
  
  3f18ffb6
- Merge branch 'improve-project-manifest-import-docs' into 'master' · 0ff46591
  Achilleas Pipinellis authored Aug 16, 2018
```
Improve Project import via manifest docs

See merge request gitlab-org/gitlab-ee!6839
```
  0ff46591
- Improve Project import via manifest docs · 6dcaaca5
  Andreas Kämmerle authored Aug 16, 2018
  
  6dcaaca5
- Whitelist existing destroy_all offenses · 9e5843d4
  Yorick Peterse authored Aug 16, 2018
```
This whitelists all existing places where we use "destroy_all".
```
  9e5843d4
- Blacklist the use of "destroy_all" · 51bc6ff5
  Yorick Peterse authored Aug 16, 2018
```
This method usually has really bad performance implications, as it loads
rows into memory and deletes them one by one.
```
  51bc6ff5
- Merge branch '49796-project-deletion-may-not-log-audit-events-during-group-deletion' into 'master' · 13e931e4
  Nick Thomas authored Aug 16, 2018
```
Port of CE MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21162

See merge request gitlab-org/gitlab-ee!6911
```
  13e931e4
- Merge branch 'instance-statistics-docs-ee' into 'master' · 95b2adc7
  Marcia Ramos authored Aug 16, 2018
```
Instance statistics docs ee

See merge request gitlab-org/gitlab-ee!6903
```
  95b2adc7
- Instance statistics docs ee · 96bdbda6
  Achilleas Pipinellis authored Aug 16, 2018
  
  96bdbda6
- Fix: Project deletion may not log audit events during group deletion · 47a60a0c
  Valery Sizov authored Aug 13, 2018
  
  47a60a0c
- Merge branch 'docs-processes-ee' into 'master' · 124aacd8
  Achilleas Pipinellis authored Aug 16, 2018
```
Documentation process at GitLab

See merge request gitlab-org/gitlab-ee!6913
```
  124aacd8
- Merge branch 'docs-processes' into 'master' · 51225328
  Marcia Ramos authored Aug 16, 2018
```
Documentation process at GitLab

Closes #46843

See merge request gitlab-org/gitlab-ce!19902
```
  51225328
- Resolve conflicts for locale/gitlab.pot · 7a1a494a
  Filipa Lacerda authored Aug 16, 2018
  
  7a1a494a