Merge tag 'v14.6.1-ee' into 14-6-stable-jh (47a6fd55) · Commits · gitlab-cn / Gitlab · JiHu GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

Gitlab
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

gitlab-cn
Gitlab
Commits
47a6fd55

Commit 47a6fd55 authored 3 years ago by

Qian Zhang

Downloads
- Plain Diff

Merge tag 'v14.6.1-ee' into 14-6-stable-jh

parents 46d2f0d5 29ff725b

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 7 additions, 0 deletions

CHANGELOG.md
GITALY_SERVER_VERSION 1 addition, 1 deletion

GITALY_SERVER_VERSION
VERSION 1 addition, 1 deletion

VERSION
app/assets/javascripts/editor/source_editor_instance.js 7 additions, 1 deletion

app/assets/javascripts/editor/source_editor_instance.js
app/services/merge_requests/squash_service.rb 1 addition, 1 deletion

app/services/merge_requests/squash_service.rb
data/whats_new/202112200001_14_06.yml 57 additions, 0 deletions

data/whats_new/202112200001_14_06.yml
ee/spec/services/groups/memberships/export_service_spec.rb 4 additions, 2 deletions

ee/spec/services/groups/memberships/export_service_spec.rb
spec/factories/pages_domains.rb 0 additions, 12 deletions

spec/factories/pages_domains.rb
spec/factories_spec.rb 0 additions, 1 deletion

spec/factories_spec.rb
spec/fixtures/ssl/letsencrypt_expired_x3.pem 0 additions, 98 deletions

spec/fixtures/ssl/letsencrypt_expired_x3.pem
spec/frontend/editor/source_editor_instance_spec.js 11 additions, 0 deletions

spec/frontend/editor/source_editor_instance_spec.js
spec/models/pages_domain_spec.rb 0 additions, 13 deletions

spec/models/pages_domain_spec.rb
spec/services/merge_requests/squash_service_spec.rb 16 additions, 0 deletions

spec/services/merge_requests/squash_service_spec.rb

with 105 additions and 130 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment