kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'fj-refactor-mirror-instructions-view' into 'master'

Browse source 
Refactor mirror instructions view

See merge request gitlab-org/gitlab-ce!27901
This commit is contained in:
Sean McGivern 2019-05-01 12:16:04 +00:00
commit 105915527d
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/helpers/mirror_helper.rb
View file

@ -7,4 +7,8 @@ module MirrorHelper
project_mirror_endpoint: project_mirror_path(@project, :json) project_mirror_endpoint: project_mirror_path(@project, :json)
} }
end end
def mirror_lfs_sync_message
_('The Git LFS objects will <strong>not</strong> be synced.').html_safe
end
end end

2
app/views/projects/mirrors/_instructions.html.haml
View file

@ -7,7 +7,7 @@
%li %li
- minutes = Gitlab.config.gitlab_shell.git_timeout / 60 - minutes = Gitlab.config.gitlab_shell.git_timeout / 60
= _("The update action will time out after %{number_of_minutes} minutes. For big repositories, use a clone/push combination.") % { number_of_minutes: minutes } = _("The update action will time out after %{number_of_minutes} minutes. For big repositories, use a clone/push combination.") % { number_of_minutes: minutes }
%li= _('The Git LFS objects will <strong>not</strong> be synced.').html_safe %li= mirror_lfs_sync_message
%li %li
= _('This user will be the author of all events in the activity feed that are the result of an update, = _('This user will be the author of all events in the activity feed that are the result of an update,
like new branches being created or new commits being pushed to existing branches.') like new branches being created or new commits being pushed to existing branches.')