Merge remote-tracking branch 'dev/12-2-stable-ee' into 12-2-stable-ee (0a51ff4b) · Commits · gitlab-cn / Gitlab Backup · JiHu GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

Gitlab Backup
- Activity
- Members

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

gitlab-cn
Gitlab Backup
Commits
0a51ff4b

Commit 0a51ff4b authored 5 years ago by

GitLab Release Tools Bot

Downloads
- Plain Diff

Merge remote-tracking branch 'dev/12-2-stable-ee' into 12-2-stable-ee

parents af03179a 2b611bff

Changes 102

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG-EE.md 11 additions, 0 deletions

CHANGELOG-EE.md
CHANGELOG.md 21 additions, 0 deletions

CHANGELOG.md
VERSION 1 addition, 1 deletion

VERSION
app/assets/javascripts/project_find_file.js 2 additions, 1 deletion

app/assets/javascripts/project_find_file.js
app/controllers/application_controller.rb 4 additions, 2 deletions

app/controllers/application_controller.rb
app/controllers/concerns/internal_redirect.rb 1 addition, 1 deletion

app/controllers/concerns/internal_redirect.rb
app/controllers/concerns/lfs_request.rb 1 addition, 0 deletions

app/controllers/concerns/lfs_request.rb
app/finders/labels_finder.rb 7 additions, 1 deletion

app/finders/labels_finder.rb
app/graphql/gitlab_schema.rb 5 additions, 5 deletions

app/graphql/gitlab_schema.rb
app/helpers/markup_helper.rb 1 addition, 9 deletions

app/helpers/markup_helper.rb
app/models/application_setting.rb 20 additions, 1 deletion

app/models/application_setting.rb
app/models/concerns/mentionable/reference_regexes.rb 3 additions, 1 deletion

app/models/concerns/mentionable/reference_regexes.rb
app/models/discussion.rb 1 addition, 0 deletions

app/models/discussion.rb
app/models/member.rb 1 addition, 0 deletions

app/models/member.rb
app/models/merge_request.rb 8 additions, 0 deletions

app/models/merge_request.rb
app/models/milestone.rb 4 additions, 0 deletions

app/models/milestone.rb
app/models/note.rb 4 additions, 0 deletions

app/models/note.rb
app/models/project.rb 8 additions, 4 deletions

app/models/project.rb
app/models/system_note_metadata.rb 1 addition, 0 deletions

app/models/system_note_metadata.rb
app/models/wiki_page.rb 6 additions, 0 deletions

app/models/wiki_page.rb

with 110 additions and 26 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