Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
iv
gitlab-shell
Commits
5dae7411
Commit
5dae7411
authored
10 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Download
Email Patches
Plain Diff
Disable git-annex by default
parent
bb884125
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
4 deletions
+10
-4
CHANGELOG
CHANGELOG
+1
-1
config.yml.example
config.yml.example
+1
-1
lib/gitlab_config.rb
lib/gitlab_config.rb
+1
-1
spec/gitlab_shell_spec.rb
spec/gitlab_shell_spec.rb
+7
-1
No files found.
CHANGELOG
View file @
5dae7411
v2.5.0
- Support git-annex tool
- Support git-annex tool
(disabled by default)
v2.4.3
- Print broadcast message if one is available
...
...
This diff is collapsed.
Click to expand it.
config.yml.example
View file @
5dae7411
...
...
@@ -50,4 +50,4 @@ audit_usernames: false
# Enable git-annex support
# git-annex allows managing files with git, without checking the file contents into git
# See https://git-annex.branchable.com/ for documentation
git_annex_enabled:
tru
e
git_annex_enabled:
fals
e
This diff is collapsed.
Click to expand it.
lib/gitlab_config.rb
View file @
5dae7411
...
...
@@ -48,7 +48,7 @@ class GitlabConfig
end
def
git_annex_enabled?
@config
[
'git_annex_enabled'
]
||=
tru
e
@config
[
'git_annex_enabled'
]
||=
fals
e
end
# Build redis command to write update event in gitlab queue
...
...
This diff is collapsed.
Click to expand it.
spec/gitlab_shell_spec.rb
View file @
5dae7411
...
...
@@ -75,6 +75,8 @@ describe GitlabShell do
let
(
:repo_path
)
{
File
.
join
(
tmp_repos_path
,
'dzaporozhets/gitlab.git'
)
}
before
do
GitlabConfig
.
any_instance
.
stub
(
git_annex_enabled?:
true
)
# Create existing project
FileUtils
.
mkdir_p
(
repo_path
)
cmd
=
%W(git --git-dir=
#{
repo_path
}
init --bare)
...
...
@@ -187,7 +189,11 @@ describe GitlabShell do
end
describe
'git-annex'
do
before
{
ssh_cmd
'git-annex-shell commit /~/gitlab-ci.git SHA256'
}
before
do
GitlabConfig
.
any_instance
.
stub
(
git_annex_enabled?:
true
)
ssh_cmd
'git-annex-shell commit /~/gitlab-ci.git SHA256'
end
after
{
subject
.
exec
}
it
"should execute the command"
do
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment