diff --git a/VERSION b/VERSION index 654910cd..7ec1d6db 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.1.0.pre +2.1.0 diff --git a/app/assets/images/help_commit.png b/app/assets/images/help_commit.png new file mode 100644 index 00000000..e0a49b71 Binary files /dev/null and b/app/assets/images/help_commit.png differ diff --git a/app/assets/images/help_merge_request.png b/app/assets/images/help_merge_request.png new file mode 100644 index 00000000..a6b5d3df Binary files /dev/null and b/app/assets/images/help_merge_request.png differ diff --git a/app/assets/stylesheets/style.scss b/app/assets/stylesheets/style.scss index c9262c46..4bb5fef9 100644 --- a/app/assets/stylesheets/style.scss +++ b/app/assets/stylesheets/style.scss @@ -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; + } + } +} diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml index e69de29b..fd1f512b 100644 --- a/app/views/help/index.html.haml +++ b/app/views/help/index.html.haml @@ -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