diff options
| author | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-05-03 15:19:21 +0100 |
|---|---|---|
| committer | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-05-07 12:00:13 +0200 |
| commit | 961255b107370a1350f91d0835cf0e849d237f7d (patch) | |
| tree | 74690c9c0df07f86a6acccc5b7ebc51d310fefa2 /app/views/projects | |
| parent | 9a13059332a0c81b3a953f57bb9e40346eba951d (diff) | |
| download | gitlab-ce-961255b107370a1350f91d0835cf0e849d237f7d.tar.gz | |
Adds remote mirror table migration
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/mirrors/_instructions.html.haml | 10 | ||||
| -rw-r--r-- | app/views/projects/mirrors/_show.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/settings/repository/show.html.haml | 2 |
3 files changed, 14 insertions, 2 deletions
diff --git a/app/views/projects/mirrors/_instructions.html.haml b/app/views/projects/mirrors/_instructions.html.haml new file mode 100644 index 00000000000..64f0fde30cf --- /dev/null +++ b/app/views/projects/mirrors/_instructions.html.haml @@ -0,0 +1,10 @@ +.account-well.prepend-top-default.append-bottom-default + %ul + %li + The repository must be accessible over <code>http://</code>, <code>https://</code>, <code>ssh://</code> or <code>git://</code>. + %li + Include the username in the URL if required: <code>https://username@gitlab.company.com/group/project.git</code>. + %li + The update action will time out after 10 minutes. For big repositories, use a clone/push combination. + %li + The Git LFS objects will <strong>not</strong> be synced. diff --git a/app/views/projects/mirrors/_show.html.haml b/app/views/projects/mirrors/_show.html.haml index da789906aef..de77701a373 100644 --- a/app/views/projects/mirrors/_show.html.haml +++ b/app/views/projects/mirrors/_show.html.haml @@ -1,3 +1,3 @@ -- if can?(current_user, :admin_mirror, @project) - = render 'projects/mirrors/push' +- if can?(current_user, :admin_remote_mirror, @project) + = render 'projects/mirrors/push' diff --git a/app/views/projects/settings/repository/show.html.haml b/app/views/projects/settings/repository/show.html.haml index f57590a908f..5dda2ec28b4 100644 --- a/app/views/projects/settings/repository/show.html.haml +++ b/app/views/projects/settings/repository/show.html.haml @@ -2,6 +2,8 @@ - page_title "Repository" - @content_class = "limit-container-width" unless fluid_layout += render "projects/mirrors/show" + -# Protected branches & tags use a lot of nested partials. -# The shared parts of the views can be found in the `shared` directory. -# Those are used throughout the actual views. These `shared` views are then |