Merge branch '11-3-stable-prepare-rc1' of gitlab.com:gitlab-org/gitlab-ce into... (23d7a8ae) · 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
23d7a8ae

Commit 23d7a8ae authored 6 years ago by

Jose Vargas

Downloads
- Plain Diff

Merge branch '11-3-stable-prepare-rc1' of gitlab.com:gitlab-org/gitlab-ce into...

Merge branch '11-3-stable-prepare-rc1' of gitlab.com:gitlab-org/gitlab-ce into 11-3-stable-ee-prepare-rc1

parents 6ec4f391 40935fd7

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 6 additions, 2 deletions

CHANGELOG.md
app/controllers/concerns/sends_blob.rb 69 additions, 0 deletions

app/controllers/concerns/sends_blob.rb
app/controllers/projects/avatars_controller.rb 2 additions, 10 deletions

app/controllers/projects/avatars_controller.rb
app/controllers/projects/raw_controller.rb 2 additions, 35 deletions

app/controllers/projects/raw_controller.rb
app/helpers/blob_helper.rb 0 additions, 22 deletions

app/helpers/blob_helper.rb
app/serializers/diff_file_entity.rb 0 additions, 1 deletion

app/serializers/diff_file_entity.rb
changelogs/unreleased/fj-47229-fix-logo-lfs-tracked.yml 5 additions, 0 deletions

changelogs/unreleased/fj-47229-fix-logo-lfs-tracked.yml
spec/controllers/projects/avatars_controller_spec.rb 42 additions, 11 deletions

spec/controllers/projects/avatars_controller_spec.rb
spec/controllers/projects/raw_controller_spec.rb 16 additions, 85 deletions

spec/controllers/projects/raw_controller_spec.rb
spec/support/shared_examples/controllers/repository_lfs_file_load_examples.rb 89 additions, 0 deletions

...examples/controllers/repository_lfs_file_load_examples.rb

with 231 additions and 166 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