From 9e6f99744e11c9b63f8a490666bdd96bca7dbde1 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 27 May 2016 20:39:43 +0800 Subject: optimize png images losslessly using zopflipng --- .../img/add_new_user_to_project_settings.png | Bin 22822 -> 18149 bytes .../add-user/img/add_user_email_accept.png | Bin 22961 -> 22877 bytes doc/workflow/add-user/img/add_user_email_ready.png | Bin 40305 -> 40207 bytes .../add-user/img/add_user_email_search.png | Bin 45884 -> 45798 bytes .../add-user/img/add_user_give_permissions.png | Bin 56480 -> 56380 bytes ...dd_user_import_members_from_another_project.png | Bin 38874 -> 38778 bytes .../add-user/img/add_user_imported_members.png | Bin 37873 -> 37835 bytes .../add-user/img/add_user_list_members.png | Bin 24427 -> 24337 bytes .../add-user/img/add_user_members_menu.png | Bin 42319 -> 42224 bytes .../add-user/img/add_user_search_people.png | Bin 39941 -> 39844 bytes doc/workflow/award_emoji.png | Bin 16926 -> 9939 bytes doc/workflow/ci_mr.png | Bin 40065 -> 29571 bytes doc/workflow/close_issue_mr.png | Bin 146292 -> 82595 bytes doc/workflow/environment_branches.png | Bin 40210 -> 20745 bytes doc/workflow/forking/branch_select.png | Bin 55352 -> 27299 bytes doc/workflow/forking/merge_request.png | Bin 60597 -> 31560 bytes doc/workflow/four_stages.png | Bin 20934 -> 10003 bytes doc/workflow/git_pull.png | Bin 167056 -> 94405 bytes doc/workflow/gitdashflow.png | Bin 184726 -> 131491 bytes doc/workflow/github_flow.png | Bin 20600 -> 10251 bytes doc/workflow/gitlab_flow.png | Bin 90883 -> 70871 bytes doc/workflow/good_commit.png | Bin 28433 -> 13131 bytes doc/workflow/groups/add_member_to_group.png | Bin 138184 -> 78060 bytes doc/workflow/groups/group_dashboard.png | Bin 107332 -> 59446 bytes doc/workflow/groups/group_with_two_projects.png | Bin 129319 -> 73101 bytes doc/workflow/groups/max_access_level.png | Bin 135354 -> 74947 bytes doc/workflow/groups/new_group_button.png | Bin 185406 -> 108482 bytes doc/workflow/groups/new_group_form.png | Bin 106491 -> 58860 bytes .../groups/other_group_sees_shared_project.png | Bin 118382 -> 64447 bytes doc/workflow/groups/override_access_level.png | Bin 157193 -> 90122 bytes doc/workflow/groups/project_members_via_group.png | Bin 151339 -> 86260 bytes doc/workflow/groups/share_project_with_groups.png | Bin 118868 -> 65633 bytes doc/workflow/groups/transfer_project.png | Bin 164958 -> 92115 bytes doc/workflow/img/award_emoji_select.png | Bin 65985 -> 49296 bytes .../img/award_emoji_votes_least_popular.png | Bin 144501 -> 116715 bytes .../img/award_emoji_votes_most_popular.png | Bin 136577 -> 108775 bytes .../img/award_emoji_votes_sort_options.png | Bin 162251 -> 131659 bytes doc/workflow/img/cherry_pick_changes_commit.png | Bin 353067 -> 304098 bytes .../img/cherry_pick_changes_commit_modal.png | Bin 312659 -> 264883 bytes doc/workflow/img/cherry_pick_changes_mr.png | Bin 252085 -> 212267 bytes doc/workflow/img/cherry_pick_changes_mr_modal.png | Bin 225569 -> 186597 bytes doc/workflow/img/file_finder_find_button.png | Bin 30974 -> 25458 bytes doc/workflow/img/file_finder_find_file.png | Bin 42658 -> 35114 bytes .../img/forking_workflow_choose_namespace.png | Bin 70405 -> 59114 bytes doc/workflow/img/forking_workflow_fork_button.png | Bin 26438 -> 20750 bytes .../img/forking_workflow_path_taken_error.png | Bin 22380 -> 17978 bytes doc/workflow/img/new_branch_from_issue.png | Bin 120622 -> 54607 bytes doc/workflow/img/revert_changes_commit.png | Bin 360098 -> 233750 bytes doc/workflow/img/revert_changes_commit_modal.png | Bin 327932 -> 205046 bytes doc/workflow/img/revert_changes_mr.png | Bin 367881 -> 241051 bytes doc/workflow/img/revert_changes_mr_modal.png | Bin 335010 -> 211022 bytes doc/workflow/img/todos_icon.png | Bin 6320 -> 3843 bytes doc/workflow/img/todos_index.png | Bin 184839 -> 152040 bytes .../img/web_editor_new_branch_dropdown.png | Bin 34233 -> 20436 bytes doc/workflow/img/web_editor_new_branch_page.png | Bin 21618 -> 11245 bytes .../img/web_editor_new_directory_dialog.png | Bin 26145 -> 13339 bytes .../img/web_editor_new_directory_dropdown.png | Bin 33714 -> 20007 bytes doc/workflow/img/web_editor_new_file_dropdown.png | Bin 34978 -> 20680 bytes doc/workflow/img/web_editor_new_file_editor.png | Bin 128658 -> 66261 bytes doc/workflow/img/web_editor_new_push_widget.png | Bin 11220 -> 7076 bytes doc/workflow/img/web_editor_new_tag_dropdown.png | Bin 33753 -> 20080 bytes doc/workflow/img/web_editor_new_tag_page.png | Bin 75536 -> 36610 bytes .../img/web_editor_start_new_merge_request.png | Bin 14352 -> 8596 bytes doc/workflow/img/web_editor_upload_file_dialog.png | Bin 46219 -> 21502 bytes .../img/web_editor_upload_file_dropdown.png | Bin 34835 -> 20651 bytes .../bitbucket_import_select_project.png | Bin 16121 -> 15288 bytes .../fogbugz_importer/fogbugz_import_finished.png | Bin 53276 -> 30266 bytes .../fogbugz_importer/fogbugz_import_login.png | Bin 44444 -> 20797 bytes .../fogbugz_import_select_fogbogz.png | Bin 35415 -> 20526 bytes .../fogbugz_import_select_project.png | Bin 62552 -> 34836 bytes .../fogbugz_importer/fogbugz_import_user_map.png | Bin 157856 -> 77208 bytes .../importing/gitlab_importer/importer.png | Bin 40778 -> 18366 bytes .../importing/gitlab_importer/new_project_page.png | Bin 72663 -> 33589 bytes .../img/import_projects_from_github_importer.png | Bin 28033 -> 22711 bytes ...mport_projects_from_github_new_project_page.png | Bin 17225 -> 13668 bytes doc/workflow/merge_commits.png | Bin 41422 -> 22181 bytes doc/workflow/merge_request.png | Bin 169503 -> 98070 bytes doc/workflow/merge_requests/commit_compare.png | Bin 110376 -> 65010 bytes doc/workflow/merge_requests/merge_request_diff.png | Bin 166226 -> 103239 bytes .../merge_request_diff_without_whitespace.png | Bin 121476 -> 71896 bytes doc/workflow/merge_when_build_succeeds/enable.png | Bin 151112 -> 68769 bytes doc/workflow/merge_when_build_succeeds/status.png | Bin 180318 -> 82655 bytes doc/workflow/messy_flow.png | Bin 33829 -> 19314 bytes doc/workflow/milestones/form.png | Bin 88591 -> 84872 bytes doc/workflow/milestones/group_form.png | Bin 77087 -> 74429 bytes doc/workflow/mr_inline_comments.png | Bin 193311 -> 117313 bytes doc/workflow/notifications/settings.png | Bin 90986 -> 59256 bytes doc/workflow/production_branch.png | Bin 21716 -> 10946 bytes .../protected_branches/protected_branches1.png | Bin 170113 -> 155815 bytes .../protected_branches/protected_branches2.png | Bin 25851 -> 23208 bytes doc/workflow/rebase.png | Bin 123041 -> 68976 bytes doc/workflow/release_branches.png | Bin 44173 -> 22163 bytes doc/workflow/releases/new_tag.png | Bin 154755 -> 87330 bytes doc/workflow/releases/tags.png | Bin 165449 -> 93016 bytes doc/workflow/remove_checkbox.png | Bin 22272 -> 12339 bytes doc/workflow/share_with_group.png | Bin 53784 -> 50450 bytes doc/workflow/shortcuts.png | Bin 108255 -> 108209 bytes .../wip_merge_requests/blocked_accept_button.png | Bin 65231 -> 32720 bytes doc/workflow/wip_merge_requests/mark_as_wip.png | Bin 41549 -> 21640 bytes doc/workflow/wip_merge_requests/unmark_as_wip.png | Bin 32151 -> 16606 bytes 100 files changed, 0 insertions(+), 0 deletions(-) (limited to 'doc/workflow') diff --git a/doc/workflow/add-user/img/add_new_user_to_project_settings.png b/doc/workflow/add-user/img/add_new_user_to_project_settings.png index 3da18cdae53..5da0552f9d6 100644 Binary files a/doc/workflow/add-user/img/add_new_user_to_project_settings.png and b/doc/workflow/add-user/img/add_new_user_to_project_settings.png differ diff --git a/doc/workflow/add-user/img/add_user_email_accept.png b/doc/workflow/add-user/img/add_user_email_accept.png index 18aabf93d50..a2954ad7c37 100644 Binary files a/doc/workflow/add-user/img/add_user_email_accept.png and b/doc/workflow/add-user/img/add_user_email_accept.png differ diff --git a/doc/workflow/add-user/img/add_user_email_ready.png b/doc/workflow/add-user/img/add_user_email_ready.png index 385d64330c0..19d91bc0999 100644 Binary files a/doc/workflow/add-user/img/add_user_email_ready.png and b/doc/workflow/add-user/img/add_user_email_ready.png differ diff --git a/doc/workflow/add-user/img/add_user_email_search.png b/doc/workflow/add-user/img/add_user_email_search.png index 84741edbca4..cb31b77d941 100644 Binary files a/doc/workflow/add-user/img/add_user_email_search.png and b/doc/workflow/add-user/img/add_user_email_search.png differ diff --git a/doc/workflow/add-user/img/add_user_give_permissions.png b/doc/workflow/add-user/img/add_user_give_permissions.png index 7e580384e54..e6b77022f06 100644 Binary files a/doc/workflow/add-user/img/add_user_give_permissions.png and b/doc/workflow/add-user/img/add_user_give_permissions.png differ diff --git a/doc/workflow/add-user/img/add_user_import_members_from_another_project.png b/doc/workflow/add-user/img/add_user_import_members_from_another_project.png index 8dbd73a5bc8..1068589c5ff 100644 Binary files a/doc/workflow/add-user/img/add_user_import_members_from_another_project.png and b/doc/workflow/add-user/img/add_user_import_members_from_another_project.png differ diff --git a/doc/workflow/add-user/img/add_user_imported_members.png b/doc/workflow/add-user/img/add_user_imported_members.png index abac1f59c02..5cd120a4245 100644 Binary files a/doc/workflow/add-user/img/add_user_imported_members.png and b/doc/workflow/add-user/img/add_user_imported_members.png differ diff --git a/doc/workflow/add-user/img/add_user_list_members.png b/doc/workflow/add-user/img/add_user_list_members.png index e17d88c6f5f..5fe3482192e 100644 Binary files a/doc/workflow/add-user/img/add_user_list_members.png and b/doc/workflow/add-user/img/add_user_list_members.png differ diff --git a/doc/workflow/add-user/img/add_user_members_menu.png b/doc/workflow/add-user/img/add_user_members_menu.png index ec5d39f402d..340d15c9830 100644 Binary files a/doc/workflow/add-user/img/add_user_members_menu.png and b/doc/workflow/add-user/img/add_user_members_menu.png differ diff --git a/doc/workflow/add-user/img/add_user_search_people.png b/doc/workflow/add-user/img/add_user_search_people.png index eaa062376f4..1c05d70ca31 100644 Binary files a/doc/workflow/add-user/img/add_user_search_people.png and b/doc/workflow/add-user/img/add_user_search_people.png differ diff --git a/doc/workflow/award_emoji.png b/doc/workflow/award_emoji.png index 3408ed95841..481680af80c 100644 Binary files a/doc/workflow/award_emoji.png and b/doc/workflow/award_emoji.png differ diff --git a/doc/workflow/ci_mr.png b/doc/workflow/ci_mr.png index a577356f8e8..f8a7708643e 100644 Binary files a/doc/workflow/ci_mr.png and b/doc/workflow/ci_mr.png differ diff --git a/doc/workflow/close_issue_mr.png b/doc/workflow/close_issue_mr.png index a136d642e12..5e520240233 100644 Binary files a/doc/workflow/close_issue_mr.png and b/doc/workflow/close_issue_mr.png differ diff --git a/doc/workflow/environment_branches.png b/doc/workflow/environment_branches.png index ee893ced13b..13fb0478eaa 100644 Binary files a/doc/workflow/environment_branches.png and b/doc/workflow/environment_branches.png differ diff --git a/doc/workflow/forking/branch_select.png b/doc/workflow/forking/branch_select.png index 275f64d113b..7f19414f3a9 100644 Binary files a/doc/workflow/forking/branch_select.png and b/doc/workflow/forking/branch_select.png differ diff --git a/doc/workflow/forking/merge_request.png b/doc/workflow/forking/merge_request.png index 2dc00ed08a1..e2da42a2be7 100644 Binary files a/doc/workflow/forking/merge_request.png and b/doc/workflow/forking/merge_request.png differ diff --git a/doc/workflow/four_stages.png b/doc/workflow/four_stages.png index 2f444fc6f79..49413087dca 100644 Binary files a/doc/workflow/four_stages.png and b/doc/workflow/four_stages.png differ diff --git a/doc/workflow/git_pull.png b/doc/workflow/git_pull.png index 7d47064eb14..9a1fdf899bf 100644 Binary files a/doc/workflow/git_pull.png and b/doc/workflow/git_pull.png differ diff --git a/doc/workflow/gitdashflow.png b/doc/workflow/gitdashflow.png index f2f091dd10b..e456cf9309d 100644 Binary files a/doc/workflow/gitdashflow.png and b/doc/workflow/gitdashflow.png differ diff --git a/doc/workflow/github_flow.png b/doc/workflow/github_flow.png index 88addb623ee..b3fca97cc2d 100644 Binary files a/doc/workflow/github_flow.png and b/doc/workflow/github_flow.png differ diff --git a/doc/workflow/gitlab_flow.png b/doc/workflow/gitlab_flow.png index 1ea191a672b..d85d4ff374e 100644 Binary files a/doc/workflow/gitlab_flow.png and b/doc/workflow/gitlab_flow.png differ diff --git a/doc/workflow/good_commit.png b/doc/workflow/good_commit.png index 3737a026644..7958feea4d9 100644 Binary files a/doc/workflow/good_commit.png and b/doc/workflow/good_commit.png differ diff --git a/doc/workflow/groups/add_member_to_group.png b/doc/workflow/groups/add_member_to_group.png index fa340ce572f..6e3f660d2e4 100644 Binary files a/doc/workflow/groups/add_member_to_group.png and b/doc/workflow/groups/add_member_to_group.png differ diff --git a/doc/workflow/groups/group_dashboard.png b/doc/workflow/groups/group_dashboard.png index 7fc9048d74d..662c932e536 100644 Binary files a/doc/workflow/groups/group_dashboard.png and b/doc/workflow/groups/group_dashboard.png differ diff --git a/doc/workflow/groups/group_with_two_projects.png b/doc/workflow/groups/group_with_two_projects.png index 87242781e4f..dc3475949f5 100644 Binary files a/doc/workflow/groups/group_with_two_projects.png and b/doc/workflow/groups/group_with_two_projects.png differ diff --git a/doc/workflow/groups/max_access_level.png b/doc/workflow/groups/max_access_level.png index 71106a8a5a0..2855a514013 100644 Binary files a/doc/workflow/groups/max_access_level.png and b/doc/workflow/groups/max_access_level.png differ diff --git a/doc/workflow/groups/new_group_button.png b/doc/workflow/groups/new_group_button.png index 51e82798658..26136312c8f 100644 Binary files a/doc/workflow/groups/new_group_button.png and b/doc/workflow/groups/new_group_button.png differ diff --git a/doc/workflow/groups/new_group_form.png b/doc/workflow/groups/new_group_form.png index bf992c40bc2..dc50a069ef2 100644 Binary files a/doc/workflow/groups/new_group_form.png and b/doc/workflow/groups/new_group_form.png differ diff --git a/doc/workflow/groups/other_group_sees_shared_project.png b/doc/workflow/groups/other_group_sees_shared_project.png index cbf2c3c1fdc..2230720cecd 100644 Binary files a/doc/workflow/groups/other_group_sees_shared_project.png and b/doc/workflow/groups/other_group_sees_shared_project.png differ diff --git a/doc/workflow/groups/override_access_level.png b/doc/workflow/groups/override_access_level.png index f4225a63679..9d6aaf4c363 100644 Binary files a/doc/workflow/groups/override_access_level.png and b/doc/workflow/groups/override_access_level.png differ diff --git a/doc/workflow/groups/project_members_via_group.png b/doc/workflow/groups/project_members_via_group.png index b13cb1cfd95..58270936a0b 100644 Binary files a/doc/workflow/groups/project_members_via_group.png and b/doc/workflow/groups/project_members_via_group.png differ diff --git a/doc/workflow/groups/share_project_with_groups.png b/doc/workflow/groups/share_project_with_groups.png index a5dbc89fe90..5772d4deced 100644 Binary files a/doc/workflow/groups/share_project_with_groups.png and b/doc/workflow/groups/share_project_with_groups.png differ diff --git a/doc/workflow/groups/transfer_project.png b/doc/workflow/groups/transfer_project.png index 044fe10d073..0aef3ab3f0f 100644 Binary files a/doc/workflow/groups/transfer_project.png and b/doc/workflow/groups/transfer_project.png differ diff --git a/doc/workflow/img/award_emoji_select.png b/doc/workflow/img/award_emoji_select.png index fffdfedda5d..ad664c0aeff 100644 Binary files a/doc/workflow/img/award_emoji_select.png and b/doc/workflow/img/award_emoji_select.png differ diff --git a/doc/workflow/img/award_emoji_votes_least_popular.png b/doc/workflow/img/award_emoji_votes_least_popular.png index 2ef5be7154f..57d595d9602 100644 Binary files a/doc/workflow/img/award_emoji_votes_least_popular.png and b/doc/workflow/img/award_emoji_votes_least_popular.png differ diff --git a/doc/workflow/img/award_emoji_votes_most_popular.png b/doc/workflow/img/award_emoji_votes_most_popular.png index 5b089730d93..432bd09b8a7 100644 Binary files a/doc/workflow/img/award_emoji_votes_most_popular.png and b/doc/workflow/img/award_emoji_votes_most_popular.png differ diff --git a/doc/workflow/img/award_emoji_votes_sort_options.png b/doc/workflow/img/award_emoji_votes_sort_options.png index 9bbf3f82a0b..ae6e224b317 100644 Binary files a/doc/workflow/img/award_emoji_votes_sort_options.png and b/doc/workflow/img/award_emoji_votes_sort_options.png differ diff --git a/doc/workflow/img/cherry_pick_changes_commit.png b/doc/workflow/img/cherry_pick_changes_commit.png index ae91d2cae53..7fb68cc9e9b 100644 Binary files a/doc/workflow/img/cherry_pick_changes_commit.png and b/doc/workflow/img/cherry_pick_changes_commit.png differ diff --git a/doc/workflow/img/cherry_pick_changes_commit_modal.png b/doc/workflow/img/cherry_pick_changes_commit_modal.png index f502f87677a..5267e04562f 100644 Binary files a/doc/workflow/img/cherry_pick_changes_commit_modal.png and b/doc/workflow/img/cherry_pick_changes_commit_modal.png differ diff --git a/doc/workflow/img/cherry_pick_changes_mr.png b/doc/workflow/img/cherry_pick_changes_mr.png index 59c610e620b..975fb13e463 100644 Binary files a/doc/workflow/img/cherry_pick_changes_mr.png and b/doc/workflow/img/cherry_pick_changes_mr.png differ diff --git a/doc/workflow/img/cherry_pick_changes_mr_modal.png b/doc/workflow/img/cherry_pick_changes_mr_modal.png index 96a80f4726d..6c003bacbe3 100644 Binary files a/doc/workflow/img/cherry_pick_changes_mr_modal.png and b/doc/workflow/img/cherry_pick_changes_mr_modal.png differ diff --git a/doc/workflow/img/file_finder_find_button.png b/doc/workflow/img/file_finder_find_button.png index c5005d0d7ca..96e383f0213 100644 Binary files a/doc/workflow/img/file_finder_find_button.png and b/doc/workflow/img/file_finder_find_button.png differ diff --git a/doc/workflow/img/file_finder_find_file.png b/doc/workflow/img/file_finder_find_file.png index 58500f4c163..c6508514c76 100644 Binary files a/doc/workflow/img/file_finder_find_file.png and b/doc/workflow/img/file_finder_find_file.png differ diff --git a/doc/workflow/img/forking_workflow_choose_namespace.png b/doc/workflow/img/forking_workflow_choose_namespace.png index eefe5769554..1839d5e8be2 100644 Binary files a/doc/workflow/img/forking_workflow_choose_namespace.png and b/doc/workflow/img/forking_workflow_choose_namespace.png differ diff --git a/doc/workflow/img/forking_workflow_fork_button.png b/doc/workflow/img/forking_workflow_fork_button.png index 49e68d33e89..cc79d6fd40c 100644 Binary files a/doc/workflow/img/forking_workflow_fork_button.png and b/doc/workflow/img/forking_workflow_fork_button.png differ diff --git a/doc/workflow/img/forking_workflow_path_taken_error.png b/doc/workflow/img/forking_workflow_path_taken_error.png index 7a3139506fe..a859155aef0 100644 Binary files a/doc/workflow/img/forking_workflow_path_taken_error.png and b/doc/workflow/img/forking_workflow_path_taken_error.png differ diff --git a/doc/workflow/img/new_branch_from_issue.png b/doc/workflow/img/new_branch_from_issue.png index 394c139e17e..61acdd30ae9 100644 Binary files a/doc/workflow/img/new_branch_from_issue.png and b/doc/workflow/img/new_branch_from_issue.png differ diff --git a/doc/workflow/img/revert_changes_commit.png b/doc/workflow/img/revert_changes_commit.png index d84211e20db..e7194fc3504 100644 Binary files a/doc/workflow/img/revert_changes_commit.png and b/doc/workflow/img/revert_changes_commit.png differ diff --git a/doc/workflow/img/revert_changes_commit_modal.png b/doc/workflow/img/revert_changes_commit_modal.png index e94d151a2af..c660ec7eaec 100644 Binary files a/doc/workflow/img/revert_changes_commit_modal.png and b/doc/workflow/img/revert_changes_commit_modal.png differ diff --git a/doc/workflow/img/revert_changes_mr.png b/doc/workflow/img/revert_changes_mr.png index 7adad88463b..3002f0ac1c5 100644 Binary files a/doc/workflow/img/revert_changes_mr.png and b/doc/workflow/img/revert_changes_mr.png differ diff --git a/doc/workflow/img/revert_changes_mr_modal.png b/doc/workflow/img/revert_changes_mr_modal.png index 9da78f84828..c6aaeecc8a6 100644 Binary files a/doc/workflow/img/revert_changes_mr_modal.png and b/doc/workflow/img/revert_changes_mr_modal.png differ diff --git a/doc/workflow/img/todos_icon.png b/doc/workflow/img/todos_icon.png index a63bad0c258..bba77f88913 100644 Binary files a/doc/workflow/img/todos_icon.png and b/doc/workflow/img/todos_icon.png differ diff --git a/doc/workflow/img/todos_index.png b/doc/workflow/img/todos_index.png index 4ee18dd1285..f1438ef7355 100644 Binary files a/doc/workflow/img/todos_index.png and b/doc/workflow/img/todos_index.png differ diff --git a/doc/workflow/img/web_editor_new_branch_dropdown.png b/doc/workflow/img/web_editor_new_branch_dropdown.png index 009e4b05adf..a8e635d2faf 100644 Binary files a/doc/workflow/img/web_editor_new_branch_dropdown.png and b/doc/workflow/img/web_editor_new_branch_dropdown.png differ diff --git a/doc/workflow/img/web_editor_new_branch_page.png b/doc/workflow/img/web_editor_new_branch_page.png index dd6cfc6e7bb..7f36b7faf63 100644 Binary files a/doc/workflow/img/web_editor_new_branch_page.png and b/doc/workflow/img/web_editor_new_branch_page.png differ diff --git a/doc/workflow/img/web_editor_new_directory_dialog.png b/doc/workflow/img/web_editor_new_directory_dialog.png index 2c76f84f395..d16e3c67116 100644 Binary files a/doc/workflow/img/web_editor_new_directory_dialog.png and b/doc/workflow/img/web_editor_new_directory_dialog.png differ diff --git a/doc/workflow/img/web_editor_new_directory_dropdown.png b/doc/workflow/img/web_editor_new_directory_dropdown.png index cedf46aedfd..c8d77b16ee8 100644 Binary files a/doc/workflow/img/web_editor_new_directory_dropdown.png and b/doc/workflow/img/web_editor_new_directory_dropdown.png differ diff --git a/doc/workflow/img/web_editor_new_file_dropdown.png b/doc/workflow/img/web_editor_new_file_dropdown.png index 6e884f6504d..3fcb91c9b93 100644 Binary files a/doc/workflow/img/web_editor_new_file_dropdown.png and b/doc/workflow/img/web_editor_new_file_dropdown.png differ diff --git a/doc/workflow/img/web_editor_new_file_editor.png b/doc/workflow/img/web_editor_new_file_editor.png index c76473bcfa7..21c340b9288 100644 Binary files a/doc/workflow/img/web_editor_new_file_editor.png and b/doc/workflow/img/web_editor_new_file_editor.png differ diff --git a/doc/workflow/img/web_editor_new_push_widget.png b/doc/workflow/img/web_editor_new_push_widget.png index a2108735741..c7738a4c930 100644 Binary files a/doc/workflow/img/web_editor_new_push_widget.png and b/doc/workflow/img/web_editor_new_push_widget.png differ diff --git a/doc/workflow/img/web_editor_new_tag_dropdown.png b/doc/workflow/img/web_editor_new_tag_dropdown.png index 263dd635b95..ac7415009b3 100644 Binary files a/doc/workflow/img/web_editor_new_tag_dropdown.png and b/doc/workflow/img/web_editor_new_tag_dropdown.png differ diff --git a/doc/workflow/img/web_editor_new_tag_page.png b/doc/workflow/img/web_editor_new_tag_page.png index 64d7cd11ed1..231e1a13fc0 100644 Binary files a/doc/workflow/img/web_editor_new_tag_page.png and b/doc/workflow/img/web_editor_new_tag_page.png differ diff --git a/doc/workflow/img/web_editor_start_new_merge_request.png b/doc/workflow/img/web_editor_start_new_merge_request.png index be12a151cac..2755501dfd1 100644 Binary files a/doc/workflow/img/web_editor_start_new_merge_request.png and b/doc/workflow/img/web_editor_start_new_merge_request.png differ diff --git a/doc/workflow/img/web_editor_upload_file_dialog.png b/doc/workflow/img/web_editor_upload_file_dialog.png index 6dd2207bca0..9d6d8250bbe 100644 Binary files a/doc/workflow/img/web_editor_upload_file_dialog.png and b/doc/workflow/img/web_editor_upload_file_dialog.png differ diff --git a/doc/workflow/img/web_editor_upload_file_dropdown.png b/doc/workflow/img/web_editor_upload_file_dropdown.png index bf6528701b0..6b5205b05ec 100644 Binary files a/doc/workflow/img/web_editor_upload_file_dropdown.png and b/doc/workflow/img/web_editor_upload_file_dropdown.png differ diff --git a/doc/workflow/importing/bitbucket_importer/bitbucket_import_select_project.png b/doc/workflow/importing/bitbucket_importer/bitbucket_import_select_project.png index 0e08703f421..1a5661de75d 100644 Binary files a/doc/workflow/importing/bitbucket_importer/bitbucket_import_select_project.png and b/doc/workflow/importing/bitbucket_importer/bitbucket_import_select_project.png differ diff --git a/doc/workflow/importing/fogbugz_importer/fogbugz_import_finished.png b/doc/workflow/importing/fogbugz_importer/fogbugz_import_finished.png index 205c515bd3f..fd7a4d3fabf 100644 Binary files a/doc/workflow/importing/fogbugz_importer/fogbugz_import_finished.png and b/doc/workflow/importing/fogbugz_importer/fogbugz_import_finished.png differ diff --git a/doc/workflow/importing/fogbugz_importer/fogbugz_import_login.png b/doc/workflow/importing/fogbugz_importer/fogbugz_import_login.png index a1e348d46ad..fd1ba6f5884 100644 Binary files a/doc/workflow/importing/fogbugz_importer/fogbugz_import_login.png and b/doc/workflow/importing/fogbugz_importer/fogbugz_import_login.png differ diff --git a/doc/workflow/importing/fogbugz_importer/fogbugz_import_select_fogbogz.png b/doc/workflow/importing/fogbugz_importer/fogbugz_import_select_fogbogz.png index ed362846909..186c1563951 100644 Binary files a/doc/workflow/importing/fogbugz_importer/fogbugz_import_select_fogbogz.png and b/doc/workflow/importing/fogbugz_importer/fogbugz_import_select_fogbogz.png differ diff --git a/doc/workflow/importing/fogbugz_importer/fogbugz_import_select_project.png b/doc/workflow/importing/fogbugz_importer/fogbugz_import_select_project.png index d2fbd0267bd..2f84d3232f2 100644 Binary files a/doc/workflow/importing/fogbugz_importer/fogbugz_import_select_project.png and b/doc/workflow/importing/fogbugz_importer/fogbugz_import_select_project.png differ diff --git a/doc/workflow/importing/fogbugz_importer/fogbugz_import_user_map.png b/doc/workflow/importing/fogbugz_importer/fogbugz_import_user_map.png index b1cc4b58525..652ca20b9ab 100644 Binary files a/doc/workflow/importing/fogbugz_importer/fogbugz_import_user_map.png and b/doc/workflow/importing/fogbugz_importer/fogbugz_import_user_map.png differ diff --git a/doc/workflow/importing/gitlab_importer/importer.png b/doc/workflow/importing/gitlab_importer/importer.png index d2a286d8cac..35a7ddc8318 100644 Binary files a/doc/workflow/importing/gitlab_importer/importer.png and b/doc/workflow/importing/gitlab_importer/importer.png differ diff --git a/doc/workflow/importing/gitlab_importer/new_project_page.png b/doc/workflow/importing/gitlab_importer/new_project_page.png index 5e239208e1e..81074d2d016 100644 Binary files a/doc/workflow/importing/gitlab_importer/new_project_page.png and b/doc/workflow/importing/gitlab_importer/new_project_page.png differ diff --git a/doc/workflow/importing/img/import_projects_from_github_importer.png b/doc/workflow/importing/img/import_projects_from_github_importer.png index f744dc06f81..b6ed8dd692a 100644 Binary files a/doc/workflow/importing/img/import_projects_from_github_importer.png and b/doc/workflow/importing/img/import_projects_from_github_importer.png differ diff --git a/doc/workflow/importing/img/import_projects_from_github_new_project_page.png b/doc/workflow/importing/img/import_projects_from_github_new_project_page.png index 86be35acb37..c8f35a50f48 100644 Binary files a/doc/workflow/importing/img/import_projects_from_github_new_project_page.png and b/doc/workflow/importing/img/import_projects_from_github_new_project_page.png differ diff --git a/doc/workflow/merge_commits.png b/doc/workflow/merge_commits.png index 757b589d0db..8aa1587cde6 100644 Binary files a/doc/workflow/merge_commits.png and b/doc/workflow/merge_commits.png differ diff --git a/doc/workflow/merge_request.png b/doc/workflow/merge_request.png index fde3ff5c854..6aad1d82f6e 100644 Binary files a/doc/workflow/merge_request.png and b/doc/workflow/merge_request.png differ diff --git a/doc/workflow/merge_requests/commit_compare.png b/doc/workflow/merge_requests/commit_compare.png index dfd7ee220f0..0e4a2b23c04 100644 Binary files a/doc/workflow/merge_requests/commit_compare.png and b/doc/workflow/merge_requests/commit_compare.png differ diff --git a/doc/workflow/merge_requests/merge_request_diff.png b/doc/workflow/merge_requests/merge_request_diff.png index f368423c746..3ebbfb75ea3 100644 Binary files a/doc/workflow/merge_requests/merge_request_diff.png and b/doc/workflow/merge_requests/merge_request_diff.png differ diff --git a/doc/workflow/merge_requests/merge_request_diff_without_whitespace.png b/doc/workflow/merge_requests/merge_request_diff_without_whitespace.png index b2d03bb66f9..a0db535019c 100644 Binary files a/doc/workflow/merge_requests/merge_request_diff_without_whitespace.png and b/doc/workflow/merge_requests/merge_request_diff_without_whitespace.png differ diff --git a/doc/workflow/merge_when_build_succeeds/enable.png b/doc/workflow/merge_when_build_succeeds/enable.png index 633efa1246f..b86e6d7b3fd 100644 Binary files a/doc/workflow/merge_when_build_succeeds/enable.png and b/doc/workflow/merge_when_build_succeeds/enable.png differ diff --git a/doc/workflow/merge_when_build_succeeds/status.png b/doc/workflow/merge_when_build_succeeds/status.png index c856c7d14dc..f3ea61d8147 100644 Binary files a/doc/workflow/merge_when_build_succeeds/status.png and b/doc/workflow/merge_when_build_succeeds/status.png differ diff --git a/doc/workflow/messy_flow.png b/doc/workflow/messy_flow.png index 1addb95ca54..8d2c0dae8c2 100644 Binary files a/doc/workflow/messy_flow.png and b/doc/workflow/messy_flow.png differ diff --git a/doc/workflow/milestones/form.png b/doc/workflow/milestones/form.png index de44c1ffc1a..3965ca4d083 100644 Binary files a/doc/workflow/milestones/form.png and b/doc/workflow/milestones/form.png differ diff --git a/doc/workflow/milestones/group_form.png b/doc/workflow/milestones/group_form.png index 38862dcca68..ff20df8081f 100644 Binary files a/doc/workflow/milestones/group_form.png and b/doc/workflow/milestones/group_form.png differ diff --git a/doc/workflow/mr_inline_comments.png b/doc/workflow/mr_inline_comments.png index e851b95bcef..af7df3100d0 100644 Binary files a/doc/workflow/mr_inline_comments.png and b/doc/workflow/mr_inline_comments.png differ diff --git a/doc/workflow/notifications/settings.png b/doc/workflow/notifications/settings.png index 7c6857aad1a..d50757beffc 100644 Binary files a/doc/workflow/notifications/settings.png and b/doc/workflow/notifications/settings.png differ diff --git a/doc/workflow/production_branch.png b/doc/workflow/production_branch.png index 33fb26dd621..d88a3687151 100644 Binary files a/doc/workflow/production_branch.png and b/doc/workflow/production_branch.png differ diff --git a/doc/workflow/protected_branches/protected_branches1.png b/doc/workflow/protected_branches/protected_branches1.png index 5c2a3de5f70..bb3ab7d7913 100644 Binary files a/doc/workflow/protected_branches/protected_branches1.png and b/doc/workflow/protected_branches/protected_branches1.png differ diff --git a/doc/workflow/protected_branches/protected_branches2.png b/doc/workflow/protected_branches/protected_branches2.png index 2dca3541365..58ace31ac57 100644 Binary files a/doc/workflow/protected_branches/protected_branches2.png and b/doc/workflow/protected_branches/protected_branches2.png differ diff --git a/doc/workflow/rebase.png b/doc/workflow/rebase.png index ef82c834755..df353311fa0 100644 Binary files a/doc/workflow/rebase.png and b/doc/workflow/rebase.png differ diff --git a/doc/workflow/release_branches.png b/doc/workflow/release_branches.png index da7ae53413a..c2162248d25 100644 Binary files a/doc/workflow/release_branches.png and b/doc/workflow/release_branches.png differ diff --git a/doc/workflow/releases/new_tag.png b/doc/workflow/releases/new_tag.png index e2b64bfe17f..2456a8500f4 100644 Binary files a/doc/workflow/releases/new_tag.png and b/doc/workflow/releases/new_tag.png differ diff --git a/doc/workflow/releases/tags.png b/doc/workflow/releases/tags.png index aca91906c68..eeda967afd6 100644 Binary files a/doc/workflow/releases/tags.png and b/doc/workflow/releases/tags.png differ diff --git a/doc/workflow/remove_checkbox.png b/doc/workflow/remove_checkbox.png index 3e247d38155..3b0393deb0f 100644 Binary files a/doc/workflow/remove_checkbox.png and b/doc/workflow/remove_checkbox.png differ diff --git a/doc/workflow/share_with_group.png b/doc/workflow/share_with_group.png index a0ca6f14552..2c47625e29a 100644 Binary files a/doc/workflow/share_with_group.png and b/doc/workflow/share_with_group.png differ diff --git a/doc/workflow/shortcuts.png b/doc/workflow/shortcuts.png index 16be0413b64..a9b1c4b4dcc 100644 Binary files a/doc/workflow/shortcuts.png and b/doc/workflow/shortcuts.png differ diff --git a/doc/workflow/wip_merge_requests/blocked_accept_button.png b/doc/workflow/wip_merge_requests/blocked_accept_button.png index 4791e5de972..89c458aa8d9 100644 Binary files a/doc/workflow/wip_merge_requests/blocked_accept_button.png and b/doc/workflow/wip_merge_requests/blocked_accept_button.png differ diff --git a/doc/workflow/wip_merge_requests/mark_as_wip.png b/doc/workflow/wip_merge_requests/mark_as_wip.png index 8fa83a201ac..9c37354a653 100644 Binary files a/doc/workflow/wip_merge_requests/mark_as_wip.png and b/doc/workflow/wip_merge_requests/mark_as_wip.png differ diff --git a/doc/workflow/wip_merge_requests/unmark_as_wip.png b/doc/workflow/wip_merge_requests/unmark_as_wip.png index d45e68f31c5..31f7326beb0 100644 Binary files a/doc/workflow/wip_merge_requests/unmark_as_wip.png and b/doc/workflow/wip_merge_requests/unmark_as_wip.png differ -- cgit v1.2.1 From 12aa1f898dbfea3aaeb2de351ac1cccef304717f Mon Sep 17 00:00:00 2001 From: Eric K Idema Date: Mon, 2 May 2016 11:22:38 -0400 Subject: Import from Github using Personal Access Tokens. This stands as an alternative to using OAuth to access a user's Github repositories. This is setup in such a way that it can be used without OAuth configuration. From a UI perspective, the how to import modal has been replaced by a full page, which includes a form for posting a personal access token back to the Import::GithubController. If the user has logged in via GitHub, skip the Personal Access Token and go directly to Github for an access token via OAuth. --- doc/workflow/importing/import_projects_from_github.md | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'doc/workflow') diff --git a/doc/workflow/importing/import_projects_from_github.md b/doc/workflow/importing/import_projects_from_github.md index a7dfac2c120..60894d52a76 100644 --- a/doc/workflow/importing/import_projects_from_github.md +++ b/doc/workflow/importing/import_projects_from_github.md @@ -1,8 +1,10 @@ # Import your project from GitHub to GitLab >**Note:** -In order to enable the GitHub import setting, you should first -enable the [GitHub integration][gh-import] in your GitLab instance. +In order to enable the GitHub import setting, you may also want to +enable the [GitHub integration][gh-import] in your GitLab instance. This +configuration is optional, you will be able import your GitHub repositories +with a Personal Access Token. At its current state, GitHub importer can import: @@ -20,9 +22,13 @@ It is not yet possible to import your cross-repository pull requests (those from forks). We are working on improving this in the near future. The importer page is visible when you [create a new project][new-project]. -Click on the **GitHub** link and you will be redirected to GitHub for -permission to access your projects. After accepting, you'll be automatically -redirected to the importer. +Click on the **GitHub** link and, if you are logged in via the GitHub +integration, you will be redirected to GitHub for permission to access your +projects. After accepting, you'll be automatically redirected to the importer. + +If you are not using the GitHub integration, when you click the **GithHub** link +you'll be presented with instructions for creating Personal Access Token on +GitHub. Once you upload your token, you'll be taken to the importer. ![New project page on GitLab](img/import_projects_from_github_new_project_page.png) -- cgit v1.2.1 From ce6635406c8e2e4d336d6d7738a1e4916036871c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Mon, 27 Jun 2016 13:42:22 +0200 Subject: Make GH one-off auth the default again for importing GH projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Advertise the PAT as an alternative unless GH import is not configured. Signed-off-by: Rémy Coutable --- doc/workflow/importing/import_projects_from_github.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'doc/workflow') diff --git a/doc/workflow/importing/import_projects_from_github.md b/doc/workflow/importing/import_projects_from_github.md index 60894d52a76..a2b2a4b88f9 100644 --- a/doc/workflow/importing/import_projects_from_github.md +++ b/doc/workflow/importing/import_projects_from_github.md @@ -26,9 +26,11 @@ Click on the **GitHub** link and, if you are logged in via the GitHub integration, you will be redirected to GitHub for permission to access your projects. After accepting, you'll be automatically redirected to the importer. -If you are not using the GitHub integration, when you click the **GithHub** link -you'll be presented with instructions for creating Personal Access Token on -GitHub. Once you upload your token, you'll be taken to the importer. +If you are not using the GitHub integration, you can still perform a one-off +authorization with GitHub to access your projects. + +Alternatively, you can also enter a GitHub Personal Access Token. Once you enter +your token, you'll be taken to the importer. ![New project page on GitLab](img/import_projects_from_github_new_project_page.png) -- cgit v1.2.1