From b6a59ccc8f5c7a914627bd0504f879544514d72b Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Fri, 9 Mar 2018 21:32:11 +0000 Subject: Remove sync script for gitlab-svgs and reference the vendored library directly --- .gitignore | 3 ++ app/assets/images/icons.json | 1 - app/assets/images/icons.svg | 1 - .../images/illustrations/canceled-job_empty.svg | 1 - .../images/illustrations/cluster_popover.svg | 1 - app/assets/images/illustrations/clusters_empty.svg | 1 - .../illustrations/convdev/convdev_no_data.svg | 1 - .../illustrations/convdev/convdev_no_index.svg | 1 - .../illustrations/convdev/convdev_overview.svg | 1 - .../images/illustrations/convdev/i2p_step_1.svg | 1 - .../images/illustrations/convdev/i2p_step_10.svg | 1 - .../images/illustrations/convdev/i2p_step_2.svg | 1 - .../images/illustrations/convdev/i2p_step_3.svg | 1 - .../images/illustrations/convdev/i2p_step_4.svg | 1 - .../images/illustrations/convdev/i2p_step_5.svg | 1 - .../images/illustrations/convdev/i2p_step_6.svg | 1 - .../images/illustrations/convdev/i2p_step_7.svg | 1 - .../images/illustrations/convdev/i2p_step_8.svg | 1 - .../images/illustrations/convdev/i2p_step_9.svg | 1 - app/assets/images/illustrations/epics.svg | 1 - app/assets/images/illustrations/epics/list.svg | 1 - app/assets/images/illustrations/epics/roadmap.svg | 1 - app/assets/images/illustrations/gitlab_logo.svg | 1 - .../illustrations/image_comment_light_cursor.svg | 1 - .../image_comment_light_cursor@2x.svg | 1 - .../issue-dashboard_results-without-filiter.svg | 1 - app/assets/images/illustrations/issues.svg | 1 - .../images/illustrations/job_not_triggered.svg | 1 - app/assets/images/illustrations/labels.svg | 1 - app/assets/images/illustrations/lock_promotion.svg | 1 - app/assets/images/illustrations/logos/go_logo.svg | 1 - .../images/illustrations/logos/mattermost_logo.svg | 1 - app/assets/images/illustrations/manual_action.svg | 1 - .../illustrations/merge_request_changes_empty.svg | 1 - app/assets/images/illustrations/merge_requests.svg | 1 - .../illustrations/milestone_removing-page.svg | 1 - .../illustrations/monitoring/getting_started.svg | 1 - .../images/illustrations/monitoring/loading.svg | 1 - .../illustrations/monitoring/unable_to_connect.svg | 1 - .../multi-editor_all_changes_committed_empty.svg | 1 - .../multi-editor_no_changes_empty.svg | 1 - .../multi-editor_no_staged_files_empty.svg | 1 - .../illustrations/multi_file_editor_empty.svg | 1 - app/assets/images/illustrations/no_commits.svg | 1 - .../images/illustrations/pending_job_empty.svg | 1 - .../images/illustrations/pipelines_empty.svg | 1 - .../images/illustrations/pipelines_failed.svg | 1 - .../images/illustrations/pipelines_pending.svg | 1 - .../images/illustrations/priority_labels.svg | 1 - .../images/illustrations/profile-page/activity.svg | 1 - .../profile-page/contributed-projects.svg | 1 - .../images/illustrations/profile-page/groups.svg | 1 - .../profile-page/personal-project.svg | 1 - .../profile-page/personal-projects.svg | 1 - .../images/illustrations/profile-page/snippets.svg | 1 - .../illustrations/prometheus-graphs_empty.svg | 1 - .../images/illustrations/service_desk_callout.svg | 1 - .../images/illustrations/service_desk_empty.svg | 1 - app/assets/images/illustrations/slack_logo.svg | 1 - app/assets/images/illustrations/todos_all_done.svg | 1 - app/assets/images/illustrations/todos_empty.svg | 1 - .../images/illustrations/web-ide_promotion.svg | 1 - .../images/illustrations/welcome/add_new_group.svg | 1 - .../illustrations/welcome/add_new_project.svg | 1 - .../images/illustrations/welcome/add_new_user.svg | 1 - .../illustrations/welcome/configure_server.svg | 1 - .../images/illustrations/welcome/ee_trial.svg | 1 - app/assets/images/illustrations/welcome/globe.svg | 1 - .../images/illustrations/welcome/lightbulb.svg | 1 - .../illustrations/wiki-fro-logged-out-users.svg | 1 - .../images/illustrations/wiki_login_empty.svg | 1 - .../images/illustrations/wiki_logout_empty.svg | 1 - config/application.rb | 6 +++ config/svg.config.js | 48 ---------------------- package.json | 3 +- 75 files changed, 10 insertions(+), 121 deletions(-) delete mode 100644 app/assets/images/icons.json delete mode 100644 app/assets/images/icons.svg delete mode 100644 app/assets/images/illustrations/canceled-job_empty.svg delete mode 100644 app/assets/images/illustrations/cluster_popover.svg delete mode 100644 app/assets/images/illustrations/clusters_empty.svg delete mode 100644 app/assets/images/illustrations/convdev/convdev_no_data.svg delete mode 100644 app/assets/images/illustrations/convdev/convdev_no_index.svg delete mode 100644 app/assets/images/illustrations/convdev/convdev_overview.svg delete mode 100644 app/assets/images/illustrations/convdev/i2p_step_1.svg delete mode 100644 app/assets/images/illustrations/convdev/i2p_step_10.svg delete mode 100644 app/assets/images/illustrations/convdev/i2p_step_2.svg delete mode 100644 app/assets/images/illustrations/convdev/i2p_step_3.svg delete mode 100644 app/assets/images/illustrations/convdev/i2p_step_4.svg delete mode 100644 app/assets/images/illustrations/convdev/i2p_step_5.svg delete mode 100644 app/assets/images/illustrations/convdev/i2p_step_6.svg delete mode 100644 app/assets/images/illustrations/convdev/i2p_step_7.svg delete mode 100644 app/assets/images/illustrations/convdev/i2p_step_8.svg delete mode 100644 app/assets/images/illustrations/convdev/i2p_step_9.svg delete mode 100644 app/assets/images/illustrations/epics.svg delete mode 100644 app/assets/images/illustrations/epics/list.svg delete mode 100644 app/assets/images/illustrations/epics/roadmap.svg delete mode 100644 app/assets/images/illustrations/gitlab_logo.svg delete mode 100644 app/assets/images/illustrations/image_comment_light_cursor.svg delete mode 100644 app/assets/images/illustrations/image_comment_light_cursor@2x.svg delete mode 100644 app/assets/images/illustrations/issue-dashboard_results-without-filiter.svg delete mode 100644 app/assets/images/illustrations/issues.svg delete mode 100644 app/assets/images/illustrations/job_not_triggered.svg delete mode 100644 app/assets/images/illustrations/labels.svg delete mode 100644 app/assets/images/illustrations/lock_promotion.svg delete mode 100644 app/assets/images/illustrations/logos/go_logo.svg delete mode 100644 app/assets/images/illustrations/logos/mattermost_logo.svg delete mode 100644 app/assets/images/illustrations/manual_action.svg delete mode 100644 app/assets/images/illustrations/merge_request_changes_empty.svg delete mode 100644 app/assets/images/illustrations/merge_requests.svg delete mode 100644 app/assets/images/illustrations/milestone_removing-page.svg delete mode 100644 app/assets/images/illustrations/monitoring/getting_started.svg delete mode 100644 app/assets/images/illustrations/monitoring/loading.svg delete mode 100644 app/assets/images/illustrations/monitoring/unable_to_connect.svg delete mode 100644 app/assets/images/illustrations/multi-editor_all_changes_committed_empty.svg delete mode 100644 app/assets/images/illustrations/multi-editor_no_changes_empty.svg delete mode 100644 app/assets/images/illustrations/multi-editor_no_staged_files_empty.svg delete mode 100644 app/assets/images/illustrations/multi_file_editor_empty.svg delete mode 100644 app/assets/images/illustrations/no_commits.svg delete mode 100644 app/assets/images/illustrations/pending_job_empty.svg delete mode 100644 app/assets/images/illustrations/pipelines_empty.svg delete mode 100644 app/assets/images/illustrations/pipelines_failed.svg delete mode 100644 app/assets/images/illustrations/pipelines_pending.svg delete mode 100644 app/assets/images/illustrations/priority_labels.svg delete mode 100644 app/assets/images/illustrations/profile-page/activity.svg delete mode 100644 app/assets/images/illustrations/profile-page/contributed-projects.svg delete mode 100644 app/assets/images/illustrations/profile-page/groups.svg delete mode 100644 app/assets/images/illustrations/profile-page/personal-project.svg delete mode 100644 app/assets/images/illustrations/profile-page/personal-projects.svg delete mode 100644 app/assets/images/illustrations/profile-page/snippets.svg delete mode 100644 app/assets/images/illustrations/prometheus-graphs_empty.svg delete mode 100644 app/assets/images/illustrations/service_desk_callout.svg delete mode 100644 app/assets/images/illustrations/service_desk_empty.svg delete mode 100644 app/assets/images/illustrations/slack_logo.svg delete mode 100644 app/assets/images/illustrations/todos_all_done.svg delete mode 100644 app/assets/images/illustrations/todos_empty.svg delete mode 100644 app/assets/images/illustrations/web-ide_promotion.svg delete mode 100644 app/assets/images/illustrations/welcome/add_new_group.svg delete mode 100644 app/assets/images/illustrations/welcome/add_new_project.svg delete mode 100644 app/assets/images/illustrations/welcome/add_new_user.svg delete mode 100644 app/assets/images/illustrations/welcome/configure_server.svg delete mode 100644 app/assets/images/illustrations/welcome/ee_trial.svg delete mode 100644 app/assets/images/illustrations/welcome/globe.svg delete mode 100644 app/assets/images/illustrations/welcome/lightbulb.svg delete mode 100644 app/assets/images/illustrations/wiki-fro-logged-out-users.svg delete mode 100644 app/assets/images/illustrations/wiki_login_empty.svg delete mode 100644 app/assets/images/illustrations/wiki_logout_empty.svg delete mode 100644 config/svg.config.js diff --git a/.gitignore b/.gitignore index fa39ae01ff0..90c6bd99d30 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,9 @@ eslint-report.html /.yarn-cache /.byebug_history /Vagrantfile +/app/assets/images/icons.json +/app/assets/images/icons.svg +/app/assets/images/illustrations/ /app/assets/javascripts/locale/**/app.js /backups/* /config/aws.yml diff --git a/app/assets/images/icons.json b/app/assets/images/icons.json deleted file mode 100644 index d6f6e50398b..00000000000 --- a/app/assets/images/icons.json +++ /dev/null @@ -1 +0,0 @@ -{"iconCount":198,"spriteSize":89379,"icons":["abuse","account","admin","angle-double-left","angle-double-right","angle-down","angle-left","angle-right","angle-up","appearance","applications","approval","arrow-down","arrow-right","assignee","blame","bold","book","bookmark","branch","bullhorn","calendar","cancel","chart","chevron-down","chevron-left","chevron-right","chevron-up","clock","close","code","collapse","comment-dots","comment-next","comment","comments","commit","compress","credit-card","cut","dashboard","disk","doc_code","doc_image","doc_text","double-headed-arrow","download","duplicate","earth","ellipsis_v","emoji_slightly_smiling_face","emoji_smile","emoji_smiley","epic","error","expand","external-link","eye-slash","eye","file-addition","file-deletion","file-modified","filter","folder-o","folder-open","folder","fork","geo-nodes","git-merge","go-back","group","history","home","hook","hourglass","image-comment-dark","image-comment-light","import","issue-block","issue-child","issue-close","issue-duplicate","issue-external","issue-new","issue-open-m","issue-open","issue-parent","issues","italic","key-2","key","label","labels","leave","level-up","license","link","list-bulleted","list-numbered","location-dot","location","lock-open","lock","log","mail","menu","merge-request-close","messages","mobile-issue-close","monitor-lines","monitor","more","notifications-off","notifications","overview","pencil-square","pencil","pipeline","play","plus-square-o","plus-square","plus","podcast","preferences","profile","project","push-rules","question-o","question","quote","redo","remove","repeat","retry","scale","screen-full","screen-normal","scroll_down","scroll_up","search","settings","shield","slight-frown","slight-smile","smile","smiley","snippet","soft-unwrap","soft-wrap","spam","spinner","staged","star-o","star","status_canceled_borderless","status_canceled","status_closed","status_created_borderless","status_created","status_failed_borderless","status_failed","status_manual_borderless","status_manual","status_notfound_borderless","status_notfound","status_open","status_pending_borderless","status_pending","status_running_borderless","status_running","status_skipped_borderless","status_skipped","status_success_borderless","status_success_solid","status_success","status_warning_borderless","status_warning","stop","task-done","template","terminal","thumb-down","thumb-up","thumbtack","time-out","timer","todo-add","todo-done","token","unapproval","unassignee","unlink","unstaged","user","users","volume-up","warning","work"]} \ No newline at end of file diff --git a/app/assets/images/icons.svg b/app/assets/images/icons.svg deleted file mode 100644 index 70205220e87..00000000000 --- a/app/assets/images/icons.svg +++ /dev/null @@ -1 +0,0 @@ -error \ No newline at end of file diff --git a/app/assets/images/illustrations/canceled-job_empty.svg b/app/assets/images/illustrations/canceled-job_empty.svg deleted file mode 100644 index e4a7c244f56..00000000000 --- a/app/assets/images/illustrations/canceled-job_empty.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/cluster_popover.svg b/app/assets/images/illustrations/cluster_popover.svg deleted file mode 100644 index 202231373f1..00000000000 --- a/app/assets/images/illustrations/cluster_popover.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/clusters_empty.svg b/app/assets/images/illustrations/clusters_empty.svg deleted file mode 100644 index 39627a1c314..00000000000 --- a/app/assets/images/illustrations/clusters_empty.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/convdev/convdev_no_data.svg b/app/assets/images/illustrations/convdev/convdev_no_data.svg deleted file mode 100644 index b90eddcccfa..00000000000 --- a/app/assets/images/illustrations/convdev/convdev_no_data.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/convdev/convdev_no_index.svg b/app/assets/images/illustrations/convdev/convdev_no_index.svg deleted file mode 100644 index 4aaf505e0b8..00000000000 --- a/app/assets/images/illustrations/convdev/convdev_no_index.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/convdev/convdev_overview.svg b/app/assets/images/illustrations/convdev/convdev_overview.svg deleted file mode 100644 index a06d70812ca..00000000000 --- a/app/assets/images/illustrations/convdev/convdev_overview.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/convdev/i2p_step_1.svg b/app/assets/images/illustrations/convdev/i2p_step_1.svg deleted file mode 100644 index 67467b1513d..00000000000 --- a/app/assets/images/illustrations/convdev/i2p_step_1.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/convdev/i2p_step_10.svg b/app/assets/images/illustrations/convdev/i2p_step_10.svg deleted file mode 100644 index 588ecd81414..00000000000 --- a/app/assets/images/illustrations/convdev/i2p_step_10.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/convdev/i2p_step_2.svg b/app/assets/images/illustrations/convdev/i2p_step_2.svg deleted file mode 100644 index 4280024c23c..00000000000 --- a/app/assets/images/illustrations/convdev/i2p_step_2.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/convdev/i2p_step_3.svg b/app/assets/images/illustrations/convdev/i2p_step_3.svg deleted file mode 100644 index 7690f91b420..00000000000 --- a/app/assets/images/illustrations/convdev/i2p_step_3.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/convdev/i2p_step_4.svg b/app/assets/images/illustrations/convdev/i2p_step_4.svg deleted file mode 100644 index ba21b9e2c3a..00000000000 --- a/app/assets/images/illustrations/convdev/i2p_step_4.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/convdev/i2p_step_5.svg b/app/assets/images/illustrations/convdev/i2p_step_5.svg deleted file mode 100644 index 3c8f8422a97..00000000000 --- a/app/assets/images/illustrations/convdev/i2p_step_5.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/convdev/i2p_step_6.svg b/app/assets/images/illustrations/convdev/i2p_step_6.svg deleted file mode 100644 index 933860798ad..00000000000 --- a/app/assets/images/illustrations/convdev/i2p_step_6.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/convdev/i2p_step_7.svg b/app/assets/images/illustrations/convdev/i2p_step_7.svg deleted file mode 100644 index d97c8f7c2d4..00000000000 --- a/app/assets/images/illustrations/convdev/i2p_step_7.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/convdev/i2p_step_8.svg b/app/assets/images/illustrations/convdev/i2p_step_8.svg deleted file mode 100644 index 919bbeff319..00000000000 --- a/app/assets/images/illustrations/convdev/i2p_step_8.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/convdev/i2p_step_9.svg b/app/assets/images/illustrations/convdev/i2p_step_9.svg deleted file mode 100644 index 2d1b10d430d..00000000000 --- a/app/assets/images/illustrations/convdev/i2p_step_9.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/epics.svg b/app/assets/images/illustrations/epics.svg deleted file mode 100644 index be6c3fb76a5..00000000000 --- a/app/assets/images/illustrations/epics.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/epics/list.svg b/app/assets/images/illustrations/epics/list.svg deleted file mode 100644 index be6c3fb76a5..00000000000 --- a/app/assets/images/illustrations/epics/list.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/epics/roadmap.svg b/app/assets/images/illustrations/epics/roadmap.svg deleted file mode 100644 index a14f14b91c9..00000000000 --- a/app/assets/images/illustrations/epics/roadmap.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/gitlab_logo.svg b/app/assets/images/illustrations/gitlab_logo.svg deleted file mode 100644 index 8dbd75a340e..00000000000 --- a/app/assets/images/illustrations/gitlab_logo.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/image_comment_light_cursor.svg b/app/assets/images/illustrations/image_comment_light_cursor.svg deleted file mode 100644 index ac712ea0c96..00000000000 --- a/app/assets/images/illustrations/image_comment_light_cursor.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/image_comment_light_cursor@2x.svg b/app/assets/images/illustrations/image_comment_light_cursor@2x.svg deleted file mode 100644 index 02943acd9d7..00000000000 --- a/app/assets/images/illustrations/image_comment_light_cursor@2x.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/issue-dashboard_results-without-filiter.svg b/app/assets/images/illustrations/issue-dashboard_results-without-filiter.svg deleted file mode 100644 index cd9070425b0..00000000000 --- a/app/assets/images/illustrations/issue-dashboard_results-without-filiter.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/issues.svg b/app/assets/images/illustrations/issues.svg deleted file mode 100644 index c8e0504732d..00000000000 --- a/app/assets/images/illustrations/issues.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/job_not_triggered.svg b/app/assets/images/illustrations/job_not_triggered.svg deleted file mode 100644 index e13c1cb0a7d..00000000000 --- a/app/assets/images/illustrations/job_not_triggered.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/labels.svg b/app/assets/images/illustrations/labels.svg deleted file mode 100644 index 3a2d521323b..00000000000 --- a/app/assets/images/illustrations/labels.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/lock_promotion.svg b/app/assets/images/illustrations/lock_promotion.svg deleted file mode 100644 index 6f1f9b2b030..00000000000 --- a/app/assets/images/illustrations/lock_promotion.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/logos/go_logo.svg b/app/assets/images/illustrations/logos/go_logo.svg deleted file mode 100644 index 7fd49118006..00000000000 --- a/app/assets/images/illustrations/logos/go_logo.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/logos/mattermost_logo.svg b/app/assets/images/illustrations/logos/mattermost_logo.svg deleted file mode 100644 index b577c0599aa..00000000000 --- a/app/assets/images/illustrations/logos/mattermost_logo.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/manual_action.svg b/app/assets/images/illustrations/manual_action.svg deleted file mode 100644 index 85735855b46..00000000000 --- a/app/assets/images/illustrations/manual_action.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/merge_request_changes_empty.svg b/app/assets/images/illustrations/merge_request_changes_empty.svg deleted file mode 100644 index 40efeb2de57..00000000000 --- a/app/assets/images/illustrations/merge_request_changes_empty.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/merge_requests.svg b/app/assets/images/illustrations/merge_requests.svg deleted file mode 100644 index b9b8f0058e6..00000000000 --- a/app/assets/images/illustrations/merge_requests.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/milestone_removing-page.svg b/app/assets/images/illustrations/milestone_removing-page.svg deleted file mode 100644 index a8cd54da0d3..00000000000 --- a/app/assets/images/illustrations/milestone_removing-page.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/monitoring/getting_started.svg b/app/assets/images/illustrations/monitoring/getting_started.svg deleted file mode 100644 index ff783bdd388..00000000000 --- a/app/assets/images/illustrations/monitoring/getting_started.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/monitoring/loading.svg b/app/assets/images/illustrations/monitoring/loading.svg deleted file mode 100644 index 1e196fc8ad1..00000000000 --- a/app/assets/images/illustrations/monitoring/loading.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/monitoring/unable_to_connect.svg b/app/assets/images/illustrations/monitoring/unable_to_connect.svg deleted file mode 100644 index 314c052f931..00000000000 --- a/app/assets/images/illustrations/monitoring/unable_to_connect.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/multi-editor_all_changes_committed_empty.svg b/app/assets/images/illustrations/multi-editor_all_changes_committed_empty.svg deleted file mode 100644 index 06d73941c33..00000000000 --- a/app/assets/images/illustrations/multi-editor_all_changes_committed_empty.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/multi-editor_no_changes_empty.svg b/app/assets/images/illustrations/multi-editor_no_changes_empty.svg deleted file mode 100644 index ebeea1f3dd9..00000000000 --- a/app/assets/images/illustrations/multi-editor_no_changes_empty.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/multi-editor_no_staged_files_empty.svg b/app/assets/images/illustrations/multi-editor_no_staged_files_empty.svg deleted file mode 100644 index 08321ef526b..00000000000 --- a/app/assets/images/illustrations/multi-editor_no_staged_files_empty.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/multi_file_editor_empty.svg b/app/assets/images/illustrations/multi_file_editor_empty.svg deleted file mode 100644 index bd376f0a050..00000000000 --- a/app/assets/images/illustrations/multi_file_editor_empty.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/no_commits.svg b/app/assets/images/illustrations/no_commits.svg deleted file mode 100644 index 76fa25156dd..00000000000 --- a/app/assets/images/illustrations/no_commits.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/pending_job_empty.svg b/app/assets/images/illustrations/pending_job_empty.svg deleted file mode 100644 index 8de695afa18..00000000000 --- a/app/assets/images/illustrations/pending_job_empty.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/pipelines_empty.svg b/app/assets/images/illustrations/pipelines_empty.svg deleted file mode 100644 index f3107c8f062..00000000000 --- a/app/assets/images/illustrations/pipelines_empty.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/pipelines_failed.svg b/app/assets/images/illustrations/pipelines_failed.svg deleted file mode 100644 index 8daf7da86ed..00000000000 --- a/app/assets/images/illustrations/pipelines_failed.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/pipelines_pending.svg b/app/assets/images/illustrations/pipelines_pending.svg deleted file mode 100644 index 25038366e92..00000000000 --- a/app/assets/images/illustrations/pipelines_pending.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/priority_labels.svg b/app/assets/images/illustrations/priority_labels.svg deleted file mode 100644 index b79c551d3d7..00000000000 --- a/app/assets/images/illustrations/priority_labels.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/profile-page/activity.svg b/app/assets/images/illustrations/profile-page/activity.svg deleted file mode 100644 index a0304479737..00000000000 --- a/app/assets/images/illustrations/profile-page/activity.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/profile-page/contributed-projects.svg b/app/assets/images/illustrations/profile-page/contributed-projects.svg deleted file mode 100644 index 023a7e3b956..00000000000 --- a/app/assets/images/illustrations/profile-page/contributed-projects.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/profile-page/groups.svg b/app/assets/images/illustrations/profile-page/groups.svg deleted file mode 100644 index 97aca4d69ee..00000000000 --- a/app/assets/images/illustrations/profile-page/groups.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/profile-page/personal-project.svg b/app/assets/images/illustrations/profile-page/personal-project.svg deleted file mode 100644 index 3e8df10ed38..00000000000 --- a/app/assets/images/illustrations/profile-page/personal-project.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/profile-page/personal-projects.svg b/app/assets/images/illustrations/profile-page/personal-projects.svg deleted file mode 100644 index 023a7e3b956..00000000000 --- a/app/assets/images/illustrations/profile-page/personal-projects.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/profile-page/snippets.svg b/app/assets/images/illustrations/profile-page/snippets.svg deleted file mode 100644 index ef0275cede3..00000000000 --- a/app/assets/images/illustrations/profile-page/snippets.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/prometheus-graphs_empty.svg b/app/assets/images/illustrations/prometheus-graphs_empty.svg deleted file mode 100644 index 0ef198f59cd..00000000000 --- a/app/assets/images/illustrations/prometheus-graphs_empty.svg +++ /dev/null @@ -1 +0,0 @@ -prometheus-graphs_empty \ No newline at end of file diff --git a/app/assets/images/illustrations/service_desk_callout.svg b/app/assets/images/illustrations/service_desk_callout.svg deleted file mode 100644 index 2886388279e..00000000000 --- a/app/assets/images/illustrations/service_desk_callout.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/service_desk_empty.svg b/app/assets/images/illustrations/service_desk_empty.svg deleted file mode 100644 index daaaeae6a17..00000000000 --- a/app/assets/images/illustrations/service_desk_empty.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/slack_logo.svg b/app/assets/images/illustrations/slack_logo.svg deleted file mode 100644 index b8d7906c2e1..00000000000 --- a/app/assets/images/illustrations/slack_logo.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/todos_all_done.svg b/app/assets/images/illustrations/todos_all_done.svg deleted file mode 100644 index 6387497a6fb..00000000000 --- a/app/assets/images/illustrations/todos_all_done.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/todos_empty.svg b/app/assets/images/illustrations/todos_empty.svg deleted file mode 100644 index 4de6cb403b9..00000000000 --- a/app/assets/images/illustrations/todos_empty.svg +++ /dev/null @@ -1 +0,0 @@ -@ \ No newline at end of file diff --git a/app/assets/images/illustrations/web-ide_promotion.svg b/app/assets/images/illustrations/web-ide_promotion.svg deleted file mode 100644 index ef61348057d..00000000000 --- a/app/assets/images/illustrations/web-ide_promotion.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/welcome/add_new_group.svg b/app/assets/images/illustrations/welcome/add_new_group.svg deleted file mode 100644 index b10a3ae8812..00000000000 --- a/app/assets/images/illustrations/welcome/add_new_group.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/welcome/add_new_project.svg b/app/assets/images/illustrations/welcome/add_new_project.svg deleted file mode 100644 index 4b8dc34c088..00000000000 --- a/app/assets/images/illustrations/welcome/add_new_project.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/welcome/add_new_user.svg b/app/assets/images/illustrations/welcome/add_new_user.svg deleted file mode 100644 index d4c184989bf..00000000000 --- a/app/assets/images/illustrations/welcome/add_new_user.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/welcome/configure_server.svg b/app/assets/images/illustrations/welcome/configure_server.svg deleted file mode 100644 index f9dda816f11..00000000000 --- a/app/assets/images/illustrations/welcome/configure_server.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/welcome/ee_trial.svg b/app/assets/images/illustrations/welcome/ee_trial.svg deleted file mode 100644 index 6d0dcf0020c..00000000000 --- a/app/assets/images/illustrations/welcome/ee_trial.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/welcome/globe.svg b/app/assets/images/illustrations/welcome/globe.svg deleted file mode 100644 index c2daae5f317..00000000000 --- a/app/assets/images/illustrations/welcome/globe.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/welcome/lightbulb.svg b/app/assets/images/illustrations/welcome/lightbulb.svg deleted file mode 100644 index fce10312085..00000000000 --- a/app/assets/images/illustrations/welcome/lightbulb.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/wiki-fro-logged-out-users.svg b/app/assets/images/illustrations/wiki-fro-logged-out-users.svg deleted file mode 100644 index c71841f72e5..00000000000 --- a/app/assets/images/illustrations/wiki-fro-logged-out-users.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/wiki_login_empty.svg b/app/assets/images/illustrations/wiki_login_empty.svg deleted file mode 100644 index 1cfa47220a5..00000000000 --- a/app/assets/images/illustrations/wiki_login_empty.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/illustrations/wiki_logout_empty.svg b/app/assets/images/illustrations/wiki_logout_empty.svg deleted file mode 100644 index c71841f72e5..00000000000 --- a/app/assets/images/illustrations/wiki_logout_empty.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/config/application.rb b/config/application.rb index ac6e4be4282..422b16a7719 100644 --- a/config/application.rb +++ b/config/application.rb @@ -117,6 +117,12 @@ module Gitlab config.assets.precompile << "test.css" config.assets.precompile << "locale/**/app.js" + # Import gitlab-svgs directly from vendored directory + config.assets.paths << "#{config.root}/node_modules/@gitlab-org/gitlab-svgs/dist" + config.assets.precompile << "icons.svg" + config.assets.precompile << "icons.json" + config.assets.precompile << "illustrations/*.svg" + # Version of your assets, change this if you want to expire all your assets config.assets.version = '1.0' diff --git a/config/svg.config.js b/config/svg.config.js deleted file mode 100644 index bb27f0caeef..00000000000 --- a/config/svg.config.js +++ /dev/null @@ -1,48 +0,0 @@ -/* eslint-disable no-commonjs */ -const path = require('path'); -const fs = require('fs'); - -const sourcePath = path.join('node_modules', '@gitlab-org/gitlab-svgs', 'dist'); -const sourcePathIllustrations = path.join('node_modules', '@gitlab-org/gitlab-svgs', 'dist', 'illustrations'); -const destPath = path.normalize(path.join('app', 'assets', 'images')); - -// Actual Task copying the 2 files + all illustrations -copyFileSync(path.join(sourcePath, 'icons.svg'), destPath); -copyFileSync(path.join(sourcePath, 'icons.json'), destPath); -copyFolderRecursiveSync(sourcePathIllustrations, destPath); - -// Helper Functions -function copyFileSync(source, target) { - var targetFile = target; - //if target is a directory a new file with the same name will be created - if (fs.existsSync(target)) { - if (fs.lstatSync(target).isDirectory()) { - targetFile = path.join(target, path.basename(source)); - } - } - console.log(`Copy SVG File : ${targetFile}`); - fs.writeFileSync(targetFile, fs.readFileSync(source)); -} - -function copyFolderRecursiveSync(source, target) { - var files = []; - - //check if folder needs to be created or integrated - var targetFolder = path.join(target, path.basename(source)); - if (!fs.existsSync(targetFolder)) { - fs.mkdirSync(targetFolder); - } - - //copy - if (fs.lstatSync(source).isDirectory()) { - files = fs.readdirSync(source); - files.forEach(function (file) { - var curSource = path.join(source, file); - if (fs.lstatSync(curSource).isDirectory()) { - copyFolderRecursiveSync(curSource, targetFolder); - } else { - copyFileSync(curSource, targetFolder); - } - }); - } -} diff --git a/package.json b/package.json index 48954e071da..6549da99f97 100644 --- a/package.json +++ b/package.json @@ -8,11 +8,11 @@ "karma": "karma start config/karma.config.js --single-run", "karma-coverage": "BABEL_ENV=coverage karma start config/karma.config.js --single-run", "karma-start": "karma start config/karma.config.js", - "svg": "node config/svg.config.js", "webpack": "webpack --config config/webpack.config.js", "webpack-prod": "NODE_ENV=production webpack --config config/webpack.config.js" }, "dependencies": { + "@gitlab-org/gitlab-svgs": "^1.13.0", "autosize": "^4.0.0", "axios": "^0.17.1", "babel-core": "^6.26.0", @@ -91,7 +91,6 @@ "worker-loader": "^1.1.0" }, "devDependencies": { - "@gitlab-org/gitlab-svgs": "^1.13.0", "axios-mock-adapter": "^1.10.0", "babel-eslint": "^8.0.2", "babel-plugin-istanbul": "^4.1.5", -- cgit v1.2.1