Commits · 0d29ca5f0764838a38488bf9819d6d5d943d6040 · nexedi / gitlab-ce

20 Aug, 2018 7 commits
- Merge branch 'docs-mr-approval-link' into 'master' · 0d29ca5f
  Rémy Coutable authored Aug 20, 2018
```
Documentation: Fix API doc link from MR approval to MR acceptance

See merge request gitlab-org/gitlab-ee!6598
```
  0d29ca5f
- Merge branch 'rails5-fix-audit-events-spec' into 'master' · d116ea8d
  Rémy Coutable authored Aug 20, 2018
```
Rails5: Fix audit event spec

See merge request gitlab-org/gitlab-ee!6940
```
  d116ea8d
- Merge branch 'rails5-fix-path-lock-spec' into 'master' · 49946080
  Rémy Coutable authored Aug 20, 2018
```
Rails5 fix duplicate gpg signature in path lock spec

See merge request gitlab-org/gitlab-ee!6939
```
  49946080
- Merge branch 'rails5-mysql-milliseconds-project-spec' into 'master' · 6cb95116
  Rémy Coutable authored Aug 20, 2018
```
Rails5: fix mysql milliseconds problem in project_spec

See merge request gitlab-org/gitlab-ee!6880
```
  6cb95116
- Merge branch 'rails5-fix-mysql-milliseconds-project-import-state-spec' into 'master' · 57cb82cb
  Rémy Coutable authored Aug 20, 2018
```
Rails5: fix mysql milliseconds problem in project_import_state_spec

See merge request gitlab-org/gitlab-ee!6874
```
  57cb82cb
- Merge branch '6676-extract-ee-specific-files-lines-for-discussion-app-helpers' into 'master' · 21b176e6
  Grzegorz Bizon authored Aug 20, 2018
```
Resolve "Extract EE specific files/lines for Discussion app/helpers"

Closes #6676

See merge request gitlab-org/gitlab-ee!6891
```
  21b176e6
- Merge branch 'ee-25990-interactive-web-terminals-for-ci-cd-jobs-docs' into 'master' · 37d0c297
  Achilleas Pipinellis authored Aug 20, 2018
```
Ee 25990 interactive web terminals for ci cd jobs docs

See merge request gitlab-org/gitlab-ee!6700
```
  37d0c297
19 Aug, 2018 6 commits
- Merge branch 'ce-to-ee-2018-08-17' into 'master' · b8f2f711
  Stan Hu authored Aug 19, 2018
```
CE upstream - 2018-08-17 09:22 UTC

Closes gitaly#1243, gitaly#1310, and gitaly#1246

See merge request gitlab-org/gitlab-ee!6927
```
  b8f2f711
- Resove conflicts in app/services/groups/destroy_service.rb · d19f3bc5
  Stan Hu authored Aug 18, 2018
  
  d19f3bc5
- Resole conflicts in doc/user/project/import/manifest.md · e31f6f8e
  Stan Hu authored Aug 18, 2018
  
  e31f6f8e
- Resolve conflicts in doc/user/project/import/index.md · 76a5ca52
  Stan Hu authored Aug 18, 2018
  
  76a5ca52
- Resolve conflicts in app/views/admin/application_settings/show.html.haml · 3fc8e1da
  Stan Hu authored Aug 18, 2018
  
  3fc8e1da
- Resolve conflicts in app/finders/license_template_finder.rb · d34c9d7b
  Stan Hu authored Aug 18, 2018
  
  d34c9d7b
18 Aug, 2018 4 commits
- Rails5: Fix audit event spec · 2ab83c18
  Jasper Maes authored Aug 18, 2018
  
  2ab83c18
- Rails5 fix duplicate gpg signature in path lock spec · f499904e
  Jasper Maes authored Aug 18, 2018
  
  f499904e
- Merge branch 'mk/remove-duplicate-test' into 'master' · 6d89ba84
  Stan Hu authored Aug 18, 2018
```
Remove duplicate test

See merge request gitlab-org/gitlab-ee!6937
```
  6d89ba84
- Remove duplicate test · 7ef7722d
  Michael Kozono authored Aug 18, 2018
  
  7ef7722d
17 Aug, 2018 23 commits
- Merge branch 'ee-remove-scss-variables-3' into 'master' · 2c93486f
  Clement Ho authored Aug 17, 2018
```
Remove more variable reassignments and unused styles

See merge request gitlab-org/gitlab-ee!6935
```
  2c93486f
- Merge branch 'increase-ee-job-concurrency' into 'master' · c702738a
  Robert Speicher authored Aug 17, 2018
```
Double the concurrency of rspec-*-ee* jobs

See merge request gitlab-org/gitlab-ee!6929
```
  c702738a
- Remove more variable reassignments and unused styles · 1cf2739c
  Annabel Dunstone Gray authored Aug 16, 2018
  
  1cf2739c
- 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
- Fix conflicts for locale/gitlab.pot · 0fcdb9b3
  Filipa Lacerda authored Aug 17, 2018
  
  0fcdb9b3
- Fix conflicts for spec/javascripts/vue_shared/translate_spec.js · f8515f4b
  Filipa Lacerda authored Aug 17, 2018
  
  f8515f4b
- 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
- Double the concurrency of rspec-*-ee* jobs · d4f7e07a
  Nick Thomas authored Aug 17, 2018
  
  d4f7e07a
- Resolve index.md conflict · bc67a595
  Luke Bennett authored Aug 17, 2018
  
  bc67a595
- 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
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-08-17 · c16f44fb
  GitLab Bot authored Aug 17, 2018
```
# Conflicts:
#	app/finders/license_template_finder.rb
#	app/services/groups/destroy_service.rb
#	app/views/admin/application_settings/show.html.haml
#	doc/administration/index.md
#	doc/user/project/import/index.md
#	doc/user/project/import/manifest.md
#	locale/gitlab.pot
#	spec/javascripts/vue_shared/translate_spec.js

[ci skip]
```
  c16f44fb
- Merge branch 'zj-user-update-branch' into 'master' · 5bf9f5b6
  Douwe Maan authored Aug 17, 2018
```
Remove feature flags for UserUpdateBranch

Closes gitaly#1246 and gitaly#1310

See merge request gitlab-org/gitlab-ce!21238
```
  5bf9f5b6