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
59853aac
Commit
59853aac
authored
Sep 29, 2020
by
Andrei Kyrnich
Committed by
Mark Florian
Sep 29, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply GitLab UI button styles
Applies to buttons in app/views/projects/forks
parent
2b7b0ed9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
4 deletions
+9
-4
app/views/projects/forks/_fork_button.html.haml
app/views/projects/forks/_fork_button.html.haml
+2
-2
app/views/projects/forks/index.html.haml
app/views/projects/forks/index.html.haml
+2
-2
changelogs/unreleased/gitlab_buttons_projects_forks.yml
changelogs/unreleased/gitlab_buttons_projects_forks.yml
+5
-0
No files found.
app/views/projects/forks/_fork_button.html.haml
View file @
59853aac
...
@@ -10,11 +10,11 @@
...
@@ -10,11 +10,11 @@
%h5
.gl-mt-3
%h5
.gl-mt-3
=
namespace
.
human_name
=
namespace
.
human_name
-
if
forked_project
=
namespace
.
find_fork_of
(
@project
)
-
if
forked_project
=
namespace
.
find_fork_of
(
@project
)
=
link_to
_
(
"Go to project"
),
project_path
(
forked_project
),
class:
"btn"
=
link_to
_
(
"Go to project"
),
project_path
(
forked_project
),
class:
"btn
gl-button btn-default
"
-
else
-
else
%div
{
class:
(
'has-tooltip'
unless
can_create_project
),
%div
{
class:
(
'has-tooltip'
unless
can_create_project
),
title:
(
_
(
'You have reached your project limit'
)
unless
can_create_project
)
}
title:
(
_
(
'You have reached your project limit'
)
unless
can_create_project
)
}
=
link_to
_
(
"Select"
),
project_forks_path
(
@project
,
namespace_key:
namespace
.
id
),
=
link_to
_
(
"Select"
),
project_forks_path
(
@project
,
namespace_key:
namespace
.
id
),
data:
{
qa_selector:
'fork_namespace_button'
,
qa_name:
namespace
.
human_name
},
data:
{
qa_selector:
'fork_namespace_button'
,
qa_name:
namespace
.
human_name
},
method:
"POST"
,
method:
"POST"
,
class:
[
"btn btn-success"
,
(
"disabled"
unless
can_create_project
)]
class:
[
"btn
gl-button
btn-success"
,
(
"disabled"
unless
can_create_project
)]
app/views/projects/forks/index.html.haml
View file @
59853aac
...
@@ -30,11 +30,11 @@
...
@@ -30,11 +30,11 @@
-
if
current_user
&&
can?
(
current_user
,
:fork_project
,
@project
)
-
if
current_user
&&
can?
(
current_user
,
:fork_project
,
@project
)
-
if
current_user
.
already_forked?
(
@project
)
&&
current_user
.
manageable_namespaces
.
size
<
2
-
if
current_user
.
already_forked?
(
@project
)
&&
current_user
.
manageable_namespaces
.
size
<
2
=
link_to
namespace_project_path
(
current_user
,
current_user
.
fork_of
(
@project
)),
title:
_
(
'Go to your fork'
),
class:
'btn btn-success'
do
=
link_to
namespace_project_path
(
current_user
,
current_user
.
fork_of
(
@project
)),
title:
_
(
'Go to your fork'
),
class:
'btn
gl-button
btn-success'
do
=
sprite_icon
(
'fork'
,
size:
12
)
=
sprite_icon
(
'fork'
,
size:
12
)
%span
=
_
(
'Fork'
)
%span
=
_
(
'Fork'
)
-
else
-
else
=
link_to
new_project_fork_path
(
@project
),
title:
_
(
"Fork project"
),
class:
'btn btn-success'
do
=
link_to
new_project_fork_path
(
@project
),
title:
_
(
"Fork project"
),
class:
'btn
gl-button
btn-success'
do
=
sprite_icon
(
'fork'
,
size:
12
)
=
sprite_icon
(
'fork'
,
size:
12
)
%span
=
_
(
'Fork'
)
%span
=
_
(
'Fork'
)
...
...
changelogs/unreleased/gitlab_buttons_projects_forks.yml
0 → 100644
View file @
59853aac
---
title
:
Apply GitLab UI button styles to HAML buttons app/views/projects/forks
merge_request
:
43101
author
:
Andrei Kyrnich @kyrnich
type
:
other
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