Version up to 2.1. Help page filled with simple workflow
This commit is contained in:
parent
3b91a103e0
commit
611c5a87ab
5 changed files with 83 additions and 1 deletions
2
VERSION
2
VERSION
|
@ -1 +1 @@
|
|||
2.1.0.pre
|
||||
2.1.0
|
||||
|
|
BIN
app/assets/images/help_commit.png
Normal file
BIN
app/assets/images/help_commit.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 96 KiB |
BIN
app/assets/images/help_merge_request.png
Normal file
BIN
app/assets/images/help_merge_request.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 54 KiB |
|
@ -761,3 +761,42 @@ body, button, input, select, textarea {
|
|||
padding:10px;
|
||||
}
|
||||
}
|
||||
|
||||
.help_content {
|
||||
margin:20px;
|
||||
margin-top:71px;
|
||||
|
||||
h2 {
|
||||
margin:0;
|
||||
padding:0;
|
||||
}
|
||||
|
||||
.menu {
|
||||
float:left;
|
||||
width:20%;
|
||||
|
||||
.active {
|
||||
color: $active_bd_color;
|
||||
}
|
||||
}
|
||||
|
||||
.content {
|
||||
float:right;
|
||||
width:78%;
|
||||
}
|
||||
|
||||
.bash {
|
||||
@include round-borders-all(4px);
|
||||
background:#eee;
|
||||
padding:5px;
|
||||
//overflow-x:scroll;
|
||||
pre{
|
||||
padding:0;
|
||||
line-height:2.0;
|
||||
margin:0;
|
||||
font-family: 'Courier New', 'andale mono','lucida console',monospace;
|
||||
color: #333;
|
||||
text-align:left;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1,43 @@
|
|||
- 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.
|
||||
|
||||
%hr
|
||||
|
||||
.menu
|
||||
%h3= link_to "Workflow", "#", :class => "active"
|
||||
|
||||
.content
|
||||
%h3 Clone project
|
||||
.bash
|
||||
%pre
|
||||
git clone git@example.com:project-name.git
|
||||
|
||||
%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
|
Loading…
Reference in a new issue