Merge branch '1648-remove-remnants-of-git-annex-support' into 'master'
Remove remnants of git annex See merge request !9508
This commit is contained in:
commit
05be66df9b
|
@ -10,11 +10,6 @@ class Profiles::KeysController < Profiles::ApplicationController
|
|||
@key = current_user.keys.find(params[:id])
|
||||
end
|
||||
|
||||
# Back-compat: We need to support this URL since git-annex webapp points to it
|
||||
def new
|
||||
redirect_to profile_keys_path
|
||||
end
|
||||
|
||||
def create
|
||||
@key = current_user.keys.new(key_params)
|
||||
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
title: Remove remnants of git annex support.
|
||||
merge_request:
|
||||
author:
|
|
@ -21,7 +21,7 @@ resource :profile, only: [:show, :update] do
|
|||
end
|
||||
end
|
||||
resource :preferences, only: [:show, :update]
|
||||
resources :keys, only: [:index, :show, :new, :create, :destroy]
|
||||
resources :keys, only: [:index, :show, :create, :destroy]
|
||||
resources :emails, only: [:index, :create, :destroy]
|
||||
resources :chat_names, only: [:index, :new, :create, :destroy] do
|
||||
collection do
|
||||
|
|
|
@ -308,8 +308,8 @@ Running on runner-8a2f473d-project-1796893-concurrent-0 via runner-8a2f473d-mach
|
|||
++ CI_RUNNER_ID=1337
|
||||
++ export CI_RUNNER_DESCRIPTION=shared-runners-manager-1.example.com
|
||||
++ CI_RUNNER_DESCRIPTION=shared-runners-manager-1.example.com
|
||||
++ export 'CI_RUNNER_TAGS=shared, docker, linux, ruby, mysql, postgres, mongo, git-annex'
|
||||
++ CI_RUNNER_TAGS='shared, docker, linux, ruby, mysql, postgres, mongo, git-annex'
|
||||
++ export 'CI_RUNNER_TAGS=shared, docker, linux, ruby, mysql, postgres, mongo'
|
||||
++ CI_RUNNER_TAGS='shared, docker, linux, ruby, mysql, postgres, mongo'
|
||||
++ export CI_REGISTRY=registry.example.com
|
||||
++ CI_REGISTRY=registry.example.com
|
||||
++ export CI_DEBUG_TRACE=true
|
||||
|
|
|
@ -15,13 +15,6 @@ Kerberos and Atlassian Crowd are only available on the Enterprise Edition, so
|
|||
you should disable these mechanisms before downgrading and you should provide
|
||||
alternative authentication methods to your users.
|
||||
|
||||
### Git Annex
|
||||
|
||||
Git Annex is also only available on the Enterprise Edition. This means that if
|
||||
you have repositories that use Git Annex to store large files, these files will
|
||||
no longer be easily available via Git. You should consider migrating these
|
||||
repositories to use Git LFS before downgrading to the Community Edition.
|
||||
|
||||
### Remove Jenkins CI Service entries from the database
|
||||
|
||||
The `JenkinsService` class is only available on the Enterprise Edition codebase,
|
||||
|
|
|
@ -165,7 +165,7 @@ The curriculum is composed of GitLab videos, screencasts, presentations, project
|
|||
|
||||
#### 3.4. Large Files
|
||||
|
||||
1. [Big files in Git (Git LFS, Annex) - Video](https://www.youtube.com/watch?v=DawznUxYDe4)
|
||||
1. [Big files in Git (Git LFS) - Video](https://www.youtube.com/watch?v=DawznUxYDe4)
|
||||
|
||||
#### 3.5. LDAP and Active Directory
|
||||
|
||||
|
|
|
@ -167,7 +167,6 @@ Some tickets need specific knowledge or a deep understanding of a particular com
|
|||
|
||||
Move on to understanding some of GitLab's more advanced features. You can make use of GitLab.com to understand the features from an end-user perspective and then use your own instance to understand setup and configuration of the feature from an Administrative perspective
|
||||
|
||||
- Set up and try [Git Annex](https://docs.gitlab.com/ee/workflow/git_annex.html)
|
||||
- Set up and try [Git LFS](https://docs.gitlab.com/ee/workflow/lfs/manage_large_binaries_with_git_lfs.html)
|
||||
- Get to know the [GitLab API](https://docs.gitlab.com/ee/api/README.html), its capabilities and shortcomings
|
||||
- Learn how to [migrate from SVN to Git](https://docs.gitlab.com/ee/workflow/importing/migrating_from_svn.html)
|
||||
|
|
|
@ -4,13 +4,6 @@ Managing large files such as audio, video and graphics files has always been one
|
|||
of the shortcomings of Git. The general recommendation is to not have Git repositories
|
||||
larger than 1GB to preserve performance.
|
||||
|
||||
GitLab already supports [managing large files with git annex](http://docs.gitlab.com/ee/workflow/git_annex.html)
|
||||
(EE only), however in certain environments it is not always convenient to use
|
||||
different commands to differentiate between the large files and regular ones.
|
||||
|
||||
Git LFS makes this simpler for the end user by removing the requirement to
|
||||
learn new commands.
|
||||
|
||||
## How it works
|
||||
|
||||
Git LFS client talks with the GitLab server over HTTPS. It uses HTTP Basic Authentication
|
||||
|
|
|
@ -180,9 +180,8 @@ module Backup
|
|||
return unless Dir.exist?(path)
|
||||
|
||||
dir_entries = Dir.entries(path)
|
||||
%w[annex custom_hooks].each do |entry|
|
||||
yield(entry) if dir_entries.include?(entry)
|
||||
end
|
||||
|
||||
yield('custom_hooks') if dir_entries.include?('custom_hooks')
|
||||
end
|
||||
|
||||
def prepare
|
||||
|
|
|
@ -3,16 +3,6 @@ require 'spec_helper'
|
|||
describe Profiles::KeysController do
|
||||
let(:user) { create(:user) }
|
||||
|
||||
describe '#new' do
|
||||
before { sign_in(user) }
|
||||
|
||||
it 'redirects to #index' do
|
||||
get :new
|
||||
|
||||
expect(response).to redirect_to(profile_keys_path)
|
||||
end
|
||||
end
|
||||
|
||||
describe "#get_keys" do
|
||||
describe "non existant user" do
|
||||
it "does not generally work" do
|
||||
|
|
|
@ -108,7 +108,7 @@ describe 'gitlab:app namespace rake task' do
|
|||
$stdout = orig_stdout
|
||||
end
|
||||
|
||||
describe 'backup creation and deletion using annex and custom_hooks' do
|
||||
describe 'backup creation and deletion using custom_hooks' do
|
||||
let(:project) { create(:project) }
|
||||
let(:user_backup_path) { "repositories/#{project.path_with_namespace}" }
|
||||
|
||||
|
@ -132,25 +132,6 @@ describe 'gitlab:app namespace rake task' do
|
|||
Dir.chdir(@origin_cd)
|
||||
end
|
||||
|
||||
context 'project uses git-annex and successfully creates backup' do
|
||||
let(:filename) { "annex" }
|
||||
|
||||
it 'creates annex.tar and project bundle' do
|
||||
tar_contents, exit_status = Gitlab::Popen.popen(%W{tar -tvf #{@backup_tar}})
|
||||
|
||||
expect(exit_status).to eq(0)
|
||||
expect(tar_contents).to match(user_backup_path)
|
||||
expect(tar_contents).to match("#{user_backup_path}/annex.tar")
|
||||
expect(tar_contents).to match("#{user_backup_path}.bundle")
|
||||
end
|
||||
|
||||
it 'restores files correctly' do
|
||||
restore_backup
|
||||
|
||||
expect(Dir.entries(File.join(project.repository.path, "annex"))).to include("dummy.txt")
|
||||
end
|
||||
end
|
||||
|
||||
context 'project uses custom_hooks and successfully creates backup' do
|
||||
let(:filename) { "custom_hooks" }
|
||||
|
||||
|
|
Loading…
Reference in New Issue