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
0e59434b
Commit
0e59434b
authored
Oct 20, 2020
by
Martin Wortschack
Committed by
Tim Zallmann
Oct 20, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace fa-github with GitLab SVG
- This MR replaces the fa-github icon with the github SVG
parent
d97a015a
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
16 additions
and
13 deletions
+16
-13
app/assets/stylesheets/fontawesome_custom.scss
app/assets/stylesheets/fontawesome_custom.scss
+0
-4
app/views/import/github/new.html.haml
app/views/import/github/new.html.haml
+3
-1
app/views/import/github/status.html.haml
app/views/import/github/status.html.haml
+4
-2
app/views/projects/_import_project_pane.html.haml
app/views/projects/_import_project_pane.html.haml
+2
-1
changelogs/unreleased/mw-replace-fa-github-icons.yml
changelogs/unreleased/mw-replace-fa-github-icons.yml
+5
-0
ee/app/views/projects/_new_ci_cd_only_project_pane.html.haml
ee/app/views/projects/_new_ci_cd_only_project_pane.html.haml
+2
-1
qa/qa/page/project/new.rb
qa/qa/page/project/new.rb
+0
-4
No files found.
app/assets/stylesheets/fontawesome_custom.scss
View file @
0e59434b
...
@@ -125,10 +125,6 @@
...
@@ -125,10 +125,6 @@
content
:
'\f077'
;
content
:
'\f077'
;
}
}
.
fa-github
:
:
before
{
content
:
'\f09b'
;
}
.
fa-paperclip
:
:
before
{
.
fa-paperclip
:
:
before
{
content
:
'\f0c6'
;
content
:
'\f0c6'
;
}
}
...
...
app/views/import/github/new.html.haml
View file @
0e59434b
...
@@ -10,7 +10,9 @@
...
@@ -10,7 +10,9 @@
=
import_github_authorize_message
=
import_github_authorize_message
-
if
github_import_configured?
&&
!
has_ci_cd_only_params?
-
if
github_import_configured?
&&
!
has_ci_cd_only_params?
=
link_to
icon
(
'github'
,
text:
title
),
status_import_github_path
,
class:
'btn btn-success'
=
link_to
status_import_github_path
,
class:
'btn btn-success gl-button'
do
=
sprite_icon
(
'github'
,
css_class:
'gl-mr-2'
)
=
title
%hr
%hr
...
...
app/views/import/github/status.html.haml
View file @
0e59434b
...
@@ -2,7 +2,9 @@
...
@@ -2,7 +2,9 @@
-
page_title
title
-
page_title
title
-
breadcrumb_title
title
-
breadcrumb_title
title
-
header_title
_
(
"Projects"
),
root_path
-
header_title
_
(
"Projects"
),
root_path
%h3
.page-title.mb-0
%h3
.page-title.mb-0.gl-display-flex
=
icon
'github'
,
class:
'fa-2x'
,
text:
_
(
'Import repositories from GitHub'
)
.gl-display-flex.gl-align-items-center.gl-justify-content-center
=
sprite_icon
(
'github'
,
css_class:
'gl-mr-2'
)
=
_
(
'Import repositories from GitHub'
)
=
render
'import/githubish_status'
,
provider:
'github'
=
render
'import/githubish_status'
,
provider:
'github'
app/views/projects/_import_project_pane.html.haml
View file @
0e59434b
...
@@ -15,7 +15,8 @@
...
@@ -15,7 +15,8 @@
-
if
github_import_enabled?
-
if
github_import_enabled?
%div
%div
=
link_to
new_import_github_path
,
class:
'btn js-import-github'
,
**
tracking_attrs
(
track_label
,
'click_button'
,
'github'
)
do
=
link_to
new_import_github_path
,
class:
'btn js-import-github'
,
**
tracking_attrs
(
track_label
,
'click_button'
,
'github'
)
do
=
icon
(
'github'
,
text:
'GitHub'
)
=
sprite_icon
(
'github'
)
GitHub
-
if
bitbucket_import_enabled?
-
if
bitbucket_import_enabled?
%div
%div
...
...
changelogs/unreleased/mw-replace-fa-github-icons.yml
0 → 100644
View file @
0e59434b
---
title
:
Replace fa-github with GitLab SVG MERGE_REQUEST_ID
merge_request
:
45533
author
:
type
:
changed
ee/app/views/projects/_new_ci_cd_only_project_pane.html.haml
View file @
0e59434b
...
@@ -20,7 +20,8 @@
...
@@ -20,7 +20,8 @@
%div
%div
-
if
github_import_enabled?
-
if
github_import_enabled?
=
link_to
new_import_github_path
(
ci_cd_only:
true
),
class:
'btn js-import-github'
,
data:
{
track_label:
"
#{
track_label
}
"
,
track_property:
'github'
,
track_event:
"click_button"
,
track_value:
""
}
do
=
link_to
new_import_github_path
(
ci_cd_only:
true
),
class:
'btn js-import-github'
,
data:
{
track_label:
"
#{
track_label
}
"
,
track_property:
'github'
,
track_event:
"click_button"
,
track_value:
""
}
do
=
icon
(
'github'
,
text:
'GitHub'
)
=
sprite_icon
(
'github'
)
GitHub
%div
%div
-
if
git_import_enabled?
-
if
git_import_enabled?
%button
.btn.btn-svg.js-toggle-button.js-import-git-toggle-button
{
type:
"button"
,
data:
{
toggle_open_class:
'active'
,
track_label:
"#{track_label}"
,
track_property:
'repo_url'
,
track_event:
"click_button"
,
track_value:
""
}
}
%button
.btn.btn-svg.js-toggle-button.js-import-git-toggle-button
{
type:
"button"
,
data:
{
toggle_open_class:
'active'
,
track_label:
"#{track_label}"
,
track_property:
'repo_url'
,
track_event:
"click_button"
,
track_value:
""
}
}
...
...
qa/qa/page/project/new.rb
View file @
0e59434b
...
@@ -23,10 +23,6 @@ module QA
...
@@ -23,10 +23,6 @@ module QA
element
:visibility_radios
,
'visibility_level:'
# rubocop:disable QA/ElementWithPattern
element
:visibility_radios
,
'visibility_level:'
# rubocop:disable QA/ElementWithPattern
end
end
view
'app/views/projects/_import_project_pane.html.haml'
do
element
:import_github
,
"icon('github', text: 'GitHub')"
# rubocop:disable QA/ElementWithPattern
end
view
'app/views/projects/project_templates/_template.html.haml'
do
view
'app/views/projects/project_templates/_template.html.haml'
do
element
:use_template_button
element
:use_template_button
element
:template_option_row
element
:template_option_row
...
...
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