summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2013-08-08 01:12:08 -0700
committerJacob Vosmaer <contact@jacobvosmaer.nl>2013-08-08 01:12:08 -0700
commitfbaf8d8c12dcb9d820d250b9f9589318dbc36616 (patch)
treee1a99bd081ddc1f959845f4eba2f74ee5160b9ac
parentd3c3fbc6163ca13b16351214349bd5a7f5b729a3 (diff)
parent9e55cd4cd739088a08a78e1417982543847e6b32 (diff)
downloadgitlab-shell-fbaf8d8c12dcb9d820d250b9f9589318dbc36616.tar.gz
Merge pull request #78 from jojosch/typo-fixes
Fix typos
-rw-r--r--CHANGELOG2
-rw-r--r--README.md2
-rw-r--r--lib/gitlab_projects.rb2
-rw-r--r--lib/gitlab_update.rb2
4 files changed, 4 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 28bf265..8265669 100644
--- a/CHANGELOG
+++ b/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
diff --git a/README.md b/README.md
index c908faf..eb215fa 100644
--- a/README.md
+++ b/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
diff --git a/lib/gitlab_projects.rb b/lib/gitlab_projects.rb
index 242384b..bea5686 100644
--- a/lib/gitlab_projects.rb
+++ b/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}>."
diff --git a/lib/gitlab_update.rb b/lib/gitlab_update.rb
index df58e8f..bb3c862 100644
--- a/lib/gitlab_update.rb
+++ b/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