Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
293c4fdf
Commit
293c4fdf
authored
Nov 12, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move update mirror button to other buttons.
parent
c85f4c54
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
4 deletions
+15
-4
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+4
-0
app/views/projects/_home_panel.html.haml
app/views/projects/_home_panel.html.haml
+1
-1
app/views/projects/buttons/_update_mirror.html.haml
app/views/projects/buttons/_update_mirror.html.haml
+8
-0
app/views/shared/_mirror_update_button.html.haml
app/views/shared/_mirror_update_button.html.haml
+2
-3
No files found.
app/assets/stylesheets/pages/projects.scss
View file @
293c4fdf
...
...
@@ -205,6 +205,10 @@
.dropdown-toggle
{
margin
:
-5px
;
}
.update-mirror-button
{
margin-right
:
-1px
;
}
}
#notification-form
{
...
...
app/views/projects/_home_panel.html.haml
View file @
293c4fdf
...
...
@@ -19,7 +19,6 @@
Mirrored from
#{
link_to
import_url
,
import_url
}
.
=
render
"shared/mirror_status"
=
render
"shared/mirror_update_button"
,
size:
"sm"
.project-repo-buttons
...
...
@@ -30,6 +29,7 @@
=
render
"shared/clone_panel"
.split-repo-buttons
=
render
"projects/buttons/update_mirror"
=
render
"projects/buttons/download"
=
render
'projects/buttons/dropdown'
...
...
app/views/projects/buttons/_update_mirror.html.haml
0 → 100644
View file @
293c4fdf
-
if
@project
.
mirror?
&&
can?
(
current_user
,
:push_code
,
@project
)
-
size
=
nil
unless
defined?
(
size
)
&&
size
-
if
@project
.
updating_mirror?
%span
.btn.disabled.update-mirror-button.has_tooltip
{
title:
"Updating from mirror..."
}
=
icon
(
'refresh'
)
-
else
=
link_to
update_now_namespace_project_mirror_path
(
@project
.
namespace
,
@project
),
method: :post
,
class:
"btn update-mirror-button has_tooltip"
,
title:
"Update from mirror"
do
=
icon
(
'refresh'
)
app/views/shared/_mirror_update_button.html.haml
View file @
293c4fdf
-
if
@project
.
mirror?
&&
can?
(
current_user
,
:push_code
,
@project
)
-
size
=
nil
unless
defined?
(
size
)
&&
size
-
if
@project
.
updating_mirror?
%span
.btn.disabled
{
class:
(
"btn-#{size}"
if
size
)}
%span
.btn.disabled
=
icon
(
'refresh'
)
Updating
…
-
else
=
link_to
update_now_namespace_project_mirror_path
(
@project
.
namespace
,
@project
),
method: :post
,
class:
"btn
#{
"btn-
#{
size
}
"
if
size
}
"
do
=
link_to
update_now_namespace_project_mirror_path
(
@project
.
namespace
,
@project
),
method: :post
,
class:
"btn"
do
=
icon
(
'refresh'
)
Update Now
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