New feature: Create file from UI

Now you are able to create a new file in repository from your browser. You are not allowed to create a file if file with same name already exists in the repo. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

New feature: Create file from UI
Now you are able to create a new file in repository from your browser. You are not allowed to create a file if file with same name already exists in the repo. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets
1 parent 2ee04b12
Showing 9 changed files with 237 additions and 67 deletions Show diff stats
app/controllers/projects/new_tree_controller.rb
app/views/layouts/nav/_project.html.haml
app/views/projects/new_tree/show.html.haml
app/views/projects/tree/_tree.html.haml
config/routes.rb
lib/gitlab/satellite/edit_file_action.rb
lib/gitlab/satellite/files/edit_file_action.rb
lib/gitlab/satellite/files/file_action.rb
lib/gitlab/satellite/files/new_file_action.rb
@@ -0,0 +1,65 @@
+class Projects::NewTreeController < Projects::ApplicationController
+  include ExtractsPath
+
+  # Authorize
+  before_filter :authorize_read_project!
+  before_filter :authorize_code_access!
+  before_filter :require_non_empty_project
+
+  before_filter :create_requirements, only: [:show, :update]
+
+  def show
+  end
+
+  def update
+    file_name = params[:file_name]
+
+    unless file_name =~ Gitlab::Regex.path_regex
+      flash[:notice] = "Your changes could not be commited, because file name contains not allowed characters"
+      render :show and return
+    end
+
+    file_path = if @path.blank?
+                  file_name
+                else
+                  File.join(@path, file_name)
+                end
+
+    blob = @repository.blob_at(@commit.id, file_path)
+
+    if blob
+      flash[:notice] = "Your changes could not be commited, because file with such name exists"
+      render :show and return
+    end
+
+    new_file_action = Gitlab::Satellite::NewFileAction.new(current_user, @project, @ref, @path)
+    updated_successfully = new_file_action.commit!(
+      params[:content],
+      params[:commit_message],
+      file_name,
+    )
+
+    if updated_successfully
+      redirect_to project_blob_path(@project, File.join(@id, params[:file_name])), notice: "Your changes have been successfully commited"
+    else
+      flash[:notice] = "Your changes could not be commited, because the file has been changed"
+      render :show
+    end
+  end
+
+  private
+
+  def create_requirements
+    allowed = if project.protected_branch? @ref
+                can?(current_user, :push_code_to_protected_branches, project)
+              else
+                can?(current_user, :push_code, project)
+              end
+
+    return access_denied! unless allowed
+
+    unless @repository.branch_names.include?(@ref)
+      redirect_to project_blob_path(@project, @id), notice: "You can only create files if you are on top of a branch"
+    end
+  end
+end
@@ -4,7 +4,7 @@
       %i.icon-home
   - if project_nav_tab? :files
-    = nav_link(controller: %w(tree blob blame edit_tree)) do
+    = nav_link(controller: %w(tree blob blame edit_tree new_tree)) do
       = link_to 'Files', project_tree_path(@project, @ref || @repository.root_ref)
   - if project_nav_tab? :commits
@@ -0,0 +1,47 @@
+%h3.page-title New file
+%hr
+.file-editor
+  = form_tag(project_new_tree_path(@project, @id), method: :put, class: "form-horizontal") do
+    .control-group.commit_message-group
+      = label_tag 'file_name', class: "control-label" do
+        File name
+      .controls
+        %span.monospace= @path[-1] == "/" ? @path : @path + "/"
+        &nbsp;
+        = text_field_tag 'file_name', '', placeholder: "sample.rb", required: true
+        %span
+          &nbsp;
+          on
+          %span.label-branch= @ref
+
+    .control-group.commit_message-group
+      = label_tag 'commit_message', class: "control-label" do
+        Commit message
+      .controls
+        = text_area_tag 'commit_message', '', placeholder: "Added new file", required: true, rows: 3
+
+    .file-holder
+      .file-title
+        %i.icon-file
+      .file-content.code
+        %pre#editor= ""
+
+    .form-actions
+      = hidden_field_tag 'content', '', id: "file-content"
+      .commit-button-annotation
+        = button_tag "Commit changes", class: 'btn commit-btn js-commit-button btn-create'
+        .message
+          to branch
+          %strong= @ref
+      = link_to "Cancel", project_tree_path(@project, @id), class: "btn btn-cancel", confirm: leave_edit_message
+
+:javascript
+  ace.config.set("modePath", gon.relative_url_root + "#{Gitlab::Application.config.assets.prefix}/ace-src-noconflict")
+  var editor = ace.edit("editor");
+
+  disableButtonIfEmptyField("#commit_message", ".js-commit-button");
+
+  $(".js-commit-button").click(function(){
+    $("#file-content").val(editor.getValue());
+    $(".file-editor form").submit();
+  });
@@ -10,6 +10,11 @@
         = link_to truncate(title, length: 40), project_tree_path(@project, path)
       - else
         = link_to title, '#'
+  \/
+  %li
+    = link_to project_new_tree_path(@project, @id) do
+      %small
+        %i.icon-plus.light
 %div#tree-content-holder.tree-content-holder
   %table#tree-slider{class: "table_#{@hex_path} tree-table" }
@@ -166,16 +166,18 @@ Gitlab::Application.routes.draw do
     end
     scope module: :projects do
-      resources :blob,    only: [:show], constraints: {id: /.+/}
-      resources :raw,    only: [:show], constraints: {id: /.+/}
-      resources :tree,    only: [:show], constraints: {id: /.+/, format: /(html|js)/ }
-      resources :edit_tree,    only: [:show, :update], constraints: {id: /.+/}, path: 'edit'
-      resources :commit,  only: [:show], constraints: {id: /[[:alnum:]]{6,40}/}
-      resources :commits, only: [:show], constraints: {id: /(?:[^.]|\.(?!atom$))+/, format: /atom/}
-      resources :compare, only: [:index, :create]
-      resources :blame,   only: [:show], constraints: {id: /.+/}
+      resources :blob,      only: [:show], constraints: {id: /.+/}
+      resources :raw,       only: [:show], constraints: {id: /.+/}
+      resources :tree,      only: [:show], constraints: {id: /.+/, format: /(html|js)/ }
+      resources :edit_tree, only: [:show, :update], constraints: {id: /.+/}, path: 'edit'
+      resources :new_tree,  only: [:show, :update], constraints: {id: /.+/}, path: 'new'
+      resources :commit,    only: [:show], constraints: {id: /[[:alnum:]]{6,40}/}
+      resources :commits,   only: [:show], constraints: {id: /(?:[^.]|\.(?!atom$))+/, format: /atom/}
+      resources :compare,   only: [:index, :create]
+      resources :blame,     only: [:show], constraints: {id: /.+/}
       resources :network,   only: [:show], constraints: {id: /(?:[^.]|\.(?!json$))+/, format: /json/}
-      resources :graphs, only: [:show], constraints: {id: /(?:[^.]|\.(?!json$))+/, format: /json/}
+      resources :graphs,    only: [:show], constraints: {id: /(?:[^.]|\.(?!json$))+/, format: /json/}
+
       match "/compare/:from...:to" => "compare#show", as: "compare", via: [:get, :post], constraints: {from: /.+/, to: /.+/}
         resources :snippets, constraints: {id: /\d+/} do
@@ -1,57 +0,0 @@
-module Gitlab
-  module Satellite
-    # GitLab server-side file update and commit
-    class EditFileAction < Action
-      attr_accessor :file_path, :ref
-
-      def initialize(user, project, ref, file_path)
-        super user, project, git_timeout: 10.seconds
-        @file_path = file_path
-        @ref = ref
-      end
-
-      # Updates the files content and creates a new commit for it
-      #
-      # Returns false if the ref has been updated while editing the file
-      # Returns false if committing the change fails
-      # Returns false if pushing from the satellite to Gitolite failed or was rejected
-      # Returns true otherwise
-      def commit!(content, commit_message, last_commit)
-        return false unless can_edit?(last_commit)
-
-        in_locked_and_timed_satellite do |repo|
-          prepare_satellite!(repo)
-
-          # create target branch in satellite at the corresponding commit from Gitolite
-          repo.git.checkout({raise: true, timeout: true, b: true}, ref, "origin/#{ref}")
-
-          # update the file in the satellite's working dir
-          file_path_in_satellite = File.join(repo.working_dir, file_path)
-          File.open(file_path_in_satellite, 'w') { |f| f.write(content) }
-
-          # commit the changes
-          # will raise CommandFailed when commit fails
-          repo.git.commit(raise: true, timeout: true, a: true, m: commit_message)
-
-
-          # push commit back to Gitolite
-          # will raise CommandFailed when push fails
-          repo.git.push({raise: true, timeout: true}, :origin, ref)
-
-          # everything worked
-          true
-        end
-      rescue Grit::Git::CommandFailed => ex
-        Gitlab::GitLogger.error(ex.message)
-        false
-      end
-
-      protected
-
-      def can_edit?(last_commit)
-        current_last_commit = Gitlab::Git::Commit.last_for_path(@project.repository, ref, file_path).sha
-        last_commit == current_last_commit
-      end
-    end
-  end
-end
@@ -0,0 +1,44 @@
+require_relative 'file_action'
+
+module Gitlab
+  module Satellite
+    # GitLab server-side file update and commit
+    class EditFileAction < FileAction
+      # Updates the files content and creates a new commit for it
+      #
+      # Returns false if the ref has been updated while editing the file
+      # Returns false if committing the change fails
+      # Returns false if pushing from the satellite to Gitolite failed or was rejected
+      # Returns true otherwise
+      def commit!(content, commit_message, last_commit)
+        return false unless can_edit?(last_commit)
+
+        in_locked_and_timed_satellite do |repo|
+          prepare_satellite!(repo)
+
+          # create target branch in satellite at the corresponding commit from Gitolite
+          repo.git.checkout({raise: true, timeout: true, b: true}, ref, "origin/#{ref}")
+
+          # update the file in the satellite's working dir
+          file_path_in_satellite = File.join(repo.working_dir, file_path)
+          File.open(file_path_in_satellite, 'w') { |f| f.write(content) }
+
+          # commit the changes
+          # will raise CommandFailed when commit fails
+          repo.git.commit(raise: true, timeout: true, a: true, m: commit_message)
+
+
+          # push commit back to Gitolite
+          # will raise CommandFailed when push fails
+          repo.git.push({raise: true, timeout: true}, :origin, ref)
+
+          # everything worked
+          true
+        end
+      rescue Grit::Git::CommandFailed => ex
+        Gitlab::GitLogger.error(ex.message)
+        false
+      end
+    end
+  end
+end
@@ -0,0 +1,20 @@
+module Gitlab
+  module Satellite
+    class FileAction < Action
+      attr_accessor :file_path, :ref
+
+      def initialize(user, project, ref, file_path)
+        super user, project, git_timeout: 10.seconds
+        @file_path = file_path
+        @ref = ref
+      end
+
+      protected
+
+      def can_edit?(last_commit)
+        current_last_commit = Gitlab::Git::Commit.last_for_path(@project.repository, ref, file_path).sha
+        last_commit == current_last_commit
+      end
+    end
+  end
+end
@@ -0,0 +1,44 @@
+require_relative 'file_action'
+
+module Gitlab
+  module Satellite
+    class NewFileAction < FileAction
+      # Updates the files content and creates a new commit for it
+      #
+      # Returns false if the ref has been updated while editing the file
+      # Returns false if committing the change fails
+      # Returns false if pushing from the satellite to Gitolite failed or was rejected
+      # Returns true otherwise
+      def commit!(content, commit_message, file_name)
+        in_locked_and_timed_satellite do |repo|
+          prepare_satellite!(repo)
+
+          # create target branch in satellite at the corresponding commit from Gitolite
+          repo.git.checkout({raise: true, timeout: true, b: true}, ref, "origin/#{ref}")
+
+          # update the file in the satellite's working dir
+          file_path_in_satellite = File.join(repo.working_dir, file_path, file_name)
+          File.open(file_path_in_satellite, 'w') { |f| f.write(content) }
+
+          # add new file
+          repo.add(file_path_in_satellite)
+
+          # commit the changes
+          # will raise CommandFailed when commit fails
+          repo.git.commit(raise: true, timeout: true, a: true, m: commit_message)
+
+
+          # push commit back to Gitolite
+          # will raise CommandFailed when push fails
+          repo.git.push({raise: true, timeout: true}, :origin, ref)
+
+          # everything worked
+          true
+        end
+      rescue Grit::Git::CommandFailed => ex
+        Gitlab::GitLogger.error(ex.message)
+        false
+      end
+    end
+  end
+end
@@ -0,0 +1,65 @@		@@ -0,0 +1,65 @@
	1	+class Projects::NewTreeController < Projects::ApplicationController
	2	+ include ExtractsPath
	3	+
	4	+ # Authorize
	5	+ before_filter :authorize_read_project!
	6	+ before_filter :authorize_code_access!
	7	+ before_filter :require_non_empty_project
	8	+
	9	+ before_filter :create_requirements, only: [:show, :update]
	10	+
	11	+ def show
	12	+ end
	13	+
	14	+ def update
	15	+ file_name = params[:file_name]
	16	+
	17	+ unless file_name =~ Gitlab::Regex.path_regex
	18	+ flash[:notice] = "Your changes could not be commited, because file name contains not allowed characters"
	19	+ render :show and return
	20	+ end
	21	+
	22	+ file_path = if @path.blank?
	23	+ file_name
	24	+ else
	25	+ File.join(@path, file_name)
	26	+ end
	27	+
	28	+ blob = @repository.blob_at(@commit.id, file_path)
	29	+
	30	+ if blob
	31	+ flash[:notice] = "Your changes could not be commited, because file with such name exists"
	32	+ render :show and return
	33	+ end
	34	+
	35	+ new_file_action = Gitlab::Satellite::NewFileAction.new(current_user, @project, @ref, @path)
	36	+ updated_successfully = new_file_action.commit!(
	37	+ params[:content],
	38	+ params[:commit_message],
	39	+ file_name,
	40	+ )
	41	+
	42	+ if updated_successfully
	43	+ redirect_to project_blob_path(@project, File.join(@id, params[:file_name])), notice: "Your changes have been successfully commited"
	44	+ else
	45	+ flash[:notice] = "Your changes could not be commited, because the file has been changed"
	46	+ render :show
	47	+ end
	48	+ end
	49	+
	50	+ private
	51	+
	52	+ def create_requirements
	53	+ allowed = if project.protected_branch? @ref
	54	+ can?(current_user, :push_code_to_protected_branches, project)
	55	+ else
	56	+ can?(current_user, :push_code, project)
	57	+ end
	58	+
	59	+ return access_denied! unless allowed
	60	+
	61	+ unless @repository.branch_names.include?(@ref)
	62	+ redirect_to project_blob_path(@project, @id), notice: "You can only create files if you are on top of a branch"
	63	+ end
	64	+ end
	65	+end
	@@ -4,7 +4,7 @@		@@ -4,7 +4,7 @@
4	%i.icon-home	4	%i.icon-home
5		5
6	- if project_nav_tab? :files	6	- if project_nav_tab? :files
7	- = nav_link(controller: %w(tree blob blame edit_tree)) do	7	+ = nav_link(controller: %w(tree blob blame edit_tree new_tree)) do
8	= link_to 'Files', project_tree_path(@project, @ref \|\| @repository.root_ref)	8	= link_to 'Files', project_tree_path(@project, @ref \|\| @repository.root_ref)
9		9
10	- if project_nav_tab? :commits	10	- if project_nav_tab? :commits
@@ -0,0 +1,47 @@		@@ -0,0 +1,47 @@
	1	+%h3.page-title New file
	2	+%hr
	3	+.file-editor
	4	+ = form_tag(project_new_tree_path(@project, @id), method: :put, class: "form-horizontal") do
	5	+ .control-group.commit_message-group
	6	+ = label_tag 'file_name', class: "control-label" do
	7	+ File name
	8	+ .controls
	9	+ %span.monospace= @path[-1] == "/" ? @path : @path + "/"
	10	+
	11	+ = text_field_tag 'file_name', '', placeholder: "sample.rb", required: true
	12	+ %span
	13	+
	14	+ on
	15	+ %span.label-branch= @ref
	16	+
	17	+ .control-group.commit_message-group
	18	+ = label_tag 'commit_message', class: "control-label" do
	19	+ Commit message
	20	+ .controls
	21	+ = text_area_tag 'commit_message', '', placeholder: "Added new file", required: true, rows: 3
	22	+
	23	+ .file-holder
	24	+ .file-title
	25	+ %i.icon-file
	26	+ .file-content.code
	27	+ %pre#editor= ""
	28	+
	29	+ .form-actions
	30	+ = hidden_field_tag 'content', '', id: "file-content"
	31	+ .commit-button-annotation
	32	+ = button_tag "Commit changes", class: 'btn commit-btn js-commit-button btn-create'
	33	+ .message
	34	+ to branch
	35	+ %strong= @ref
	36	+ = link_to "Cancel", project_tree_path(@project, @id), class: "btn btn-cancel", confirm: leave_edit_message
	37	+
	38	+:javascript
	39	+ ace.config.set("modePath", gon.relative_url_root + "#{Gitlab::Application.config.assets.prefix}/ace-src-noconflict")
	40	+ var editor = ace.edit("editor");
	41	+
	42	+ disableButtonIfEmptyField("#commit_message", ".js-commit-button");
	43	+
	44	+ $(".js-commit-button").click(function(){
	45	+ $("#file-content").val(editor.getValue());
	46	+ $(".file-editor form").submit();
	47	+ });
	@@ -1,57 +0,0 @@	@@ -1,57 +0,0 @@
1	-module Gitlab
2	- module Satellite
3	- # GitLab server-side file update and commit
4	- class EditFileAction < Action
5	- attr_accessor :file_path, :ref
6	-
7	- def initialize(user, project, ref, file_path)
8	- super user, project, git_timeout: 10.seconds
9	- @file_path = file_path
10	- @ref = ref
11	- end
12	-
13	- # Updates the files content and creates a new commit for it
14	- #
15	- # Returns false if the ref has been updated while editing the file
16	- # Returns false if committing the change fails
17	- # Returns false if pushing from the satellite to Gitolite failed or was rejected
18	- # Returns true otherwise
19	- def commit!(content, commit_message, last_commit)
20	- return false unless can_edit?(last_commit)
21	-
22	- in_locked_and_timed_satellite do \|repo\|
23	- prepare_satellite!(repo)
24	-
25	- # create target branch in satellite at the corresponding commit from Gitolite
26	- repo.git.checkout({raise: true, timeout: true, b: true}, ref, "origin/#{ref}")
27	-
28	- # update the file in the satellite's working dir
29	- file_path_in_satellite = File.join(repo.working_dir, file_path)
30	- File.open(file_path_in_satellite, 'w') { \|f\| f.write(content) }
31	-
32	- # commit the changes
33	- # will raise CommandFailed when commit fails
34	- repo.git.commit(raise: true, timeout: true, a: true, m: commit_message)
35	-
36	-
37	- # push commit back to Gitolite
38	- # will raise CommandFailed when push fails
39	- repo.git.push({raise: true, timeout: true}, :origin, ref)
40	-
41	- # everything worked
42	- true
43	- end
44	- rescue Grit::Git::CommandFailed => ex
45	- Gitlab::GitLogger.error(ex.message)
46	- false
47	- end
48	-
49	- protected
50	-
51	- def can_edit?(last_commit)
52	- current_last_commit = Gitlab::Git::Commit.last_for_path(@project.repository, ref, file_path).sha
53	- last_commit == current_last_commit
54	- end
55	- end
56	- end
57	-end
@@ -0,0 +1,44 @@		@@ -0,0 +1,44 @@
	1	+require_relative 'file_action'
	2	+
	3	+module Gitlab
	4	+ module Satellite
	5	+ # GitLab server-side file update and commit
	6	+ class EditFileAction < FileAction
	7	+ # Updates the files content and creates a new commit for it
	8	+ #
	9	+ # Returns false if the ref has been updated while editing the file
	10	+ # Returns false if committing the change fails
	11	+ # Returns false if pushing from the satellite to Gitolite failed or was rejected
	12	+ # Returns true otherwise
	13	+ def commit!(content, commit_message, last_commit)
	14	+ return false unless can_edit?(last_commit)
	15	+
	16	+ in_locked_and_timed_satellite do \|repo\|
	17	+ prepare_satellite!(repo)
	18	+
	19	+ # create target branch in satellite at the corresponding commit from Gitolite
	20	+ repo.git.checkout({raise: true, timeout: true, b: true}, ref, "origin/#{ref}")
	21	+
	22	+ # update the file in the satellite's working dir
	23	+ file_path_in_satellite = File.join(repo.working_dir, file_path)
	24	+ File.open(file_path_in_satellite, 'w') { \|f\| f.write(content) }
	25	+
	26	+ # commit the changes
	27	+ # will raise CommandFailed when commit fails
	28	+ repo.git.commit(raise: true, timeout: true, a: true, m: commit_message)
	29	+
	30	+
	31	+ # push commit back to Gitolite
	32	+ # will raise CommandFailed when push fails
	33	+ repo.git.push({raise: true, timeout: true}, :origin, ref)
	34	+
	35	+ # everything worked
	36	+ true
	37	+ end
	38	+ rescue Grit::Git::CommandFailed => ex
	39	+ Gitlab::GitLogger.error(ex.message)
	40	+ false
	41	+ end
	42	+ end
	43	+ end
	44	+end
@@ -0,0 +1,20 @@		@@ -0,0 +1,20 @@
	1	+module Gitlab
	2	+ module Satellite
	3	+ class FileAction < Action
	4	+ attr_accessor :file_path, :ref
	5	+
	6	+ def initialize(user, project, ref, file_path)
	7	+ super user, project, git_timeout: 10.seconds
	8	+ @file_path = file_path
	9	+ @ref = ref
	10	+ end
	11	+
	12	+ protected
	13	+
	14	+ def can_edit?(last_commit)
	15	+ current_last_commit = Gitlab::Git::Commit.last_for_path(@project.repository, ref, file_path).sha
	16	+ last_commit == current_last_commit
	17	+ end
	18	+ end
	19	+ end
	20	+end