Merge branch 'feature/create_branch'

Dmitriy Zaporozhets
2 parents d65eb22e cbe9f56a
Showing 5 changed files with 47 additions and 4 deletions Show diff stats
app/controllers/projects/branches_controller.rb
app/models/repository.rb
app/views/projects/branches/new.html.haml
app/views/projects/repositories/_filter.html.haml
config/routes.rb
@@ -10,7 +10,9 @@ class Projects::BranchesController &lt; Projects::ApplicationController
   end
  
   def create
-    # TODO: implement
+    @project.repository.add_branch(params[:branch_name], params[:ref])
+
+    redirect_to project_branches_path(@project)
   end
  
   def destroy
@@ -21,7 +23,7 @@ class Projects::BranchesController &lt; Projects::ApplicationController
     end
  
     respond_to do |format|
-      format.html { redirect_to project_branches_path }
+      format.html { redirect_to project_branches_path(@project) }
       format.js { render nothing: true }
     end
   end
@@ -35,11 +35,21 @@ class Repository
     commits
   end
  
+  def add_branch(branch_name, ref)
+    Rails.cache.delete(cache_key(:branch_names))
+
+    gitlab_shell.add_branch(path_with_namespace, branch_name, ref)
+  end
+
   def rm_branch(branch_name)
+    Rails.cache.delete(cache_key(:branch_names))
+
     gitlab_shell.rm_branch(path_with_namespace, branch_name)
   end
  
   def rm_tag(tag_name)
+    Rails.cache.delete(cache_key(:tag_names))
+
     gitlab_shell.rm_tag(path_with_namespace, tag_name)
   end
  
@@ -0,0 +1,24 @@
+%h3.page-title
+  %i.icon-code-fork
+  New branch
+= form_tag project_branches_path, method: :post do
+  .control-group
+    = label_tag :branch_name, 'Name for new branch', class: 'control-label'
+    .controls
+      = text_field_tag :branch_name, nil, placeholder: 'feature/dashboard'
+  .control-group
+    = label_tag :ref, 'Create from', class: 'control-label'
+    .controls
+      = text_field_tag :ref, nil, placeholder: 'master'
+      .light branch name or commit SHA
+  .form-actions
+    = submit_tag 'Create branch', class: 'btn btn-create'
+    = link_to 'Cancel', project_branches_path(@project), class: 'btn btn-cancel'
+
+:javascript
+  var availableTags = #{@project.repository.ref_names.to_json};
+
+  $("#ref").autocomplete({
+    source: availableTags,
+    minLength: 1
+  });
@@ -7,3 +7,10 @@
       %i.icon-lock
   = nav_link(path: 'branches#index') do
     = link_to 'All branches', project_branches_path(@project)
+
+
+%hr
+  = link_to new_project_branch_path(@project), class: 'btn btn-create' do
+    %i.icon-add-sign
+    New branch
+
@@ -223,8 +223,8 @@ Gitlab::Application.routes.draw do
         end
       end
  
-      resources :tags, only: [:index, :create, :destroy]
-      resources :branches, only: [:index, :create, :destroy]
+      resources :tags, only: [:index, :new, :create, :destroy]
+      resources :branches, only: [:index, :new, :create, :destroy]
       resources :protected_branches, only: [:index, :create, :destroy]
  
       resources :refs, only: [] do
...	...	@@ -10,7 +10,9 @@ class Projects::BranchesController < Projects::ApplicationController
10	10	end
11	11
12	12	def create
13		- # TODO: implement
	13	+ @project.repository.add_branch(params[:branch_name], params[:ref])
	14	+
	15	+ redirect_to project_branches_path(@project)
14	16	end
15	17
16	18	def destroy
...	...	@@ -21,7 +23,7 @@ class Projects::BranchesController < Projects::ApplicationController
21	23	end
22	24
23	25	respond_to do \|format\|
24		- format.html { redirect_to project_branches_path }
	26	+ format.html { redirect_to project_branches_path(@project) }
25	27	format.js { render nothing: true }
26	28	end
27	29	end
...	...
...	...	@@ -35,11 +35,21 @@ class Repository
35	35	commits
36	36	end
37	37
	38	+ def add_branch(branch_name, ref)
	39	+ Rails.cache.delete(cache_key(:branch_names))
	40	+
	41	+ gitlab_shell.add_branch(path_with_namespace, branch_name, ref)
	42	+ end
	43	+
38	44	def rm_branch(branch_name)
	45	+ Rails.cache.delete(cache_key(:branch_names))
	46	+
39	47	gitlab_shell.rm_branch(path_with_namespace, branch_name)
40	48	end
41	49
42	50	def rm_tag(tag_name)
	51	+ Rails.cache.delete(cache_key(:tag_names))
	52	+
43	53	gitlab_shell.rm_tag(path_with_namespace, tag_name)
44	54	end
45	55
...	...
...	...	@@ -0,0 +1,24 @@
	1	+%h3.page-title
	2	+ %i.icon-code-fork
	3	+ New branch
	4	+= form_tag project_branches_path, method: :post do
	5	+ .control-group
	6	+ = label_tag :branch_name, 'Name for new branch', class: 'control-label'
	7	+ .controls
	8	+ = text_field_tag :branch_name, nil, placeholder: 'feature/dashboard'
	9	+ .control-group
	10	+ = label_tag :ref, 'Create from', class: 'control-label'
	11	+ .controls
	12	+ = text_field_tag :ref, nil, placeholder: 'master'
	13	+ .light branch name or commit SHA
	14	+ .form-actions
	15	+ = submit_tag 'Create branch', class: 'btn btn-create'
	16	+ = link_to 'Cancel', project_branches_path(@project), class: 'btn btn-cancel'
	17	+
	18	+:javascript
	19	+ var availableTags = #{@project.repository.ref_names.to_json};
	20	+
	21	+ $("#ref").autocomplete({
	22	+ source: availableTags,
	23	+ minLength: 1
	24	+ });
...	...
...	...	@@ -7,3 +7,10 @@
7	7	%i.icon-lock
8	8	= nav_link(path: 'branches#index') do
9	9	= link_to 'All branches', project_branches_path(@project)
	10	+
	11	+
	12	+%hr
	13	+ = link_to new_project_branch_path(@project), class: 'btn btn-create' do
	14	+ %i.icon-add-sign
	15	+ New branch
	16	+
...	...
...	...	@@ -223,8 +223,8 @@ Gitlab::Application.routes.draw do
223	223	end
224	224	end
225	225
226		- resources :tags, only: [:index, :create, :destroy]
227		- resources :branches, only: [:index, :create, :destroy]
	226	+ resources :tags, only: [:index, :new, :create, :destroy]
	227	+ resources :branches, only: [:index, :new, :create, :destroy]
228	228	resources :protected_branches, only: [:index, :create, :destroy]
229	229
230	230	resources :refs, only: [] do
...	...