Commit dd570f1e authored by Robert Speicher's avatar Robert Speicher

Merge branch 'fix-mirror-status-position' into 'master'

Fix position of project mirror status

Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/123

See merge request !82
parents 2517d3a1 8a0bba2a
...@@ -12,10 +12,6 @@ ...@@ -12,10 +12,6 @@
Forked from Forked from
= link_to project_path(forked_from_project) do = link_to project_path(forked_from_project) do
= forked_from_project.namespace.try(:name) = forked_from_project.namespace.try(:name)
.cover-controls.left
.visibility-level-label.has_tooltip{title: project_visibility_level_description(@project.visibility_level), data: { container: 'body' } }
= visibility_level_icon(@project.visibility_level, fw: false)
= visibility_level_label(@project.visibility_level)
- if @project.mirror? - if @project.mirror?
- import_url = @project.safe_import_url - import_url = @project.safe_import_url
...@@ -23,6 +19,10 @@ ...@@ -23,6 +19,10 @@
Mirrored from #{link_to import_url, import_url}. Mirrored from #{link_to import_url, import_url}.
= render "shared/mirror_status" = render "shared/mirror_status"
.cover-controls.left
.visibility-level-label.has_tooltip{title: project_visibility_level_description(@project.visibility_level), data: { container: 'body' } }
= visibility_level_icon(@project.visibility_level, fw: false)
= visibility_level_label(@project.visibility_level)
.cover-controls .cover-controls
- if can?(current_user, :admin_project, @project) - if can?(current_user, :admin_project, @project)
...@@ -46,4 +46,3 @@ ...@@ -46,4 +46,3 @@
= render 'projects/buttons/dropdown' = render 'projects/buttons/dropdown'
= render 'projects/buttons/notifications' = render 'projects/buttons/notifications'
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment