From 9176a19e3d858a6d64a2254260febe000474af6d Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Thu, 3 Nov 2016 20:41:51 +0800 Subject: Add pipelines to notifications documentation --- doc/workflow/notifications.md | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc/workflow') diff --git a/doc/workflow/notifications.md b/doc/workflow/notifications.md index 1b49a5c385f..4824b4e34b9 100644 --- a/doc/workflow/notifications.md +++ b/doc/workflow/notifications.md @@ -66,6 +66,7 @@ Below is the table of events users can be notified of: In all of the below cases, the notification will be sent to: - Participants: - the author and assignee of the issue/merge request + - the author of the pipeline - authors of comments on the issue/merge request - anyone mentioned by `@username` in the issue/merge request title or description - anyone mentioned by `@username` in any of the comments on the issue/merge request @@ -88,6 +89,8 @@ In all of the below cases, the notification will be sent to: | Reopen merge request | | | Merge merge request | | | New comment | The above, plus anyone mentioned by `@username` in the comment, with notification level "Mention" or higher | +| Failed pipeline | The author of the pipeline and watchers | +| Successful pipeline | The author of the pipeline and watchers | In addition, if the title or description of an Issue or Merge Request is -- cgit v1.2.1 From 3e75e453fb258b3e60f3e9606b5f589006a4654b Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Wed, 9 Nov 2016 00:29:07 +0800 Subject: Try to cover more cases about receivers of pipeline notifications Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6342#note_17981421 --- doc/workflow/notifications.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc/workflow') diff --git a/doc/workflow/notifications.md b/doc/workflow/notifications.md index 4824b4e34b9..c936e8833c6 100644 --- a/doc/workflow/notifications.md +++ b/doc/workflow/notifications.md @@ -89,8 +89,8 @@ In all of the below cases, the notification will be sent to: | Reopen merge request | | | Merge merge request | | | New comment | The above, plus anyone mentioned by `@username` in the comment, with notification level "Mention" or higher | -| Failed pipeline | The author of the pipeline and watchers | -| Successful pipeline | The author of the pipeline and watchers | +| Failed pipeline | The above, plus the author of the pipeline | +| Successful pipeline | The above, plus the author of the pipeline | In addition, if the title or description of an Issue or Merge Request is -- cgit v1.2.1 From 625a86403d224918c607ae69593f2a7caaaf5bfb Mon Sep 17 00:00:00 2001 From: kkkkkkkk Date: Sat, 19 Nov 2016 17:57:34 +0800 Subject: fix typo in gitlab_flow.md ('munch'->'much') --- doc/workflow/gitlab_flow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/workflow') diff --git a/doc/workflow/gitlab_flow.md b/doc/workflow/gitlab_flow.md index 2215f37b81a..c228ea72f22 100644 --- a/doc/workflow/gitlab_flow.md +++ b/doc/workflow/gitlab_flow.md @@ -279,7 +279,7 @@ The trick is to use the merge/pull request with multiple commits when your work The commit message should reflect your intention, not the contents of the commit. The contents of the commit can be easily seen anyway, the question is why you did it. An example of a good commit message is: "Combine templates to dry up the user views.". -Some words that are bad commit messages because they don't contain munch information are: change, improve and refactor. +Some words that are bad commit messages because they don't contain much information are: change, improve and refactor. The word fix or fixes is also a red flag, unless it comes after the commit sentence and references an issue number. To see more information about the formatting of commit messages please see this great [blog post by Tim Pope](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html). -- cgit v1.2.1 From c6a4f9fc5b98024d4af872b0009b90c36bc2e595 Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Mon, 21 Nov 2016 11:27:28 +0100 Subject: Update some docs to reflect MWPS name change --- doc/workflow/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/workflow') diff --git a/doc/workflow/README.md b/doc/workflow/README.md index 2d9bfbc0629..57a0d21c7a7 100644 --- a/doc/workflow/README.md +++ b/doc/workflow/README.md @@ -25,7 +25,7 @@ - [Merge Requests](../user/project/merge_requests.md) - [Authorization for merge requests](../user/project/merge_requests/authorization_for_merge_requests.md) - [Cherry-pick changes](../user/project/merge_requests/cherry_pick_changes.md) - - [Merge when build succeeds](../user/project/merge_requests/merge_when_build_succeeds.md) + - [Merge when pipeline succeeds](../user/project/merge_requests/merge_when_build_succeeds.md) - [Resolve discussion comments in merge requests reviews](../user/project/merge_requests/merge_request_discussion_resolution.md) - [Resolve merge conflicts in the UI](../user/project/merge_requests/resolve_conflicts.md) - [Revert changes in the UI](../user/project/merge_requests/revert_changes.md) -- cgit v1.2.1 From d840c462d127461ed71d3270bfe5769e37c68b64 Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Mon, 21 Nov 2016 13:39:11 +0100 Subject: Add documentation about todos and failed builds --- doc/workflow/todos.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'doc/workflow') diff --git a/doc/workflow/todos.md b/doc/workflow/todos.md index a50ba305deb..54e7ae19ea5 100644 --- a/doc/workflow/todos.md +++ b/doc/workflow/todos.md @@ -24,9 +24,11 @@ you still have open. A Todo appears in your Todos dashboard when: -- an issue or merge request is assigned to you +- an issue or merge request is assigned to you, - you are `@mentioned` in an issue or merge request, be it the description of - the issue/merge request or in a comment + the issue/merge request or in a comment, +- build in the CI pipeline running for your merge request failed, but this + build is not allowed to fail. >**Note:** Commenting on a commit will _not_ trigger a Todo. -- cgit v1.2.1 From 3e3ea632fe89576eff329f7ae9cce422a6982576 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Dzurek?= Date: Mon, 21 Nov 2016 21:14:04 +0000 Subject: fixed manage_large_binaries_with_git_lfs.md typo --- doc/workflow/lfs/manage_large_binaries_with_git_lfs.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/workflow') diff --git a/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md b/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md index 1a4f213a792..28e6a21a229 100644 --- a/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md +++ b/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md @@ -48,7 +48,7 @@ check it into your Git repository: ```bash git clone git@gitlab.example.com:group/project.git -git lfs install # initialize the Git LFS project project +git lfs install # initialize the Git LFS project git lfs track "*.iso" # select the file extensions that you want to treat as large files ``` -- cgit v1.2.1 From af1dabe805fa7ad6fcdccfdb792b07e00c3c42d2 Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Tue, 22 Nov 2016 19:53:43 +0100 Subject: Reduce size of images from 25MB to 13MB using pngquant Took it from https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/3232 [ci skip] --- .../add-user/img/access_requests_management.png | Bin 15686 -> 11018 bytes .../img/add_new_user_to_project_settings.png | Bin 18149 -> 11046 bytes .../add-user/img/add_user_email_accept.png | Bin 22877 -> 16890 bytes doc/workflow/add-user/img/add_user_email_ready.png | Bin 40207 -> 28171 bytes .../add-user/img/add_user_email_search.png | Bin 45798 -> 29628 bytes .../add-user/img/add_user_give_permissions.png | Bin 56380 -> 36619 bytes ...dd_user_import_members_from_another_project.png | Bin 38778 -> 25343 bytes .../add-user/img/add_user_imported_members.png | Bin 37835 -> 25398 bytes .../add-user/img/add_user_list_members.png | Bin 24337 -> 16916 bytes .../add-user/img/add_user_members_menu.png | Bin 42224 -> 28994 bytes .../add-user/img/add_user_search_people.png | Bin 39844 -> 25368 bytes .../add-user/img/request_access_button.png | Bin 36588 -> 25281 bytes .../img/withdraw_access_request_button.png | Bin 37960 -> 26135 bytes doc/workflow/award_emoji.png | Bin 9939 -> 5268 bytes doc/workflow/ci_mr.png | Bin 29571 -> 12034 bytes doc/workflow/close_issue_mr.png | Bin 82595 -> 42108 bytes doc/workflow/environment_branches.png | Bin 20745 -> 12364 bytes doc/workflow/forking/branch_select.png | Bin 27299 -> 15424 bytes doc/workflow/forking/merge_request.png | Bin 31560 -> 16332 bytes doc/workflow/four_stages.png | Bin 10003 -> 7124 bytes doc/workflow/git_pull.png | Bin 94405 -> 28749 bytes doc/workflow/gitdashflow.png | Bin 131491 -> 68177 bytes doc/workflow/github_flow.png | Bin 10251 -> 6173 bytes doc/workflow/gitlab_flow.png | Bin 70871 -> 47432 bytes doc/workflow/good_commit.png | Bin 13131 -> 8742 bytes doc/workflow/groups/access_requests_management.png | Bin 15829 -> 11186 bytes doc/workflow/groups/add_member_to_group.png | Bin 78060 -> 35724 bytes doc/workflow/groups/group_dashboard.png | Bin 59446 -> 28155 bytes doc/workflow/groups/group_with_two_projects.png | Bin 73101 -> 34462 bytes doc/workflow/groups/max_access_level.png | Bin 74947 -> 34718 bytes doc/workflow/groups/new_group_button.png | Bin 108482 -> 49708 bytes doc/workflow/groups/new_group_form.png | Bin 58860 -> 27263 bytes .../groups/other_group_sees_shared_project.png | Bin 64447 -> 30182 bytes doc/workflow/groups/override_access_level.png | Bin 90122 -> 40993 bytes doc/workflow/groups/project_members_via_group.png | Bin 86260 -> 39532 bytes doc/workflow/groups/request_access_button.png | Bin 49067 -> 35917 bytes doc/workflow/groups/share_project_with_groups.png | Bin 65633 -> 30307 bytes doc/workflow/groups/transfer_project.png | Bin 92115 -> 43502 bytes .../groups/withdraw_access_request_button.png | Bin 49941 -> 36413 bytes doc/workflow/img/award_emoji_comment_awarded.png | Bin 64317 -> 19159 bytes doc/workflow/img/award_emoji_comment_picker.png | Bin 250861 -> 72883 bytes doc/workflow/img/award_emoji_select.png | Bin 49296 -> 23779 bytes .../img/award_emoji_votes_least_popular.png | Bin 116715 -> 50191 bytes .../img/award_emoji_votes_most_popular.png | Bin 108775 -> 48342 bytes .../img/award_emoji_votes_sort_options.png | Bin 131659 -> 57145 bytes doc/workflow/img/file_finder_find_button.png | Bin 25458 -> 14567 bytes doc/workflow/img/file_finder_find_file.png | Bin 35114 -> 19478 bytes .../img/forking_workflow_choose_namespace.png | Bin 59114 -> 26275 bytes doc/workflow/img/forking_workflow_fork_button.png | Bin 20750 -> 12973 bytes .../img/forking_workflow_path_taken_error.png | Bin 17978 -> 10103 bytes doc/workflow/img/new_branch_from_issue.png | Bin 54607 -> 33584 bytes doc/workflow/img/todo_list_item.png | Bin 58912 -> 18777 bytes doc/workflow/img/todos_add_todo_sidebar.png | Bin 120265 -> 33350 bytes doc/workflow/img/todos_icon.png | Bin 3843 -> 1341 bytes doc/workflow/img/todos_index.png | Bin 152040 -> 63372 bytes doc/workflow/img/todos_mark_done_sidebar.png | Bin 121303 -> 33703 bytes .../fogbugz_importer/fogbugz_import_finished.png | Bin 30266 -> 17744 bytes .../fogbugz_importer/fogbugz_import_login.png | Bin 20797 -> 13751 bytes .../fogbugz_import_select_fogbogz.png | Bin 20526 -> 12289 bytes .../fogbugz_import_select_project.png | Bin 34836 -> 20905 bytes .../fogbugz_importer/fogbugz_import_user_map.png | Bin 77208 -> 51238 bytes .../importing/gitlab_importer/importer.png | Bin 18366 -> 12864 bytes .../importing/gitlab_importer/new_project_page.png | Bin 33589 -> 21251 bytes .../img/import_projects_from_github_importer.png | Bin 65288 -> 17953 bytes ...mport_projects_from_github_new_project_page.png | Bin 24911 -> 11047 bytes ...ort_projects_from_github_select_auth_method.png | Bin 42043 -> 17613 bytes doc/workflow/merge_commits.png | Bin 22181 -> 7564 bytes doc/workflow/merge_request.png | Bin 98070 -> 47240 bytes doc/workflow/messy_flow.png | Bin 19314 -> 11665 bytes doc/workflow/milestones/form.png | Bin 84872 -> 40414 bytes doc/workflow/milestones/group_form.png | Bin 74429 -> 35820 bytes doc/workflow/mr_inline_comments.png | Bin 117313 -> 52519 bytes doc/workflow/notifications/settings.png | Bin 59256 -> 37542 bytes doc/workflow/production_branch.png | Bin 10946 -> 7264 bytes doc/workflow/rebase.png | Bin 68976 -> 29009 bytes doc/workflow/release_branches.png | Bin 22163 -> 12746 bytes doc/workflow/releases/new_tag.png | Bin 87330 -> 42456 bytes doc/workflow/releases/tags.png | Bin 93016 -> 44666 bytes doc/workflow/remove_checkbox.png | Bin 12339 -> 6904 bytes 79 files changed, 0 insertions(+), 0 deletions(-) (limited to 'doc/workflow') diff --git a/doc/workflow/add-user/img/access_requests_management.png b/doc/workflow/add-user/img/access_requests_management.png index 5c9b510ba9d..3693bed869b 100644 Binary files a/doc/workflow/add-user/img/access_requests_management.png and b/doc/workflow/add-user/img/access_requests_management.png differ 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 5da0552f9d6..40db600455f 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 a2954ad7c37..763b3ff463d 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 19d91bc0999..0066eb3427b 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 cb31b77d941..66bcd6aad80 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 e6b77022f06..376a3eefccc 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 1068589c5ff..0c32001098e 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 5cd120a4245..51fd7688890 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 5fe3482192e..e0fa404288d 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 340d15c9830..8e61d15fe65 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 1c05d70ca31..41767a9167c 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/add-user/img/request_access_button.png b/doc/workflow/add-user/img/request_access_button.png index 984d640b0f0..608baccb0ca 100644 Binary files a/doc/workflow/add-user/img/request_access_button.png and b/doc/workflow/add-user/img/request_access_button.png differ diff --git a/doc/workflow/add-user/img/withdraw_access_request_button.png b/doc/workflow/add-user/img/withdraw_access_request_button.png index ff54a0e4384..6edd786b151 100644 Binary files a/doc/workflow/add-user/img/withdraw_access_request_button.png and b/doc/workflow/add-user/img/withdraw_access_request_button.png differ diff --git a/doc/workflow/award_emoji.png b/doc/workflow/award_emoji.png index 481680af80c..1ad634a343e 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 f8a7708643e..77423c68190 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 5e520240233..70de2fb6cee 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 13fb0478eaa..0941a4cad9c 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 7f19414f3a9..3e82afca75b 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 e2da42a2be7..294775e1fdd 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 49413087dca..3ef6a33d2d4 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 9a1fdf899bf..2dd06b56c56 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 e456cf9309d..65900853d84 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 b3fca97cc2d..21a22becdb6 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 d85d4ff374e..c3562cc69a8 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 7958feea4d9..c3664aa97f2 100644 Binary files a/doc/workflow/good_commit.png and b/doc/workflow/good_commit.png differ diff --git a/doc/workflow/groups/access_requests_management.png b/doc/workflow/groups/access_requests_management.png index 5202434f00f..36deaa89a70 100644 Binary files a/doc/workflow/groups/access_requests_management.png and b/doc/workflow/groups/access_requests_management.png differ diff --git a/doc/workflow/groups/add_member_to_group.png b/doc/workflow/groups/add_member_to_group.png index 6e3f660d2e4..a10d5032bb0 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 662c932e536..a5829f25808 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 dc3475949f5..76d0a1b8ab2 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 2855a514013..63f33f9d91d 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 26136312c8f..7155d6280bd 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 dc50a069ef2..0d798cd4b84 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 2230720cecd..67af27043eb 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 9d6aaf4c363..2b3e9a49842 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 58270936a0b..878c9a03ac9 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/request_access_button.png b/doc/workflow/groups/request_access_button.png index 0eec5cb937d..f1aae6afed7 100644 Binary files a/doc/workflow/groups/request_access_button.png and b/doc/workflow/groups/request_access_button.png differ diff --git a/doc/workflow/groups/share_project_with_groups.png b/doc/workflow/groups/share_project_with_groups.png index 5772d4deced..3cb4796f9f7 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 0aef3ab3f0f..52161817f11 100644 Binary files a/doc/workflow/groups/transfer_project.png and b/doc/workflow/groups/transfer_project.png differ diff --git a/doc/workflow/groups/withdraw_access_request_button.png b/doc/workflow/groups/withdraw_access_request_button.png index b7de830a780..c5d8ef6c04f 100644 Binary files a/doc/workflow/groups/withdraw_access_request_button.png and b/doc/workflow/groups/withdraw_access_request_button.png differ diff --git a/doc/workflow/img/award_emoji_comment_awarded.png b/doc/workflow/img/award_emoji_comment_awarded.png index 67697831869..111793ebf8a 100644 Binary files a/doc/workflow/img/award_emoji_comment_awarded.png and b/doc/workflow/img/award_emoji_comment_awarded.png differ diff --git a/doc/workflow/img/award_emoji_comment_picker.png b/doc/workflow/img/award_emoji_comment_picker.png index d9c3faecdca..3ad1bab3119 100644 Binary files a/doc/workflow/img/award_emoji_comment_picker.png and b/doc/workflow/img/award_emoji_comment_picker.png differ diff --git a/doc/workflow/img/award_emoji_select.png b/doc/workflow/img/award_emoji_select.png index ad664c0aeff..e1b37beaf62 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 57d595d9602..86ede4b0c10 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 432bd09b8a7..1d3e2e57aa0 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 ae6e224b317..c6dc1b939c1 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/file_finder_find_button.png b/doc/workflow/img/file_finder_find_button.png index 96e383f0213..23139cc00c5 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 c6508514c76..c2212c7cd9e 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 1839d5e8be2..b34b12090a1 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 cc79d6fd40c..29854e6c516 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 a859155aef0..9365fd13200 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 61acdd30ae9..286d775bb9e 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/todo_list_item.png b/doc/workflow/img/todo_list_item.png index 884ba1d22a3..076069b651e 100644 Binary files a/doc/workflow/img/todo_list_item.png and b/doc/workflow/img/todo_list_item.png differ diff --git a/doc/workflow/img/todos_add_todo_sidebar.png b/doc/workflow/img/todos_add_todo_sidebar.png index 126ecc2c82f..59175ae44c5 100644 Binary files a/doc/workflow/img/todos_add_todo_sidebar.png and b/doc/workflow/img/todos_add_todo_sidebar.png differ diff --git a/doc/workflow/img/todos_icon.png b/doc/workflow/img/todos_icon.png index bba77f88913..1ed16b09669 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 f1438ef7355..902a5aa6bd3 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/todos_mark_done_sidebar.png b/doc/workflow/img/todos_mark_done_sidebar.png index f449f977dd6..aa35bb672ea 100644 Binary files a/doc/workflow/img/todos_mark_done_sidebar.png and b/doc/workflow/img/todos_mark_done_sidebar.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 fd7a4d3fabf..62c5c86c9b3 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 fd1ba6f5884..96bce70b74d 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 186c1563951..b26c652e382 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 2f84d3232f2..ccc82f9d4cd 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 652ca20b9ab..28ff55a8d89 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 35a7ddc8318..27d42eb492e 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 81074d2d016..c673724f436 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 eadd33c695f..d8effaf6075 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 6e91c430a33..b23ade4480c 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/importing/img/import_projects_from_github_select_auth_method.png b/doc/workflow/importing/img/import_projects_from_github_select_auth_method.png index c11863ab10c..f50d9266991 100644 Binary files a/doc/workflow/importing/img/import_projects_from_github_select_auth_method.png and b/doc/workflow/importing/img/import_projects_from_github_select_auth_method.png differ diff --git a/doc/workflow/merge_commits.png b/doc/workflow/merge_commits.png index 8aa1587cde6..4a80811c6e3 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 6aad1d82f6e..08dfc7f2468 100644 Binary files a/doc/workflow/merge_request.png and b/doc/workflow/merge_request.png differ diff --git a/doc/workflow/messy_flow.png b/doc/workflow/messy_flow.png index 8d2c0dae8c2..7e72e2a3be6 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 3965ca4d083..c4731d88543 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 ff20df8081f..dccdb019703 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 af7df3100d0..6a2e66a01ba 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 d50757beffc..8a5494d16a8 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 d88a3687151..648d5d5c92e 100644 Binary files a/doc/workflow/production_branch.png and b/doc/workflow/production_branch.png differ diff --git a/doc/workflow/rebase.png b/doc/workflow/rebase.png index df353311fa0..8b9bb61a5cc 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 c2162248d25..5194d75a667 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 2456a8500f4..97519e5808f 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 eeda967afd6..4c032f96125 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 3b0393deb0f..fb0e792b37b 100644 Binary files a/doc/workflow/remove_checkbox.png and b/doc/workflow/remove_checkbox.png differ -- cgit v1.2.1 From 7e0e5bc3786bbe8ce2a58e28cc166f9e7cbc8193 Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Tue, 22 Nov 2016 19:25:20 +0000 Subject: add details that Git LFS must be enabled in project --- doc/workflow/lfs/manage_large_binaries_with_git_lfs.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'doc/workflow') diff --git a/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md b/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md index 28e6a21a229..6a7098e79d0 100644 --- a/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md +++ b/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md @@ -24,6 +24,7 @@ Documentation for GitLab instance administrators is under [LFS administration do ## Requirements * Git LFS is supported in GitLab starting with version 8.2 +* Git LFS must be enabled under project settings * [Git LFS client](https://git-lfs.github.com) version 1.0.1 and up ## Known limitations @@ -31,10 +32,10 @@ Documentation for GitLab instance administrators is under [LFS administration do * Git LFS v1 original API is not supported since it was deprecated early in LFS development * When SSH is set as a remote, Git LFS objects still go through HTTPS -* Any Git LFS request will ask for HTTPS credentials to be provided so good Git +* Any Git LFS request will ask for HTTPS credentials to be provided so a good Git credentials store is recommended * Git LFS always assumes HTTPS so if you have GitLab server on HTTP you will have - to add the URL to Git config manually (see #troubleshooting) + to add the URL to Git config manually (see [troubleshooting](#troubleshooting)) >**Note**: With 8.12 GitLab added LFS support to SSH. The Git LFS communication still goes over HTTP, but now the SSH client passes the correct credentials @@ -95,7 +96,7 @@ available to the project anymore. Probably the object was removed from the serve * Local git repository is using deprecated LFS API -### Invalid status for : 501 +### Invalid status for `` : 501 Git LFS will log the failures into a log file. To view this log file, while in project directory: @@ -106,6 +107,9 @@ git lfs logs last If the status `error 501` is shown, it is because: +* Git LFS is not enabled in project settings. Check your project settings and + enable Git LFS. + * Git LFS support is not enabled on the GitLab server. Check with your GitLab administrator why Git LFS is not enabled on the server. See [LFS administration documentation](lfs_administration.md) for instructions -- cgit v1.2.1 From 5e26745e312a5c792f5864d46fb0378d90790504 Mon Sep 17 00:00:00 2001 From: Luis Alonso Chavez Armendariz Date: Wed, 23 Nov 2016 16:34:58 -0700 Subject: Fix title case to sentence case --- doc/workflow/img/todos_add_todo_sidebar.png | Bin 33350 -> 42360 bytes doc/workflow/img/todos_mark_done_sidebar.png | Bin 33703 -> 42317 bytes doc/workflow/todos.md | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) (limited to 'doc/workflow') diff --git a/doc/workflow/img/todos_add_todo_sidebar.png b/doc/workflow/img/todos_add_todo_sidebar.png index 59175ae44c5..3fa37067d1e 100644 Binary files a/doc/workflow/img/todos_add_todo_sidebar.png and b/doc/workflow/img/todos_add_todo_sidebar.png differ diff --git a/doc/workflow/img/todos_mark_done_sidebar.png b/doc/workflow/img/todos_mark_done_sidebar.png index aa35bb672ea..a8e756a71db 100644 Binary files a/doc/workflow/img/todos_mark_done_sidebar.png and b/doc/workflow/img/todos_mark_done_sidebar.png differ diff --git a/doc/workflow/todos.md b/doc/workflow/todos.md index 54e7ae19ea5..1a8fc39bb33 100644 --- a/doc/workflow/todos.md +++ b/doc/workflow/todos.md @@ -35,7 +35,7 @@ A Todo appears in your Todos dashboard when: ### Manually creating a Todo You can also add an issue or merge request to your Todos dashboard by clicking -the "Add Todo" button in the issue or merge request sidebar. +the "Add todo" button in the issue or merge request sidebar. ![Adding a Todo from the issuable sidebar](img/todos_add_todo_sidebar.png) @@ -69,7 +69,7 @@ corresponding **Done** button, and it will disappear from your Todo list. ![A Todo in the Todos dashboard](img/todo_list_item.png) A Todo can also be marked as done from the issue or merge request sidebar using -the "Mark Done" button. +the "Mark done" button. ![Mark Done from the issuable sidebar](img/todos_mark_done_sidebar.png) -- cgit v1.2.1 From adb3f3d4e494e8f8d41c1b9e676e395a49cd96b2 Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Fri, 25 Nov 2016 12:51:12 +0100 Subject: Move MWPS document to new location --- doc/workflow/README.md | 4 ++-- doc/workflow/merge_when_build_succeeds.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'doc/workflow') diff --git a/doc/workflow/README.md b/doc/workflow/README.md index 57a0d21c7a7..59a806de210 100644 --- a/doc/workflow/README.md +++ b/doc/workflow/README.md @@ -25,12 +25,12 @@ - [Merge Requests](../user/project/merge_requests.md) - [Authorization for merge requests](../user/project/merge_requests/authorization_for_merge_requests.md) - [Cherry-pick changes](../user/project/merge_requests/cherry_pick_changes.md) - - [Merge when pipeline succeeds](../user/project/merge_requests/merge_when_build_succeeds.md) + - [Merge when pipeline succeeds](../user/project/merge_requests/merge_when_pipeline_succeeds.md) - [Resolve discussion comments in merge requests reviews](../user/project/merge_requests/merge_request_discussion_resolution.md) - [Resolve merge conflicts in the UI](../user/project/merge_requests/resolve_conflicts.md) - [Revert changes in the UI](../user/project/merge_requests/revert_changes.md) - [Merge requests versions](../user/project/merge_requests/versions.md) - ["Work In Progress" merge requests](../user/project/merge_requests/work_in_progress_merge_requests.md) - [Manage large binaries with Git LFS](lfs/manage_large_binaries_with_git_lfs.md) -- [Importing from SVN, GitHub, BitBucket, etc](importing/README.md) +- [Importing from SVN, GitHub, Bitbucket, etc](importing/README.md) - [Todos](todos.md) diff --git a/doc/workflow/merge_when_build_succeeds.md b/doc/workflow/merge_when_build_succeeds.md index 95afd12ebdb..b4f6d6117de 100644 --- a/doc/workflow/merge_when_build_succeeds.md +++ b/doc/workflow/merge_when_build_succeeds.md @@ -1 +1 @@ -This document was moved to [user/project/merge_requests/merge_when_build_succeeds](../user/project/merge_requests/merge_when_build_succeeds.md). +This document was moved to [merge_when_pipeline_succeeds](../user/project/merge_requests/merge_when_pipeline_succeeds.md). -- cgit v1.2.1 From ffa35233573acd31725677547555598fc36072e0 Mon Sep 17 00:00:00 2001 From: Valery Sizov Date: Fri, 16 Dec 2016 10:38:23 +0200 Subject: BB importer: Added note about linking BB users and GitLab users[ci skip] --- doc/workflow/importing/import_projects_from_bitbucket.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'doc/workflow') diff --git a/doc/workflow/importing/import_projects_from_bitbucket.md b/doc/workflow/importing/import_projects_from_bitbucket.md index 520c4216295..935d6288f3b 100644 --- a/doc/workflow/importing/import_projects_from_bitbucket.md +++ b/doc/workflow/importing/import_projects_from_bitbucket.md @@ -20,7 +20,8 @@ It takes just a few steps to import your existing Bitbucket projects to GitLab. ![Import projects](bitbucket_importer/bitbucket_import_select_project.png) -A new GitLab project will be created with your imported data. +A new GitLab project will be created with your imported data. Keep in mind that if you want to Bitbucket users +to be linked to GitLab user you have to have all of them in GitLab in advance. They will be matched by their BitBucket username. ### Note Milestones and wiki pages are not imported from Bitbucket. -- cgit v1.2.1 From 27f271ee1ed977f8070f528f1d5e21ad577f5409 Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Fri, 16 Dec 2016 14:54:23 +0100 Subject: Refactor Bitbucket import docs --- .../bitbucket_import_grant_access.png | Bin 30083 -> 0 bytes .../bitbucket_import_new_project.png | Bin 16502 -> 0 bytes .../bitbucket_import_select_bitbucket.png | Bin 46606 -> 0 bytes .../bitbucket_import_select_project.png | Bin 15288 -> 0 bytes .../img/bitbucket_import_grant_access.png | Bin 0 -> 7248 bytes .../importing/img/bitbucket_import_new_project.png | Bin 0 -> 1316 bytes .../img/bitbucket_import_select_project.png | Bin 0 -> 8688 bytes ...ort_projects_from_github_select_auth_method.png | Bin 17613 -> 17612 bytes .../importing/import_projects_from_bitbucket.md | 64 ++++++++++++++++----- 9 files changed, 50 insertions(+), 14 deletions(-) delete mode 100644 doc/workflow/importing/bitbucket_importer/bitbucket_import_grant_access.png delete mode 100644 doc/workflow/importing/bitbucket_importer/bitbucket_import_new_project.png delete mode 100644 doc/workflow/importing/bitbucket_importer/bitbucket_import_select_bitbucket.png delete mode 100644 doc/workflow/importing/bitbucket_importer/bitbucket_import_select_project.png create mode 100644 doc/workflow/importing/img/bitbucket_import_grant_access.png create mode 100644 doc/workflow/importing/img/bitbucket_import_new_project.png create mode 100644 doc/workflow/importing/img/bitbucket_import_select_project.png (limited to 'doc/workflow') diff --git a/doc/workflow/importing/bitbucket_importer/bitbucket_import_grant_access.png b/doc/workflow/importing/bitbucket_importer/bitbucket_import_grant_access.png deleted file mode 100644 index df55a081803..00000000000 Binary files a/doc/workflow/importing/bitbucket_importer/bitbucket_import_grant_access.png and /dev/null differ diff --git a/doc/workflow/importing/bitbucket_importer/bitbucket_import_new_project.png b/doc/workflow/importing/bitbucket_importer/bitbucket_import_new_project.png deleted file mode 100644 index 5253889d251..00000000000 Binary files a/doc/workflow/importing/bitbucket_importer/bitbucket_import_new_project.png and /dev/null differ diff --git a/doc/workflow/importing/bitbucket_importer/bitbucket_import_select_bitbucket.png b/doc/workflow/importing/bitbucket_importer/bitbucket_import_select_bitbucket.png deleted file mode 100644 index ffa87ce5b2e..00000000000 Binary files a/doc/workflow/importing/bitbucket_importer/bitbucket_import_select_bitbucket.png and /dev/null 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 deleted file mode 100644 index 1a5661de75d..00000000000 Binary files a/doc/workflow/importing/bitbucket_importer/bitbucket_import_select_project.png and /dev/null differ diff --git a/doc/workflow/importing/img/bitbucket_import_grant_access.png b/doc/workflow/importing/img/bitbucket_import_grant_access.png new file mode 100644 index 00000000000..429904e621d Binary files /dev/null and b/doc/workflow/importing/img/bitbucket_import_grant_access.png differ diff --git a/doc/workflow/importing/img/bitbucket_import_new_project.png b/doc/workflow/importing/img/bitbucket_import_new_project.png new file mode 100644 index 00000000000..8ed528c2f09 Binary files /dev/null and b/doc/workflow/importing/img/bitbucket_import_new_project.png differ diff --git a/doc/workflow/importing/img/bitbucket_import_select_project.png b/doc/workflow/importing/img/bitbucket_import_select_project.png new file mode 100644 index 00000000000..1bca6166ec8 Binary files /dev/null and b/doc/workflow/importing/img/bitbucket_import_select_project.png differ diff --git a/doc/workflow/importing/img/import_projects_from_github_select_auth_method.png b/doc/workflow/importing/img/import_projects_from_github_select_auth_method.png index f50d9266991..1ccb38a815e 100644 Binary files a/doc/workflow/importing/img/import_projects_from_github_select_auth_method.png and b/doc/workflow/importing/img/import_projects_from_github_select_auth_method.png differ diff --git a/doc/workflow/importing/import_projects_from_bitbucket.md b/doc/workflow/importing/import_projects_from_bitbucket.md index 935d6288f3b..fbbbc7f4a72 100644 --- a/doc/workflow/importing/import_projects_from_bitbucket.md +++ b/doc/workflow/importing/import_projects_from_bitbucket.md @@ -1,27 +1,63 @@ # Import your project from Bitbucket to GitLab -It takes just a few steps to import your existing Bitbucket projects to GitLab. But keep in mind that it is possible only if Bitbucket support is enabled on your GitLab instance. You can read more about Bitbucket support [here](../../integration/bitbucket.md). +Import your projects from Bitbucket to GitLab with minimal effort. + +## Overview + +>**Note:** +The [Bitbucket integration][bb-import] must be first enabled in order to be +able to import your projects from Bitbucket. Ask your GitLab administrator +to enable this if not already. + +- At its current state, the Bitbucket importer can import: + - the repository description (GitLab 7.7+) + - the Git repository data (GitLab 7.7+) + - the issues (GitLab 7.7+) + - the pull requests (GitLab 8.4+) + - the wiki pages (GitLab 8.4+) + - the milestones (GitLab 8.7+) + - the labels (GitLab 8.7+) + - the release note descriptions (GitLab 8.12+) +- References to pull requests and issues are preserved (GitLab 8.7+) +- Repository public access is retained. If a repository is private in Bitbucket + it will be created as private in GitLab as well. -* Sign in to GitLab.com and go to your dashboard +Milestones and wiki pages are not imported from Bitbucket. -* Click on "New project" +## How it works -![New project in GitLab](bitbucket_importer/bitbucket_import_new_project.png) +When issues/pull requests are being imported, the Bitbucket importer tries to find +the Bitbucket author/assignee in GitLab's database using the Bitbucket ID. For this +to work, the Bitbucket author/assignee should have signed in beforehand in GitLab +and [**associated their Bitbucket account**][social sign-in]. If the user is not +found in GitLab's database, the project creator (most of the times the current +user that started the import process) is set as the author, but a reference on +the issue about the original Bitbucket author is kept. -* Click on the "Bitbucket" button +The importer will create any new namespaces (groups) if they don't exist or in +the case the namespace is taken, the repository will be imported under the user's +namespace that started the import process. -![Bitbucket](bitbucket_importer/bitbucket_import_select_bitbucket.png) +## Importing your Bitbucket repositories -* Grant GitLab access to your Bitbucket account +1. Sign in to GitLab and go to your dashboard. +1. Click on **New project**. -![Grant access](bitbucket_importer/bitbucket_import_grant_access.png) + ![New project in GitLab](img/bitbucket_import_new_project.png) -* Click on the projects that you'd like to import or "Import all projects" +1. Click on the "Bitbucket" button -![Import projects](bitbucket_importer/bitbucket_import_select_project.png) + ![Bitbucket](img/import_projects_from_github_new_project_page.png) -A new GitLab project will be created with your imported data. Keep in mind that if you want to Bitbucket users -to be linked to GitLab user you have to have all of them in GitLab in advance. They will be matched by their BitBucket username. +1. Grant GitLab access to your Bitbucket account -### Note -Milestones and wiki pages are not imported from Bitbucket. + ![Grant access](img/bitbucket_import_grant_access.png) + +1. Click on the projects that you'd like to import or **Import all projects**. + You can also select the namespace under which each project will be + imported. + + ![Import projects](img/bitbucket_import_select_project.png) + +[bb-import]: ../../integration/bitbucket.md +[social sign-in]: ../../user/profile/account/social_sign_in.md -- cgit v1.2.1 From 445e83ebee1a224bd576db738f4bf597b37a5f6c Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Fri, 16 Dec 2016 16:21:33 +0100 Subject: Use new generic image for project import --- .../import_projects_from_github_new_project_page.png | Bin 11047 -> 0 bytes .../img/import_projects_from_new_project_page.png | Bin 0 -> 36821 bytes .../importing/import_projects_from_bitbucket.md | 2 +- doc/workflow/importing/import_projects_from_github.md | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 doc/workflow/importing/img/import_projects_from_github_new_project_page.png create mode 100644 doc/workflow/importing/img/import_projects_from_new_project_page.png (limited to 'doc/workflow') 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 deleted file mode 100644 index b23ade4480c..00000000000 Binary files a/doc/workflow/importing/img/import_projects_from_github_new_project_page.png and /dev/null differ diff --git a/doc/workflow/importing/img/import_projects_from_new_project_page.png b/doc/workflow/importing/img/import_projects_from_new_project_page.png new file mode 100644 index 00000000000..97ca30b2087 Binary files /dev/null and b/doc/workflow/importing/img/import_projects_from_new_project_page.png differ diff --git a/doc/workflow/importing/import_projects_from_bitbucket.md b/doc/workflow/importing/import_projects_from_bitbucket.md index fbbbc7f4a72..f0b73ccbcd2 100644 --- a/doc/workflow/importing/import_projects_from_bitbucket.md +++ b/doc/workflow/importing/import_projects_from_bitbucket.md @@ -47,7 +47,7 @@ namespace that started the import process. 1. Click on the "Bitbucket" button - ![Bitbucket](img/import_projects_from_github_new_project_page.png) + ![Bitbucket](img/import_projects_from_new_project_page.png) 1. Grant GitLab access to your Bitbucket account diff --git a/doc/workflow/importing/import_projects_from_github.md b/doc/workflow/importing/import_projects_from_github.md index c36dfdb78ec..b3660aa8030 100644 --- a/doc/workflow/importing/import_projects_from_github.md +++ b/doc/workflow/importing/import_projects_from_github.md @@ -40,7 +40,7 @@ namespace that started the import process. The importer page is visible when you create a new project. -![New project page on GitLab](img/import_projects_from_github_new_project_page.png) +![New project page on GitLab](img/import_projects_from_new_project_page.png) Click on the **GitHub** link and the import authorization process will start. There are two ways to authorize access to your GitHub repositories: -- cgit v1.2.1 From 20e472d946d7cc4a2b9dd91264458b1c4ceb5ab6 Mon Sep 17 00:00:00 2001 From: Valery Sizov Date: Fri, 16 Dec 2016 17:40:29 +0200 Subject: BB importer: Fix documantation --- doc/workflow/importing/import_projects_from_bitbucket.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'doc/workflow') diff --git a/doc/workflow/importing/import_projects_from_bitbucket.md b/doc/workflow/importing/import_projects_from_bitbucket.md index f0b73ccbcd2..b6d47e5afa2 100644 --- a/doc/workflow/importing/import_projects_from_bitbucket.md +++ b/doc/workflow/importing/import_projects_from_bitbucket.md @@ -13,16 +13,14 @@ to enable this if not already. - the repository description (GitLab 7.7+) - the Git repository data (GitLab 7.7+) - the issues (GitLab 7.7+) + - the issue comments (GitLab 8.15+) - the pull requests (GitLab 8.4+) - - the wiki pages (GitLab 8.4+) - - the milestones (GitLab 8.7+) - - the labels (GitLab 8.7+) - - the release note descriptions (GitLab 8.12+) + - the pull request comments (GitLab 8.15+) + - the milestones (GitLab 8.15+) - References to pull requests and issues are preserved (GitLab 8.7+) - Repository public access is retained. If a repository is private in Bitbucket it will be created as private in GitLab as well. -Milestones and wiki pages are not imported from Bitbucket. ## How it works -- cgit v1.2.1