Version up to 2.1. Help page filled with simple workflow

Dmitriy Zaporozhets
1 parent 3b91a103
Showing 5 changed files with 83 additions and 1 deletions Show diff stats
VERSION
app/assets/images/help_commit.png
app/assets/images/help_merge_request.png
app/assets/stylesheets/style.scss
app/views/help/index.html.haml
-2.1.0.pre
+2.1.0
@@ -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 &amp; merge it to main branch
	@@ -761,3 +761,42 @@ body, button, input, select, textarea {		@@ -761,3 +761,42 @@ body, button, input, select, textarea {
761	padding:10px;	761	padding:10px;
762	}	762	}
763	}	763	}
		764	+
		765	+.help_content {
		766	+ margin:20px;
		767	+ margin-top:71px;
		768	+
		769	+ h2 {
		770	+ margin:0;
		771	+ padding:0;
		772	+ }
		773	+
		774	+ .menu {
		775	+ float:left;
		776	+ width:20%;
		777	+
		778	+ .active {
		779	+ color: $active_bd_color;
		780	+ }
		781	+ }
		782	+
		783	+ .content {
		784	+ float:right;
		785	+ width:78%;
		786	+ }
		787	+
		788	+ .bash {
		789	+ @include round-borders-all(4px);
		790	+ background:#eee;
		791	+ padding:5px;
		792	+ //overflow-x:scroll;
		793	+ pre{
		794	+ padding:0;
		795	+ line-height:2.0;
		796	+ margin:0;
		797	+ font-family: 'Courier New', 'andale mono','lucida console',monospace;
		798	+ color: #333;
		799	+ text-align:left;
		800	+ }
		801	+ }
		802	+}
@@ -0,0 +1,43 @@		@@ -0,0 +1,43 @@
	1	+- bash_lexer = Pygments::Lexer[:bash]
	2	+%div.help_content
	3	+ %h2
	4	+ Gitlabhq
	5	+ %span.right v2.1
	6	+ %hr
	7	+ %h3 Self Hosted Git Management
	8	+ %h3 Fast, secure and stable solution based on Ruby on Rails & Gitolite.
	9	+
	10	+ %hr
	11	+
	12	+ .menu
	13	+ %h3= link_to "Workflow", "#", :class => "active"
	14	+
	15	+ .content
	16	+ %h3 Clone project
	17	+ .bash
	18	+ %pre
	19	+ git clone git@example.com:project-name.git
	20	+
	21	+ %h3 Create branch with your feature
	22	+ .bash
	23	+ %pre
	24	+ git checkout -b $feature_name
	25	+
	26	+ %h3 Write code. Commit changes
	27	+ .bash
	28	+ %pre
	29	+ git commit -am "My feature is ready"
	30	+
	31	+ %h3 Push your branch to gitlabhq
	32	+ .bash
	33	+ %pre
	34	+ git push origin $feature_name
	35	+
	36	+ %h3 Review your code
	37	+ .bash= image_tag "help_commit.png", :width => 600
	38	+
	39	+
	40	+ %h3 Open a merge request
	41	+ .bash= image_tag "help_merge_request.png", :width => 600
	42	+
	43	+ %h3 Your team lead will review code & merge it to main branch