Merge branch 'master' of github.com:gitlabhq/gitlab-shell

CHANGELOG

@@ -29,6 +29,6 @@ v1.1.0
 
 v1.0.4
   - requires gitlab c9ca15e
-  - dont use post-receive file any more. Make all updates in update
+  - don't use post-receive file any more. Make all updates in update
   - fixed issue with invalid GL_USER
   - use GL_ID instead of GL_USER

README.md

@@ -72,7 +72,7 @@ Remove key
 
     ./bin/gitlab-keys rm-key key-23 "ssh-rsa AAAAx321..."
 
-Remoev all keys from authorized_keys file
+Remove all keys from authorized_keys file
 
     ./bin/gitlab-keys clear
 

lib/gitlab_projects.rb

@@ -88,7 +88,7 @@ class GitlabProjects
   end
 
   # Import project via git clone --bare
-  # URL must be publicly clonable
+  # URL must be publicly cloneable
   def import_project
     @source = ARGV.shift
     $logger.info "Importing project #{@project_name} from <#{@source}> to <#{full_path}>."

lib/gitlab_update.rb

@@ -27,7 +27,7 @@ class GitlabUpdate
     ENV['GL_ID'] = nil
 
     # If its push over ssh
-    # we need to check user persmission per branch first
+    # we need to check user permission per branch first
     if ssh?
       if api.allowed?('git-receive-pack', @repo_name, @key_id, @branch_name)
         update_redis