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
91c388af
Commit
91c388af
authored
Sep 18, 2020
by
Gilang Gumilar
Committed by
Mark Chao
Sep 18, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace bootstrap alerts in app/.../error.html.haml
parent
e36f62ad
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
15 deletions
+22
-15
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+1
-1
app/views/projects/forks/error.html.haml
app/views/projects/forks/error.html.haml
+16
-14
changelogs/unreleased/233703-replace-bootstrap-alerts-in-app-views-projects-forks-error-html-ha.yml
...trap-alerts-in-app-views-projects-forks-error-html-ha.yml
+5
-0
No files found.
app/helpers/projects_helper.rb
View file @
91c388af
...
@@ -7,7 +7,7 @@ module ProjectsHelper
...
@@ -7,7 +7,7 @@ module ProjectsHelper
end
end
def
link_to_project
(
project
)
def
link_to_project
(
project
)
link_to
namespace_project_path
(
namespace_id:
project
.
namespace
,
id:
project
),
title:
h
(
project
.
name
)
do
link_to
namespace_project_path
(
namespace_id:
project
.
namespace
,
id:
project
),
title:
h
(
project
.
name
)
,
class:
'gl-link'
do
title
=
content_tag
(
:span
,
project
.
name
,
class:
'project-name'
)
title
=
content_tag
(
:span
,
project
.
name
,
class:
'project-name'
)
if
project
.
namespace
if
project
.
namespace
...
...
app/views/projects/forks/error.html.haml
View file @
91c388af
-
page_title
_
(
"Fork project"
)
-
page_title
_
(
"Fork project"
)
-
if
@forked_project
&&
!
@forked_project
.
saved?
-
if
@forked_project
&&
!
@forked_project
.
saved?
.alert.alert-danger.alert-block
.gl-alert.gl-alert-danger.gl-mt-5
%h4
=
sprite_icon
(
'error'
,
size:
16
,
css_class:
'gl-icon gl-alert-icon'
)
%h4
.gl-alert-title
=
sprite_icon
(
'fork'
)
=
sprite_icon
(
'fork'
)
=
_
(
"Fork Error!"
)
=
_
(
"Fork Error!"
)
.gl-alert-body
%p
%p
=
_
(
"You tried to fork %{link_to_the_project} but it failed for the following reason:"
).
html_safe
%
{
link_to_the_project:
link_to_project
(
@project
)
}
=
_
(
"You tried to fork %{link_to_the_project} but it failed for the following reason:"
).
html_safe
%
{
link_to_the_project:
link_to_project
(
@project
)
}
...
@@ -16,5 +18,5 @@
...
@@ -16,5 +18,5 @@
-
else
-
else
=
error
=
error
%p
.gl-alert-actions
=
link_to
_
(
"Try to fork again"
),
new_project_fork_path
(
@project
),
title:
_
(
"Fork"
),
class:
"bt
n"
=
link_to
_
(
"Try to fork again"
),
new_project_fork_path
(
@project
),
title:
_
(
"Fork"
),
class:
"btn gl-alert-action btn-info btn-md gl-butto
n"
changelogs/unreleased/233703-replace-bootstrap-alerts-in-app-views-projects-forks-error-html-ha.yml
0 → 100644
View file @
91c388af
---
title
:
Replace bootstrap alerts in app/views/projects/forks/error.html.haml
merge_request
:
41292
author
:
Gilang Gumilar
type
:
changed
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