From 9a7645c8a4336ac592fb159ea5d39e6397ad56d9 Mon Sep 17 00:00:00 2001 From: karen Carias Date: Thu, 23 Jul 2015 12:30:05 -0700 Subject: added note about labels in MR --- doc/workflow/labels.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'doc/workflow') diff --git a/doc/workflow/labels.md b/doc/workflow/labels.md index 085b7baf5ce..6e4840ca5ae 100644 --- a/doc/workflow/labels.md +++ b/doc/workflow/labels.md @@ -1,6 +1,6 @@ # Labels -In GitLab, you can easily tag issues and merge requests. If you have permission level `Developer` or higher, you can manage labels. To create, edit or delete a label, go to a project and then to `Issues` and then `Labels`. +In GitLab, you can easily tag issues and Merge Requests. If you have permission level `Developer` or higher, you can manage labels. To create, edit or delete a label, go to a project and then to `Issues` and then `Labels`. Here you can create a new label. @@ -14,3 +14,5 @@ If you want to change an existing label, press edit next to the listed label. You will be presented with the same form as when creating a new label. ![edit label](labels/label3.png) + +You can add labels to Merge Requests when you create or edit them. -- cgit v1.2.1 From a1ca9b5220f5b47bc834378d632b3e7f90dde236 Mon Sep 17 00:00:00 2001 From: karen Carias Date: Thu, 23 Jul 2015 16:38:22 -0700 Subject: added info about repo size --- doc/workflow/importing/README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'doc/workflow') diff --git a/doc/workflow/importing/README.md b/doc/workflow/importing/README.md index 19395657719..c6cd4d34cce 100644 --- a/doc/workflow/importing/README.md +++ b/doc/workflow/importing/README.md @@ -6,4 +6,6 @@ 4. [SVN](migrating_from_svn.md) ### Note -* If you'd like to migrate from a self-hosted GitLab instance to GitLab.com, you can copy your repos by changing the remote and pushing to the new server; but issues and merge requests can't be imported. \ No newline at end of file +* If you'd like to migrate from a self-hosted GitLab instance to GitLab.com, you can copy your repos by changing the remote and pushing to the new server; but issues and merge requests can't be imported. + +* When you migrate repositories to GitLab, there is no restriction on maximum size. They are imported via HTTP, but if the repository is too large, it can timeout. -- cgit v1.2.1 From 779318398c1b74ebde29cd72d656882e21e121dd Mon Sep 17 00:00:00 2001 From: Arno Fleming Date: Sat, 25 Jul 2015 18:43:58 +0200 Subject: Minor styling fixes. - Link to rendered html instead of markdown source. - Removed typos --- doc/workflow/gitlab_flow.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'doc/workflow') diff --git a/doc/workflow/gitlab_flow.md b/doc/workflow/gitlab_flow.md index 0e87dc74217..f608674faf6 100644 --- a/doc/workflow/gitlab_flow.md +++ b/doc/workflow/gitlab_flow.md @@ -31,7 +31,7 @@ We think there is still room for improvement and will detail a set of practices ## Git flow and its problems -[![Git Flow timeline by Vincent Driessen, used with permission](gitdashflow.png) +![Git Flow timeline by Vincent Driessen, used with permission](gitdashflow.png) Git flow was one of the first proposals to use git branches and it has gotten a lot of attention. It advocates a master branch and a separate develop branch as well as supporting branches for features, releases and hotfixes. @@ -54,7 +54,7 @@ And doing releases doesn't automatically mean also doing hotfixes. ![Master branch with feature branches merged in](github_flow.png) - In reaction to git flow a simpler alternative was detailed, [GitHub flow](https://guides.github.com/introduction/flow/index.html). +In reaction to git flow a simpler alternative was detailed, [GitHub flow](https://guides.github.com/introduction/flow/index.html). This flow has only feature branches and a master branch. This is very simple and clean, many organizations have adopted it with great success. Atlassian recommends [a similar strategy](http://blogs.atlassian.com/2014/01/simple-git-workflow-simple/) although they rebase feature branches. @@ -131,7 +131,7 @@ When you feel comfortable with it to be merged you assign it to the person that There is room for more feedback and after the assigned person feels comfortable with the result the branch is merged. If the assigned person does not feel comfortable they can close the merge request without merging. -In GitLab it is common to protect the long-lived branches (e.g. the master branch) so that normal developers [can't modify these protected branches](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/permissions/permissions.md). +In GitLab it is common to protect the long-lived branches (e.g. the master branch) so that normal developers [can't modify these protected branches](http://doc.gitlab.com/ce/permissions/permissions.html). So if you want to merge it into a protected branch you assign it to someone with master authorizations. ## Issues with GitLab flow @@ -216,7 +216,7 @@ This prevents creating a merge commit when merging master into your feature bran However, just like with squashing you should never rebase commits you have pushed to a remote server. This makes it impossible to rebase work in progress that you already shared with your team which is something we recommend. When using rebase to keep your feature branch updated you [need to resolve similar conflicts again and again](http://blogs.atlassian.com/2013/10/git-team-workflows-merge-or-rebase/). -You can reuse recorded resolutions (rerere) sometimes, but with without rebasing you only have to solve the conflicts one time and you’re set. +You can reuse recorded resolutions (rerere) sometimes, but without rebasing you only have to solve the conflicts one time and you’re set. There has to be a better way to avoid many merge commits. The way to prevent creating many merge commits is to not frequently merge master into the feature branch. -- cgit v1.2.1 From 6b243dd138115470a3d49b90ee3d2a199776c790 Mon Sep 17 00:00:00 2001 From: karen Carias Date: Mon, 27 Jul 2015 21:53:55 -0700 Subject: fixed text --- doc/workflow/importing/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'doc/workflow') diff --git a/doc/workflow/importing/README.md b/doc/workflow/importing/README.md index c6cd4d34cce..cd98d1b9852 100644 --- a/doc/workflow/importing/README.md +++ b/doc/workflow/importing/README.md @@ -8,4 +8,5 @@ ### Note * If you'd like to migrate from a self-hosted GitLab instance to GitLab.com, you can copy your repos by changing the remote and pushing to the new server; but issues and merge requests can't be imported. -* When you migrate repositories to GitLab, there is no restriction on maximum size. They are imported via HTTP, but if the repository is too large, it can timeout. +* Repositories are imported to GitLab via HTTP. +If the repository is too large, it can timeout. We have a soft limit of 10GB. -- cgit v1.2.1 From 168f10febaab7ec1590ed8a1ba2771b534ae9c22 Mon Sep 17 00:00:00 2001 From: karen Carias Date: Thu, 30 Jul 2015 13:20:10 -0700 Subject: added new doc about adding users and members --- doc/workflow/README.md | 1 + doc/workflow/add-user/add-user.md | 25 ++++++++++++++++++++++++ doc/workflow/add-user/images/add-members.png | Bin 0 -> 2361 bytes doc/workflow/add-user/images/members.png | Bin 0 -> 8295 bytes doc/workflow/add-user/images/new-member.png | Bin 0 -> 12038 bytes doc/workflow/add-user/images/select-project.png | Bin 0 -> 4042 bytes 6 files changed, 26 insertions(+) create mode 100644 doc/workflow/add-user/add-user.md create mode 100644 doc/workflow/add-user/images/add-members.png create mode 100644 doc/workflow/add-user/images/members.png create mode 100644 doc/workflow/add-user/images/new-member.png create mode 100644 doc/workflow/add-user/images/select-project.png (limited to 'doc/workflow') diff --git a/doc/workflow/README.md b/doc/workflow/README.md index 1f39d02bdf3..139f4db7d57 100644 --- a/doc/workflow/README.md +++ b/doc/workflow/README.md @@ -10,6 +10,7 @@ - [Notification emails](notifications.md) - [Project Features](project_features.md) - [Project forking workflow](forking_workflow.md) +- [Project users and members](add-user/add-user.md) - [Protected branches](protected_branches.md) - [Web Editor](web_editor.md) - ["Work In Progress" Merge Requests](wip_merge_requests.md) diff --git a/doc/workflow/add-user/add-user.md b/doc/workflow/add-user/add-user.md new file mode 100644 index 00000000000..1693dd6e527 --- /dev/null +++ b/doc/workflow/add-user/add-user.md @@ -0,0 +1,25 @@ +# Project Users and Members + +You can add or import members to your projects. You can also give them different access +levels. + +You should have 'master' or 'owner' permissions to add or import a new member to your +project. + +To add or import a new member, go to your project and click on "Members" on the left side +of your screen: + +![Members](images/members.png) + +Select "Add members" or "Import members" on the right side of your screen: + +![Add or Import](images/add-members.png) + +If you are adding a member, select the user and the [permission level](doc/permissions/permissions.md) that you'd like to +give the member: + +![Add or Import](images/new-member.png) + +If you are importing a member, follow the steps to select the project where you'd like to import the user from. + +![Add or Import](images/select-project.png) diff --git a/doc/workflow/add-user/images/add-members.png b/doc/workflow/add-user/images/add-members.png new file mode 100644 index 00000000000..2805c5764a5 Binary files /dev/null and b/doc/workflow/add-user/images/add-members.png differ diff --git a/doc/workflow/add-user/images/members.png b/doc/workflow/add-user/images/members.png new file mode 100644 index 00000000000..f1797b95f67 Binary files /dev/null and b/doc/workflow/add-user/images/members.png differ diff --git a/doc/workflow/add-user/images/new-member.png b/doc/workflow/add-user/images/new-member.png new file mode 100644 index 00000000000..d500daea56e Binary files /dev/null and b/doc/workflow/add-user/images/new-member.png differ diff --git a/doc/workflow/add-user/images/select-project.png b/doc/workflow/add-user/images/select-project.png new file mode 100644 index 00000000000..dd3844edff8 Binary files /dev/null and b/doc/workflow/add-user/images/select-project.png differ -- cgit v1.2.1 From e70901abe76b07d7d08c6687ec746ac0491ddf26 Mon Sep 17 00:00:00 2001 From: karen Carias Date: Thu, 30 Jul 2015 13:26:10 -0700 Subject: typo --- doc/workflow/add-user/add-user.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'doc/workflow') diff --git a/doc/workflow/add-user/add-user.md b/doc/workflow/add-user/add-user.md index 1693dd6e527..58f7bd0a5ce 100644 --- a/doc/workflow/add-user/add-user.md +++ b/doc/workflow/add-user/add-user.md @@ -1,12 +1,12 @@ -# Project Users and Members +# Project users and members -You can add or import members to your projects. You can also give them different access +You can add or import users to your projects. You can also give them different access levels. -You should have 'master' or 'owner' permissions to add or import a new member to your +You should have 'master' or 'owner' permissions to add or import a new user to your project. -To add or import a new member, go to your project and click on "Members" on the left side +To add or import a user, go to your project and click on "Members" on the left side of your screen: ![Members](images/members.png) @@ -15,11 +15,11 @@ Select "Add members" or "Import members" on the right side of your screen: ![Add or Import](images/add-members.png) -If you are adding a member, select the user and the [permission level](doc/permissions/permissions.md) that you'd like to -give the member: +If you are adding a user, select the user and the [permission level](doc/permissions/permissions.md) that you'd like to +give the user: ![Add or Import](images/new-member.png) -If you are importing a member, follow the steps to select the project where you'd like to import the user from. +If you are importing a user, follow the steps to select the project where you'd like to import the user from: ![Add or Import](images/select-project.png) -- cgit v1.2.1 From 28cc6d9b9860fb38fc68d05c40d552d3a46e7ac8 Mon Sep 17 00:00:00 2001 From: karen Carias Date: Mon, 3 Aug 2015 15:51:09 -0700 Subject: text fixed --- doc/workflow/add-user/add-user.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'doc/workflow') diff --git a/doc/workflow/add-user/add-user.md b/doc/workflow/add-user/add-user.md index 58f7bd0a5ce..8c9b4f72631 100644 --- a/doc/workflow/add-user/add-user.md +++ b/doc/workflow/add-user/add-user.md @@ -1,13 +1,13 @@ -# Project users and members +# Project users -You can add or import users to your projects. You can also give them different access -levels. +You can manage the groups and users and their access levels in all of your projects. You can also personalize the access level you give each user, per project. -You should have 'master' or 'owner' permissions to add or import a new user to your -project. +Here's how to add or import users to your projects. -To add or import a user, go to your project and click on "Members" on the left side -of your screen: +You should have 'master' or 'owner' permissions to add or import a new user +to your project. + +To add or import a user, go to your project and click on "Members" on the left side of your screen: ![Members](images/members.png) -- cgit v1.2.1 From c5a6c16dba66318ea7f36b368217a275f1dd24e8 Mon Sep 17 00:00:00 2001 From: karen Carias Date: Mon, 3 Aug 2015 15:55:02 -0700 Subject: typo --- 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 139f4db7d57..3915198ad2a 100644 --- a/doc/workflow/README.md +++ b/doc/workflow/README.md @@ -10,7 +10,7 @@ - [Notification emails](notifications.md) - [Project Features](project_features.md) - [Project forking workflow](forking_workflow.md) -- [Project users and members](add-user/add-user.md) +- [Project users](add-user/add-user.md) - [Protected branches](protected_branches.md) - [Web Editor](web_editor.md) - ["Work In Progress" Merge Requests](wip_merge_requests.md) -- cgit v1.2.1