Commits · 4a556dcb141b61664fa685ee239154ea1613d52b · nexedi / gitlab-ce

20 Aug, 2018 5 commits
- resolve ee/spec/spec_helper · 4a556dcb
  Valery Sizov authored Aug 20, 2018
  
  4a556dcb
- Resolve app/services/users/destroy_service.rb · 7a709b84
  Valery Sizov authored Aug 20, 2018
  
  7a709b84
- Fixed conflicts in legacy_api_update_service.rb · ebdafe97
  Yorick Peterse authored Aug 20, 2018
  
  ebdafe97
- Fix ce-to-ee merge conflicts for migration. · 6a1a6d2d
  Andreas Brandl authored Aug 20, 2018
  
  6a1a6d2d
- Fix ce-to-ee merge conflicts for migration. · 8c3df625
  Andreas Brandl authored Aug 20, 2018
  
  8c3df625
19 Aug, 2018 7 commits
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-08-19 · 45fdfaa3
  GitLab Bot authored Aug 19, 2018
```
# Conflicts:
#	app/services/protected_branches/legacy_api_update_service.rb
#	app/services/users/destroy_service.rb
#	db/post_migrate/20180723130817_delete_inconsistent_internal_id_records.rb
#	spec/migrations/delete_inconsistent_internal_id_records_spec.rb
#	spec/spec_helper.rb

[ci skip]
```
  45fdfaa3
- 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
- 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
- Merge branch 'mk/fix-typo' into 'master' · 00baed8c
  Stan Hu authored Aug 18, 2018
```
Fix typo

See merge request gitlab-org/gitlab-ce!21293
```
  00baed8c
- Fix typo · 51dc249f
  Michael Kozono authored Aug 18, 2018
  
  51dc249f
- Remove duplicate test · 7ef7722d
  Michael Kozono authored Aug 18, 2018
  
  7ef7722d
17 Aug, 2018 24 commits
- Merge branch 'remove-scss-variables-3' into 'master' · d195ee8f
  Clement Ho authored Aug 17, 2018
```
Remove more variable reassignments and unused styles

See merge request gitlab-org/gitlab-ce!21262
```
  d195ee8f
- 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 'docs/document-query-plans' into 'master' · 11983373
  Robert Speicher authored Aug 17, 2018
```
Add documentation about reading query plans

See merge request gitlab-org/gitlab-ce!21199
```
  11983373
- 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
- Merge branch 'blacklist-destroy-all' into 'master' · 120ce02e
  Robert Speicher authored Aug 17, 2018
```
Blacklist the use of destroy_all

See merge request gitlab-org/gitlab-ce!21250
```
  120ce02e
- 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 'ab-49754-gh-importer-internal-ids' into 'master' · a58d0a01
  Yorick Peterse authored Aug 17, 2018
```
GitHub importer: Keep track of internal_ids

Closes #49754

See merge request gitlab-org/gitlab-ce!20926
```
  a58d0a01
- Merge branch 'patch-23' into 'master' · c2f14af7
  Stan Hu authored Aug 17, 2018
```
replace nobootwait with nofail

See merge request gitlab-org/gitlab-ce!21269
```
  c2f14af7
- Merge branch 'sh-bump-gitaly-for-11-2' into 'master' · 5309988b
  Douwe Maan authored Aug 17, 2018
```
Bump Gitaly to 0.117.1 for Rouge update

See merge request gitlab-org/gitlab-ce!21277
```
  5309988b
- Bump Gitaly to 0.117.1 for Rouge update · 61752ebf
  Stan Hu authored Aug 17, 2018
  
  61752ebf
- 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
- Add documentation about reading query plans · 3d46f315
  Yorick Peterse authored Aug 14, 2018
```
This adds a database guide on how to read the output of "EXPLAIN" and
"EXPLAIN ANALYZE", and how to use this output to understand a query's
performance and optimise it.
```
  3d46f315
- Disable DestroyAll for all existing EE offenses · e35a8709
  Yorick Peterse authored Aug 16, 2018
  
  e35a8709
- Merge branch 'repopulate_site_statistics' into 'master' · 74eec89e
  Yorick Peterse authored Aug 17, 2018
```
Fix SiteStatistics wikis_count

See merge request gitlab-org/gitlab-ce!21030
```
  74eec89e
- Merge branch 'docs-mention-how-to-override-class-methods' into 'master' · 65d48623
  Douwe Maan authored Aug 17, 2018
```
Mention how to override CE class methods

See merge request gitlab-org/gitlab-ce!21276
```
  65d48623
- 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 '50101-builds-dropdown' into 'master' · b399a274
  Phil Hughes authored Aug 17, 2018
```
Creates vue components for stage dropdowns and job list container for job log view

See merge request gitlab-org/gitlab-ce!21255
```
  b399a274
- Merge branch '49796-project-deletion-may-not-log-audit-events-during-user-deletion' into 'master' · 10cf9383
  Nick Thomas authored Aug 17, 2018
```
Resolve "Project deletion may not log audit events during user deletion"

Closes #49796

See merge request gitlab-org/gitlab-ce!21248
```
  10cf9383
- 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