Updated readme, Roles in progress
This commit is contained in:
parent
37224dc9c1
commit
dac7c44ab3
15 changed files with 165 additions and 67 deletions
|
@ -1,43 +1,17 @@
|
|||
- bash_lexer = Pygments::Lexer[:bash]
|
||||
%div.help_content
|
||||
%h2
|
||||
Gitlabhq
|
||||
%span.right v2.1
|
||||
%hr
|
||||
%h3 Self Hosted Git Management
|
||||
%h3 Fast, secure and stable solution based on Ruby on Rails & Gitolite.
|
||||
%h3
|
||||
Gitlabhq
|
||||
%span.right v2.2
|
||||
%hr
|
||||
%h4 Self Hosted Git Management
|
||||
%h4 Fast, secure and stable solution based on Ruby on Rails & Gitolite.
|
||||
|
||||
%hr
|
||||
%hr
|
||||
|
||||
.menu
|
||||
%h3= link_to "Workflow", "#", :class => "active"
|
||||
%h3 Help
|
||||
|
||||
.content
|
||||
%h3 Clone project
|
||||
.bash
|
||||
%pre
|
||||
git clone git@example.com:project-name.git
|
||||
%ol
|
||||
%li
|
||||
= link_to "Workflow", help_workflow_path
|
||||
|
||||
%h3 Create branch with your feature
|
||||
.bash
|
||||
%pre
|
||||
git checkout -b $feature_name
|
||||
|
||||
%h3 Write code. Commit changes
|
||||
.bash
|
||||
%pre
|
||||
git commit -am "My feature is ready"
|
||||
|
||||
%h3 Push your branch to gitlabhq
|
||||
.bash
|
||||
%pre
|
||||
git push origin $feature_name
|
||||
|
||||
%h3 Review your code
|
||||
.bash= image_tag "help_commit.png", :width => 600
|
||||
|
||||
|
||||
%h3 Open a merge request
|
||||
.bash= image_tag "help_merge_request.png", :width => 600
|
||||
|
||||
%h3 Your team lead will review code & merge it to main branch
|
||||
%li
|
||||
= link_to "Permissions", help_permissions_path
|
||||
|
|
27
app/views/help/permissions.html.haml
Normal file
27
app/views/help/permissions.html.haml
Normal file
|
@ -0,0 +1,27 @@
|
|||
%h3 Permissions
|
||||
%hr
|
||||
|
||||
%h4 Reporter
|
||||
%ul
|
||||
%li Pull project code
|
||||
%li Create new issue
|
||||
%li Create new merge request
|
||||
%li Write on project wall
|
||||
|
||||
|
||||
%h4 Developer
|
||||
%ul
|
||||
%li Pull project code
|
||||
%li Create new branches
|
||||
%li Push to non-protected branches
|
||||
%li Remove non-protected branches
|
||||
%li Add tags
|
||||
%li Create new issue
|
||||
%li Create new merge request
|
||||
%li Write on project wall
|
||||
|
||||
%h4 Master
|
||||
%ul
|
||||
%li Full repository access
|
||||
%li Full project access
|
||||
%li Add new team members
|
38
app/views/help/workflow.html.haml
Normal file
38
app/views/help/workflow.html.haml
Normal file
|
@ -0,0 +1,38 @@
|
|||
- bash_lexer = Pygments::Lexer[:bash]
|
||||
%h3 Workflow
|
||||
%hr
|
||||
|
||||
%ol.help
|
||||
%li
|
||||
%p Clone project
|
||||
.bash
|
||||
%pre
|
||||
git clone git@example.com:project-name.git
|
||||
|
||||
%li
|
||||
%p Create branch with your feature
|
||||
.bash
|
||||
%pre
|
||||
git checkout -b $feature_name
|
||||
|
||||
%li
|
||||
%p Write code. Commit changes
|
||||
.bash
|
||||
%pre
|
||||
git commit -am "My feature is ready"
|
||||
|
||||
%li
|
||||
%p Push your branch to gitlabhq
|
||||
.bash
|
||||
%pre
|
||||
git push origin $feature_name
|
||||
|
||||
%li
|
||||
%p Review your code on Commits page
|
||||
|
||||
%li
|
||||
%p Create a merge request
|
||||
|
||||
%li
|
||||
%p Your team lead will review code & merge it to main branch
|
||||
|
Loading…
Add table
Add a link
Reference in a new issue