diff options
author | Sean McGivern <sean@gitlab.com> | 2019-05-01 12:16:04 +0000 |
---|---|---|
committer | Sean McGivern <sean@gitlab.com> | 2019-05-01 12:16:04 +0000 |
commit | 105915527d34cb590a8f5a32ff953fb02970c3ee (patch) | |
tree | 6e9d2d09c3fd91dd65a4cbfc7498ddb25649e3b3 | |
parent | e6767f59220dba7e450e06106c041dd90f4d7105 (diff) | |
parent | dc8d1cd8e09f3e99e7e7b1c899be7e588f5c053b (diff) | |
download | gitlab-ce-105915527d34cb590a8f5a32ff953fb02970c3ee.tar.gz |
Merge branch 'fj-refactor-mirror-instructions-view' into 'master'
Refactor mirror instructions view
See merge request gitlab-org/gitlab-ce!27901
-rw-r--r-- | app/helpers/mirror_helper.rb | 4 | ||||
-rw-r--r-- | app/views/projects/mirrors/_instructions.html.haml | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/helpers/mirror_helper.rb b/app/helpers/mirror_helper.rb index 65c7cd82832..921c79ab771 100644 --- a/app/helpers/mirror_helper.rb +++ b/app/helpers/mirror_helper.rb @@ -7,4 +7,8 @@ module MirrorHelper project_mirror_endpoint: project_mirror_path(@project, :json) } end + + def mirror_lfs_sync_message + _('The Git LFS objects will <strong>not</strong> be synced.').html_safe + end end diff --git a/app/views/projects/mirrors/_instructions.html.haml b/app/views/projects/mirrors/_instructions.html.haml index 35a6885318a..33e5a6e67c3 100644 --- a/app/views/projects/mirrors/_instructions.html.haml +++ b/app/views/projects/mirrors/_instructions.html.haml @@ -7,7 +7,7 @@ %li - 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 } - %li= _('The Git LFS objects will <strong>not</strong> be synced.').html_safe + %li= mirror_lfs_sync_message %li = _('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.') |